Changeset 31910 in vbox for trunk/src/VBox

Timestamp:

Aug 24, 2010 11:39:36 AM (15 years ago)

Author:

vboxsync

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

65120

Message:

Windows installer: OSE build fix

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (1 diff)
• VirtualBox.wxs (modified) (2 diffs)

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

@@ -372 +372 @@
                 -E 'VBOX_VERSION_MINOR_INST=$(VBOX_VERSION_MINOR)' \
                 -E 'VBOX_SIGNING_MODE=$(strip $(if $(VBOX_SIGNING_MODE),$(VBOX_SIGNING_MODE),none))' \
+                -E 'VBOX_GUI_USE_QGL=$(if $(VBOX_GUI_USE_QGL),yes,no)' \
                 -E 'VBOX_WITH_ADDITIONS_PACKING=$(if $(VBOX_WITH_ADDITIONS_PACKING),yes,no)' \
+                -E 'VBOX_WITH_COMBINED_PACKAGE=$(if $(VBOX_WITH_COMBINED_PACKAGE),yes,no)' \
                 -E 'VBOX_WITH_CROGL=$(if $(VBOX_WITH_CROGL),yes,no)' \
+                -E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
                 -E 'VBOX_WITH_DOCS_PACKING=$(if $(VBOX_WITH_DOCS_PACKING),yes,no)' \
+                -E 'VBOX_WITH_EFIFW_PACKING=$(if $(VBOX_WITH_EFIFW_PACKING),yes,no)' \
                 -E 'VBOX_WITH_GUEST_CONTROL=$(if $(VBOX_WITH_GUEST_CONTROL),yes,no)' \
                 -E 'VBOX_WITH_GUEST_PROPS=$(if $(VBOX_WITH_GUEST_PROPS),yes,no)' \
+                -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_VIDEOHWACCEL=$(if $(VBOX_WITH_VIDEOHWACCEL),yes,no)' \
+                -E 'VBOX_WITH_VRDP=$(if $(VBOX_WITH_VRDP),yes,no)' \
                 -E 'VBOX_WITH_WEBSERVICES=$(if $(VBOX_WITH_WEBSERVICES),yes,no)' \
-                -E 'VBOX_WITH_PYTHON=$(if $(VBOX_WITH_PYTHON),yes,no)' \
-                -E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
-                -E 'VBOX_WITH_QTGUI=$(if $(VBOX_WITH_QTGUI),yes,no)' \
-                -E 'VBOX_GUI_USE_QGL=$(if $(VBOX_GUI_USE_QGL),yes,no)' \
-                -E 'VBOX_WITH_VIDEOHWACCEL=$(if $(VBOX_WITH_VIDEOHWACCEL),yes,no)' \
-                -E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
                 -E 'VBOX_WITH_SERIALNUMBER_INSTALL=$(if $(VBOX_WITH_SERIALNUMBER_INSTALL),yes,no)' \
-                -E 'VBOX_WITH_COMBINED_PACKAGE=$(if $(VBOX_WITH_COMBINED_PACKAGE),yes,no)' \
-                -E 'VBOX_WITH_EFIFW_PACKING=$(if $(VBOX_WITH_EFIFW_PACKING),yes,no)' \
                 -E 'VBOX_WINDOWS_ICON_FILE=$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))' \
                 -E 'BUILD_TYPE=$(KBUILD_TYPE)' \

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -417 +417 @@
                         <File Id="vboxvmmdll" Name="VBoxVMM.dll" DiskId="1"  Vital="yes"
                               Source="$(env.PATH_OUT)\bin\VBoxVMM.dll" />
+<?if $(env.VBOX_WITH_VRDP) = "yes" ?>
                         <File Id="vboxvrdpdll" Name="VBoxVRDP.dll" DiskId="1"  Vital="yes"
                               Source="$(env.PATH_OUT)\bin\VBoxVRDP.dll" />
-
+<?endif ?>
                         <File Id="vboxshfolderdll" Name="VBoxSF.dll" LongName="VBoxSharedFolders.dll" DiskId="1"  Vital="yes"
                               Source="$(env.PATH_OUT)\bin\VBoxSharedFolders.dll" />
@@ -432 +433 @@
                               Source="$(env.PATH_OUT)\bin\VBoxGuestControlSvc.dll" />
 <?endif ?>
-
+<?if $(env.VBOX_WITH_VRDP) = "yes" ?>
                         <File Id="vrdpauthdll" Name="VRDPAuth.dll" DiskId="1"  Vital="yes"
                               Source="$(env.PATH_OUT)\bin\VRDPAuth.dll" />
                         <File Id="vrdpauthsimpledll" Name="VRDPASim.dll" LongName="VRDPAuthSimple.dll" DiskId="1"  Vital="yes"
                               Source="$(env.PATH_OUT)\bin\VRDPAuthSimple.dll" />
-
+<?endif ?>
                         <File Id="vmmgc" Name="VMMGC.gc" DiskId="1"  Vital="yes"
                               Source="$(env.PATH_OUT)\bin\VMMGC.gc" />