vbox的更動 51827 路徑 trunk/src/VBox/Installer/win

時間撮記:

2014-7-3 上午12:40:38 (10 年 以前)

作者:

vboxsync

訊息:

Installer fixes.

位置:

trunk/src/VBox/Installer/win

檔案:

• Makefile.kmk (修改) (2 筆差異)
• VBoxMergeApp.wxi (修改) (4 筆差異)

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

@@ -559 +559 @@
                 -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_HARDENING=$(if $(VBOX_WITH_HARDENING),yes,no)' \
                 -E 'VBOX_WITH_DRAG_AND_DROP=$(if $(VBOX_WITH_DRAG_AND_DROP),yes,no)' \
                 -E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
@@ -650 +651 @@
                 -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_HARDENING=$(if $(VBOX_WITH_HARDENING),yes,no)' \
                 -E 'VBOX_WITH_DRAG_AND_DROP=$(if $(VBOX_WITH_DRAG_AND_DROP),yes,no)' \
                 -E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \

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

@@ -155 +155 @@
        <!--     <Shortcut Id="ShortcutVBoxVRDP" Directory="INSTALLDIR" Name="VBoxVRDP" Show="normal" WorkingDirectory="INSTALLDIR"/> -->
         </File>
+<?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
+        <File Id="file_VBoxHeadless.dll" Name="VBoxHeadless.dll"
+              Source="$(env.PATH_OUT)\bin\VBoxHeadless.dll">
+        </File>
+<?endif ?>
         <File Id="file_VBoxBalloonCtrl.exe" Name="VBoxBalloonCtrl.exe"
               Source="$(env.PATH_OUT)\bin\VBoxBalloonCtrl.exe"/>
@@ -163 +168 @@
         <File Id="file_VBoxNetDHCP.exe" Name="VBoxNetDHCP.exe"
               Source="$(env.PATH_OUT)\bin\VBoxNetDHCP.exe"/>
+<?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
+        <File Id="file_VBoxNetDHCP.dll" Name="VBoxNetDHCP.dll"
+              Source="$(env.PATH_OUT)\bin\VBoxNetDHCP.dll">
+        </File>
+<?endif ?>
         <File Id="file_VBoxNetNAT.exe" Name="VBoxNetNAT.exe"
               Source="$(env.PATH_OUT)\bin\VBoxNetNAT.exe"/>
+<?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
+        <File Id="file_VBoxNetNAT.dll" Name="VBoxNetNAT.dll"
+              Source="$(env.PATH_OUT)\bin\VBoxNetNAT.dll">
+        </File>
+<?endif ?>
 <?if $(env.VBOX_WITH_EXTPACK) = "yes" ?>
         <File Id="file_VBoxExtPackHelperApp.exe" Name="VBoxExtPackHelperApp.exe"
@@ -244 +259 @@
               Source="$(env.PATH_OUT)\bin\VirtualBox.exe">
         </File>
+    <?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
+        <File Id="file_VirtualBox.dll" Name="VirtualBox.dll"
+              Source="$(env.PATH_OUT)\bin\VirtualBox.dll">
+        </File>
+    <?endif ?>
         <File Id="file_QtCoreVBox4.dll" Name="QtCoreVBox4.dll"
               Source="$(env.PATH_OUT)\bin\QtCoreVBox4.dll" />
@@ -325 +345 @@
         <File Id="file_VBoxSDL.exe" Name="VBoxSDL.exe"
               Source="$(env.PATH_OUT)\bin\VBoxSDL.exe" />
+<?if $(env.VBOX_WITH_HARDENING) = "yes" ?>
+        <File Id="file_VBoxSDL.dll" Name="VBoxSDL.dll"
+              Source="$(env.PATH_OUT)\bin\VBoxSDL.dll">
+        </File>
+<?endif ?>
         <File Id="file_SDL.dll" Name="SDL.dll"
               Source="$(env.PATH_OUT)\bin\SDL.dll" />