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

Timestamp:

Sep 24, 2019 11:46:24 AM (5 years ago)

Author:

vboxsync

Message:

Installer/win: Take VBOX_WITH_REM into account when packing. bugref:9576

Location:

trunk/src/VBox/Installer/win

Files:

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

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

@@ -623 +623 @@
                 -E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
                 -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
+                -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
                 -E 'VBOX_WITH_RAW_MODE=$(if $(VBOX_WITH_RAW_MODE),yes,no)' \
-                -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
+                -E 'VBOX_WITH_REM=$(if $(VBOX_WITH_REM),yes,no)' \
                 -E 'VBOX_WITH_SECURELABEL=$(if $(VBOX_WITH_SECURELABEL),yes,no)' \
                 -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \
@@ -768 +769 @@
                 -E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
                 -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
+                -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
                 -E 'VBOX_WITH_RAW_MODE=$(if $(VBOX_WITH_RAW_MODE),yes,no)' \
-                -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
+                -E 'VBOX_WITH_REM=$(if $(VBOX_WITH_REM),yes,no)' \
                 -E 'VBOX_WITH_SECURELABEL=$(if $(VBOX_WITH_SECURELABEL),yes,no)' \
                 -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \

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

@@ -262 +262 @@
         <File Id="file_VBoxRT.dll" Name="VBoxRT.dll"
               Source="$(env.PATH_OUT)\bin\VBoxRT.dll" />
+<?if $(env.VBOX_WITH_REM) = "yes" ?>
         <File Id="file_VBoxREM.dll" Name="VBoxREM.dll"
               Source="$(env.PATH_OUT)\bin\VBoxREM.dll" />
-<?if $(env.BUILD_TARGET_ARCH) = "x86" ?>
+ <?if $(env.BUILD_TARGET_ARCH) = "x86" ?>
         <File Id="file_VBoxREM32.dll" Name="VBoxREM32.dll"
               Source="$(env.PATH_OUT)\bin\VBoxREM32.dll" />
         <File Id="file_VBoxREM64.dll" Name="VBoxREM64.dll"
               Source="$(env.PATH_OUT)\bin\VBoxREM64.dll" />
+ <?endif ?>
 <?endif ?>
         <File Id="file_VBoxSupLib.dll" Name="VBoxSupLib.dll"