From 471242c9e0667403d8a801d767641743f97c24c9 Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Fri, 28 Sep 2012 15:46:49 -0700
Subject: [PATCH] Bug 322206 - Firefox net / stub installer - stub LTR and RTL
 base support and build changes for NSIS UI binary resource. r=bbondy

---
 .../mozapps/installer/windows/nsis/locale-rtl.nlf    | 12 ++++++++++++
 toolkit/mozapps/installer/windows/nsis/locale.nlf    | 12 ++++++++++++
 toolkit/mozapps/installer/windows/nsis/makensis.mk   |  7 +++++++
 3 files changed, 31 insertions(+)
 create mode 100644 toolkit/mozapps/installer/windows/nsis/locale-rtl.nlf
 create mode 100644 toolkit/mozapps/installer/windows/nsis/locale.nlf

diff --git a/toolkit/mozapps/installer/windows/nsis/locale-rtl.nlf b/toolkit/mozapps/installer/windows/nsis/locale-rtl.nlf
new file mode 100644
index 00000000000..a4ea9ae6e1c
--- /dev/null
+++ b/toolkit/mozapps/installer/windows/nsis/locale-rtl.nlf
@@ -0,0 +1,12 @@
+# Header, don't edit
+NLF v6
+# Start editing here
+# Language ID
+0
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ANSI code page
+-
+# RTL - anything else than RTL means LTR
+RTL
diff --git a/toolkit/mozapps/installer/windows/nsis/locale.nlf b/toolkit/mozapps/installer/windows/nsis/locale.nlf
new file mode 100644
index 00000000000..0995026a0f0
--- /dev/null
+++ b/toolkit/mozapps/installer/windows/nsis/locale.nlf
@@ -0,0 +1,12 @@
+# Header, don't edit
+NLF v6
+# Start editing here
+# Language ID
+0
+# Font and size - dash (-) means default
+-
+-
+# Codepage - dash (-) means ANSI code page
+-
+# RTL - anything else than RTL means LTR
+-
diff --git a/toolkit/mozapps/installer/windows/nsis/makensis.mk b/toolkit/mozapps/installer/windows/nsis/makensis.mk
index a7dd2a73404..785c5195570 100644
--- a/toolkit/mozapps/installer/windows/nsis/makensis.mk
+++ b/toolkit/mozapps/installer/windows/nsis/makensis.mk
@@ -14,6 +14,8 @@ SFX_MODULE ?= $(error SFX_MODULE is not defined)
 
 TOOLKIT_NSIS_FILES = \
 	common.nsh \
+	locale.nlf \
+	locale-rtl.nlf \
 	locales.nsi \
 	overrides.nsh \
 	setup.ico \
@@ -33,9 +35,14 @@ CUSTOM_NSIS_PLUGINS = \
 	UAC.dll \
 	$(NULL)
 
+CUSTOM_UI = \
+	nsisui.exe \
+	$(NULL)
+
 $(CONFIG_DIR)/setup.exe::
 	$(INSTALL) $(addprefix $(MOZILLA_DIR)/toolkit/mozapps/installer/windows/nsis/,$(TOOLKIT_NSIS_FILES)) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(MOZILLA_DIR)/other-licenses/nsis/Plugins/,$(CUSTOM_NSIS_PLUGINS)) $(CONFIG_DIR)
+	$(INSTALL) $(addprefix $(MOZILLA_DIR)/other-licenses/nsis/,$(CUSTOM_UI)) $(CONFIG_DIR)
 	cd $(CONFIG_DIR) && $(MAKENSISU) installer.nsi
 # Support for building the uninstaller when repackaging locales
 ifeq ($(CONFIG_DIR),l10ngen)