Changeset 68057 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Jul 20, 2017 10:38:12 AM (8 years ago)

Author:

vboxsync

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

117087

Message:

Unattended: Moved the unattended templates into Main where they belong and renamed their installation directory to 'UnattendedTemplates' (was 'unattended_templates'). Added them to the solaris and darwin installers. Corrected the ubuntu template to with a ubiquity/success_command line duplicating preseed/late_command so the commands actually get executed.

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (8 diffs)
• VBoxMergeApp.wxi (modified) (1 diff)

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

@@ -168 +168 @@
         $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
         $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
+        $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \
         $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), \
                 $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
@@ -503 +504 @@
         $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
         $(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi \
-        $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi
+        $(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib.wxi \
+        $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi
 
 #
@@ -520 +522 @@
                                 $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \
                                 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
+                                $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \
                                 $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
                                 $(VBOX_MSI_DEPENDENCIES)) \
@@ -580 +583 @@
                 -E 'VBOX_WITH_WEBSERVICES=$(if $(VBOX_WITH_WEBSERVICES),yes,no)' \
                 -E 'VBOX_WITH_SDS=$(if $(VBOX_WITH_SDS),yes,no)' \
-                -E 'VBOX_WITH_UNATTENDED=$(if $(VBOX_WITH_UNATTENDED),yes,no)' \
                 -E 'BUILD_TYPE=$(KBUILD_TYPE)' \
                 -E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
@@ -614 +616 @@
                 $(if $(VBOX_WITH_32_ON_64_MAIN_API),$(VBOX_WIN_INST_OUT_DIR)/VirtualBox_TypeLib_x86.wxi,) \
                 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi \
+                $(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi \
                 $(if $(VBOX_WITH_QTGUI),$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi) \
                 $(VBOX_MSI_DEPENDENCIES) \
@@ -671 +674 @@
                 -E 'VBOX_WITH_WEBSERVICES=$(if $(VBOX_WITH_WEBSERVICES),yes,no)' \
                 -E 'VBOX_WITH_SDS=$(if $(VBOX_WITH_SDS),yes,no)' \
-                -E 'VBOX_WITH_UNATTENDED=$(if $(VBOX_WITH_UNATTENDED),yes,no)' \
                 -E 'BUILD_TYPE=$(KBUILD_TYPE)' \
                 -E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
@@ -718 +720 @@
 #
 include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
-$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi: $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk $(VBOX_WIN_INST_MAKEFILE_DEP) | $$(dir $$@)
+$(call KB_FN_AUTO_CMD_DEPS,$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi)
+$(VBOX_WIN_INST_OUT_DIR)/VBoxGuiNLS.wxi: $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk | $$(dir $$@)
         $(APPEND) -t $@ '<?xml version="1.0" ?>'
         $(APPEND) $@ '<Include>'
@@ -729 +732 @@
 # Edit the version stored in the registry.
 #
+$(call KB_FN_AUTO_CMD_DEPS,$(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi)
 $(VBOX_WIN_INST_OUT_DIR)/VBoxKey.wxi: $(PATH_SUB_CURRENT)/VBoxKey.wxi $(VBOX_VERSION_STAMP) | $$(dir $$@)
         $(SED)  -e 's/%VER%/$(VBOX_VERSION_STRING_RAW)/' \
                 -e 's/%VER_EXT%/$(VBOX_VERSION_STRING)/' \
                 --output $@ $<
+
+#
+# Generate the list of unattended template script files.
+#
+$(call KB_FN_AUTO_CMD_DEPS,$(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi)
+$(VBOX_WIN_INST_OUT_DIR)/VBoxUnattendedTemplateComponent.wxi: | $$(dir $$@)
+        $(APPEND) -t -n $@ \
+                '<?xml version="1.0" ?>' \
+                '<Include>'
+ifdef VBOX_UNATTENDED_TEMPLATES
+        $(APPEND) -n $@ \
+                '  <Directory Id="dir_VBoxUnattendedTemplates" Name="UnattendedTemplates">' \
+                '    <Component Id="cp_UnattendedTemplates" Guid="0571550d-aaa5-4723-c17b-5ddcc29f5686" Win64="$$(var.Property_Win64)">' \
+                $@ $(foreach file,$(VBOX_UNATTENDED_TEMPLATES), \
+                '      <File Id="$(file)" Name="$(file)" Source="$$(env.PATH_OUT)\bin\UnattendedTemplates\$(file)" />') \
+                '    </Component>' \
+                '  </Directory>'
+endif
+        $(APPEND) $@ '</Include>'
+
 
 #

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -423 +423 @@
     </Component>
 
-<?if $(env.VBOX_WITH_UNATTENDED) = "yes" ?>
-    <!-- Unattended templates -->
-    <Directory Id="dir_VBoxUnattendedTemplates" Name="unattended_templates">
-        <Component Id="cp_UnattendedTemplates" Guid="8f89ec7e-ae83-490d-a293-c7ab276c5678" Win64="$(var.Property_Win64)">
-            <!-- VBox unattended template files -->
-            <File Id="file_debian_preseed.cfg" Name="debian_preseed.cfg"
-                  Source="$(env.PATH_OUT)\bin\unattended_templates\debian_preseed.cfg" />
-            <File Id="file_fedora_ks.cfg" Name="fedora_ks.cfg"
-                  Source="$(env.PATH_OUT)\bin\unattended_templates\fedora_ks.cfg" />
-            <File Id="file_ol_ks.cfg" Name="ol_ks.cfg"
-                  Source="$(env.PATH_OUT)\bin\unattended_templates\ol_ks.cfg" />
-            <File Id="file_redhat67_ks.cfg" Name="redhat67_ks.cfg"
-                  Source="$(env.PATH_OUT)\bin\unattended_templates\redhat67_ks.cfg" />
-            <File Id="file_ubuntu_preseed.cfg" Name="ubuntu_preseed.cfg"
-                  Source="$(env.PATH_OUT)\bin\unattended_templates\ubuntu_preseed.cfg" />
-            <File Id="file_win_nt6_unattended.xml" Name="win_nt6_unattended.xml"
-                  Source="$(env.PATH_OUT)\bin\unattended_templates\win_nt6_unattended.xml" />
-            <File Id="file_win_nt5_unattended.sif" Name="win_nt5_unattended.sif"
-                  Source="$(env.PATH_OUT)\bin\unattended_templates\win_nt5_unattended.sif" />
-        </Component>
-    </Directory>
+    <!-- Unattended installation template scripts if enabled -->
+    <?include $(env.PATH_TARGET)\VBoxUnattendedTemplateComponent.wxi ?>
+
 <?endif?>