VirtualBox

Changeset 72044 in vbox for trunk


Ignore:
Timestamp:
Apr 26, 2018 3:05:24 PM (7 years ago)
Author:
vboxsync
Message:

Installer/win: Only install RepackExtPack.cmd on x86 (in combined build) to avoid confusion. Fixed script default. bugref:8691

Location:
trunk/src/VBox/Installer/win
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Installer/win/Makefile.kmk

    r72040 r72044  
    10071007        Scripts/PackDriversForSubmission.cmd \
    10081008        Scripts/UnpackBlessedDrivers.cmd \
    1009         Scripts/RepackExtPack.cmd \
    10101009        $(RePackScripts_0_OUTDIR)/sign-dual.cmd \
    10111010        $(RePackScripts_0_OUTDIR)/sign-sha1.cmd \
    10121011        $(RePackScripts_0_OUTDIR)/VMMR0.inf \
    10131012        $(RePackScripts_0_OUTDIR)/VBoxExtPackPuel.inf
     1013if !defined(VBOX_WITH_COMBINED_PACKAGE) || "$(KBUILD_TARGET_ARCH)" == "x86"
     1014 RePackScripts_SOURCES += \
     1015        Scripts/RepackExtPack.cmd
     1016endif
    10141017RePackScripts_CLEAN = \
    10151018        $(RePackScripts_0_OUTDIR)/sign-dual.cmd \
  • trunk/src/VBox/Installer/win/Scripts/RepackExtPack.cmd

    r72041 r72044  
    128128if not exist "%_MY_OPT_BINDIR_X86%" goto error_bindir_x86_does_not_exist
    129129
    130 if ".%_MY_OPT_BINDIR_AMD64%" == "." set _MY_OPT_BINDIR_AMD64=_MY_OPT_BINDIR_X86\..\..\..\win.amd64\release\bin
     130if ".%_MY_OPT_BINDIR_AMD64%" == "." set _MY_OPT_BINDIR_AMD64=%_MY_OPT_BINDIR_X86%\..\..\..\win.amd64\release\bin
    131131if not exist "%_MY_OPT_BINDIR_AMD64%" goto error_bindir_amd64_does_not_exist
    132132
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette