Changeset 51399 in vbox for trunk/src/VBox/Installer

Timestamp:

May 26, 2014 3:19:52 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

93922

Message:

Windows host installer+Branding: cleanly separate the additional license languages from the additional installer/manual languages, otherwise funny things can happen (undefined variables leading to strange errors during MSI creation). So far only the Windows installer is prepared to ship the license in multiple languages.

File:

• trunk/src/VBox/Installer/win/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -84 +84 @@
 # so just define the branding targets to use the English one for now.
 # The installer generation assumes that there is a translation for each
-# of VBOX_MANUAL_ADD_LANGUAGES.
-#
-$(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
-        $(eval VBOX_BRAND_$(lang)_LICENSE_RTF := $(VBOX_BRAND_LICENSE_RTF)) \
+# of VBOX_LICENSE_ADD_LANGUAGES.
+#
+$(foreach lang,$(VBOX_LICENSE_ADD_LANGUAGES), \
+        $(eval VBOX_BRAND_$(lang)_LICENSE_RTF := $(VBOX_BRAND_LICENSE_RTF)))
+
+# Set the codepage for all languages to 1252, covers most cases.
+$(foreach lang,$(sort $(VBOX_INSTALLER_LANGUAGES) $(VBOX_LICENSE_ADD_LANGUAGES) $(VBOX_MANUAL_ADD_LANGUAGES)), \
         $(eval VBOX_BRAND_$(lang)_LANGUAGE_CODEPAGE := 1252))
 
 # Some languages need another codepage than 1252. Override them here.
 VBOX_BRAND_zh_TW_LANGUAGE_CODEPAGE := 950
+
+# Standard language names (in the native language), to be extended as we go.
+# VBOX_BRAND_$(lang)_LANG_NAME must be defined for each language which occurs
+# in either # VBOX_LICENSE_ADD_LANGUAGES or VBOX_MANUAL_ADD_LANGUAGES.
+VBOX_BRAND_fr_FR_LANG_NAME := Français
 
 VBOX_PATH_WIN_INST_SRC := $(PATH_SUB_CURRENT)
@@ -303 +311 @@
         $(APPEND) $@ '  <File Id="file_License_en_US.rtf" Name="License_en_US.rtf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(VBOX_BRAND_LICENSE_RTF)">' \
                      '  </File>'
-        $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
+        $(APPEND) -n $@ $(foreach lang,$(VBOX_LICENSE_ADD_LANGUAGES), \
                      '  <File Id="file_License_$(lang).rtf" Name="License_$(lang).rtf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(VBOX_BRAND_$(lang)_LICENSE_RTF)">' \
                      '  </File>')
@@ -332 +340 @@
         $(APPEND) $@ '  <Shortcut Id="sc_StartMenu_License_en_US" Directory="dir_StartMenuVBox" Name="!(loc.StartMenu_License) (English)" Description="!(loc.StartMenu_License)"' \
                      '            Target="[INSTALLDIR]License_en_US.rtf" WorkingDirectory="INSTALLDIR" Advertise="no"/>'
-        $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
+        $(APPEND) -n $@ $(foreach lang,$(VBOX_LICENSE_ADD_LANGUAGES), \
                      '  <Shortcut Id="sc_StartMenu_License_$(lang)" Directory="dir_StartMenuVBox" Name="$!(loc.StartMenu_License) ($(VBOX_BRAND_$(lang)_LANG_NAME))"' \
                      '            Description="$!(loc.StartMenu_License) ($(VBOX_BRAND_$(lang)_LANG_NAME))" Target="License_$(lang).rtf" WorkingDirectory="INSTALLDIR"/>')