Bug 408844: Installer repackaging and installation of ChatZilla language packs, patch by Vlado Valastiak <wladow@gmail.com>, r=mcsmurf, r=gijs

extensions/irc/locales/Makefile.in

@@ -96,12 +96,22 @@ repackage-zip: $(STAGEDIST)
 ifneq (en-US,$(AB_CD))
 	$(RM) -rf $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID)
 	mkdir $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID)
-	$(RM) -r $(DIST)/xpi-stage/chatzilla-$(AB_CD)/chrome/chatzilla
+	$(RM) -r $(DIST)/xpi-stage/$(XPI_NAME)/chrome/chatzilla
 	# use tar for copying as cp doesn't portably preserve timestamps
-	cd $(DIST)/xpi-stage/chatzilla-$(AB_CD) && \
+	cd $(DIST)/xpi-stage/$(XPI_NAME) && \
 	  tar $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST)/extensions/$(INSTALL_EXTENSION_ID) && tar -xf - )
 	@echo "$(AB_CD)"
 endif
 
 repackage-zip-%: $(STAGEDIST)
 	@$(MAKE) repackage-zip AB_CD=$* STAGEDIST=$(STAGEDIST)
+
+repackage-win32-installer: $(STAGEDIST)
+ifneq (en-US,$(AB_CD))
+	mkdir -p $(STAGEDIST)/optional/extensions
+	mv $(DIST)/xpi-stage/$(XPI_NAME) $(STAGEDIST)/optional/extensions/$(INSTALL_EXTENSION_ID)
+endif
+
+repackage-win32-installer-%: $(STAGEDIST)
+	@$(MAKE) repackage-win32-installer AB_CD=$* STAGEDIST=$(STAGEDIST) 
+	

suite/installer/windows/nsis/custom.nsi

@@ -72,6 +72,10 @@
     WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" State  "1"
     WriteINIStr "$PLUGINSDIR\components.ini" "Field $R1" Flags  "GROUP"
     ${GetSize} "$EXEDIR\optional\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}" "/S=0K" $0 $8 $9
+    ${If} ${FileExists} "$EXEDIR\optional\extensions\langpack-${AB_CD}@chatzilla.mozilla.org"
+      ${GetSize} "$EXEDIR\optional\extensions\langpack-${AB_CD}@chatzilla.mozilla.org" "/S=0K" $1 $8 $9
+      IntOp $0 $0 + $1
+    ${EndIf}
     SectionSetSize 1 $0
     IntOp $R1 $R1 + 1
     IntOp $R2 $R2 + $R4

suite/installer/windows/nsis/installer.nsi

@@ -271,6 +271,10 @@ Section "-Application" Section1
     ${AndIf} ${FileExists} "$EXEDIR\optional\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}"
       RmDir /r "$INSTDIR\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}"
     ${EndIf}
+    ${If} ${FileExists} "$INSTDIR\extensions\langpack-${AB_CD}@chatzilla.mozilla.org"
+    ${AndIf} ${FileExists} "$EXEDIR\optional\extensions\langpack-${AB_CD}@chatzilla.mozilla.org"
+      RmDir /r "$INSTDIR\extensions\langpack-${AB_CD}@chatzilla.mozilla.org"
+    ${EndIf}
 
     ; If DOMi is installed and this install includes DOMi remove it from
     ; the installation directory. This will remove it if the user deselected
@@ -592,11 +596,17 @@ Function installChatZilla
     DetailPrint $(STATUS_INSTALL_OPTIONAL)
     SetDetailsPrint none
     ${RemoveDir} "$INSTDIR\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}"
+    ${RemoveDir} "$INSTDIR\extensions\langpack-${AB_CD}@chatzilla.mozilla.org"
     ClearErrors
     ${LogHeader} "Installing IRC Client"
     StrCpy $R0 "$EXEDIR\optional\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}"
     StrCpy $R1 "$INSTDIR\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}"
     Call DoCopyFiles
+    ${If} ${FileExists} "$EXEDIR\optional\extensions\langpack-${AB_CD}@chatzilla.mozilla.org"
+      StrCpy $R0 "$EXEDIR\optional\extensions\langpack-${AB_CD}@chatzilla.mozilla.org"
+      StrCpy $R1 "$INSTDIR\extensions\langpack-${AB_CD}@chatzilla.mozilla.org"
+      Call DoCopyFiles
+    ${EndIf}
   ${EndIf}
 FunctionEnd
 

suite/locales/Makefile.in

@@ -173,6 +173,7 @@ repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
 	$(RM) -rf $(DIST)/xpi-stage/locale-$(AB_CD)
 	$(MAKE) libs-$(AB_CD)
 	mv $(DIST)/xpi-stage/locale-$(AB_CD) l10n-stage/localized
+	$(MAKE) -C ../../extensions/irc/locales repackage-win32-installer-$(AB_CD) STAGEDIST=$(shell pwd)/l10n-stage
 	$(MAKE) -C ../../extensions/venkman/locales repackage-win32-installer-$(AB_CD) STAGEDIST=$(shell pwd)/l10n-stage
 	$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx
 	cp ../installer/windows/l10ngen/setup.exe l10n-stage