Changeset 108683 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 21, 2025 9:55:02 AM (4 weeks ago)

Author:

vboxsync

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

168097

Message:

Windows Guest Additions installer: Fixed shipping VBoxAudioTest and install it under Tools/ (so that this also matches the paths when just extracting the installer). bugref:10008

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -250 +250 @@
 endif # VBOX_WITH_WDDM
 
-ifdef env.VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
+ifdef VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
  VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
         $(PATH_STAGE_BIN)/additions/VBoxAudioTest.exe
@@ -334 +334 @@
                         "/XSetCompressor /SOLID lzma" "/XSetCompressorDictSize $(if-expr $(KBUILD_TARGET_ARCH) == x86,4,16)" \
                         $(if-expr defined(VBOX_WITH_NATIVE_NSIS_INSTALLER),"/XTarget $(KBUILD_TARGET_ARCH)-unicode",) \
+                        $(if $(VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST),'/DVBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST=1') \
                         $(if $(VBOX_SIGNING_MODE),'/DEXTERNAL_UNINSTALLER=1') \
                        $(if-expr defined(VBOX_SIGN_ADDITIONS) && defined(VBOX_SIGNING_MODE), \
@@ -382 +383 @@
                 -- $(EXEC_X86_WIN32) $(VBOX_PATH_NSIS)/makensis.exe /NOCD /V2 \
                         $(if-expr defined(VBOX_WITH_NATIVE_NSIS_INSTALLER),"/XTarget $(KBUILD_TARGET_ARCH)-unicode",) \
+                        $(if $(VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST),'/DVBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST=1') \
                         $(if $(VBOX_SIGN_ADDITIONS),'/DVBOX_SIGN_ADDITIONS=1') \
                         $(if $(VBOX_WITH_VBOX_LEGACY_TS_CA),'/DVBOX_WITH_VBOX_LEGACY_TS_CA=1') \

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

@@ -407 +407 @@
   FILE "$%PATH_OUT%\bin\additions\VBoxControl.exe"
 
-  ; Misc
+  ; Tools
+  SetOutPath "$INSTDIR\Tools"
 !ifdef VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
   FILE "$%PATH_OUT%\bin\additions\VBoxAudioTest.exe"