VirtualBox

Ignore:
Timestamp:
Feb 1, 2023 4:25:17 PM (2 years ago)
Author:
vboxsync
Message:

Additions/*.kmk: Automatic scm cleanups. bugref:10348

Location:
trunk/src/VBox/Additions/WINNT/Installer
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r98103 r98416  
    4040DLLS.x86 += VBoxGuestInstallHelper
    4141VBoxGuestInstallHelper_TEMPLATE        := VBoxGuestR3Dll
    42 VBoxGuestInstallHelper_INST             := repackadd/resources/VBoxGuestInstallHelper/
     42VBoxGuestInstallHelper_INST             := repackadd/resources/VBoxGuestInstallHelper/
    4343ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
    4444 VBoxGuestInstallHelper_INSTTYPE       := stage
    4545 VBoxGuestInstallHelper_DEBUG_INSTTYPE := both
    4646endif
    47 VBoxGuestInstallHelper_DEFS             := _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
     47VBoxGuestInstallHelper_DEFS             := _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
    4848VBoxGuestInstallHelper_BLD_TRG_ARCH    := x86
    4949VBoxGuestInstallHelper_SOURCES         := \

  • trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/testcase/Makefile.kmk

    r98103 r98416  
    3030
    3131ifdef VBOX_WITH_TESTCASES
    32 #
    33 # As the testcases use the DLL directly and plugins for NSIS *always* are 32-bit,
    34 # we also have to use a 32-bit testcase here.
    35 #
    36 PROGRAMS.x86 += tstWinAdditionsInstallHelper
    37 tstWinAdditionsInstallHelper_TEMPLATE = VBoxGuestR3Exe
    38 tstWinAdditionsInstallHelper_SOURCES = tstWinAdditionsInstallHelper.cpp
    39 tstWinAdditionsInstallHelper_DEFS     = _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
     32 #
     33 # As the testcases use the DLL directly and plugins for NSIS *always* are 32-bit,
     34 # we also have to use a 32-bit testcase here.
     35 #
     36 PROGRAMS.x86 += tstWinAdditionsInstallHelper
     37 tstWinAdditionsInstallHelper_TEMPLATE = VBoxGuestR3Exe
     38 tstWinAdditionsInstallHelper_SOURCES = tstWinAdditionsInstallHelper.cpp
     39 tstWinAdditionsInstallHelper_DEFS    = _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
    4040
    4141endif # VBOX_WITH_TESTCASES

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

    r98128 r98416  
    3131# This has to be 32-bit.
    3232PROGRAMS += VBoxWindowsAdditions
    33 VBoxWindowsAdditions_TEMPLATE= VBoxGuestR3Exe
     33VBoxWindowsAdditions_TEMPLATE = VBoxGuestR3Exe
    3434VBoxWindowsAdditions_BLD_TRG_ARCH = x86
    3535VBoxWindowsAdditions_DEFS    = _WIN32_WINNT=0x0400
    … …  
    3939        VBoxWindowsAdditions.rc
    4040ifdef VBOX_WITH_NOCRT_STATIC
    41 VBoxWindowsAdditions_LDFLAGS = /SubSystem:Windows
     41 VBoxWindowsAdditions_LDFLAGS = /SubSystem:Windows
    4242else
    43 VBoxWindowsAdditions_LDFLAGS = \
    44         /DISALLOWLIB:msvcrt.lib \
    45         /DISALLOWLIB:msvcprt.lib \
    46         /DISALLOWLIB:libcmt.lib
    47 VBoxWindowsAdditions_LIBS     = \
    48         $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \
    49         $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcmt.lib \
    50         $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcpmt.lib
     43 VBoxWindowsAdditions_LDFLAGS = \
     44        /DISALLOWLIB:msvcrt.lib \
     45        /DISALLOWLIB:msvcprt.lib \
     46        /DISALLOWLIB:libcmt.lib
     47 VBoxWindowsAdditions_LIBS    = \
     48        $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \
     49        $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcmt.lib \
     50        $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcpmt.lib
    5151endif
    5252VBoxWindowsAdditions_VBOX_IMPORT_CHECKER.win.x86 := nt4

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

    r98257 r98416  
    5656#
    5757PROGRAMS += VBoxDrvInst
    58 VBoxDrvInst_TEMPLATE= VBoxGuestR3Exe
     58VBoxDrvInst_TEMPLATE = VBoxGuestR3Exe
    5959VBoxDrvInst_DEFS    = _WIN32_WINNT=0x0400 _UNICODE UNICODE
    6060VBoxDrvInst_DEFS   += VBOX_SVN_REV=$(VBOX_SVN_REV)
    … …  
    161161        $(PATH_STAGE_BIN)/additions/VBoxTray.exe \
    162162        $(PATH_STAGE_BIN)/additions/VBoxControl.exe \
    163        \
     163        \
    164164        $(PATH_STAGE_BIN)/additions/VBoxMouse.inf \
    165165        $(PATH_STAGE_BIN)/additions/VBoxMouse.sys \
    166        \
     166        \
    167167        $(PATH_STAGE_BIN)/additions/VBoxVideo.inf \
    168168        $(PATH_STAGE_BIN)/additions/VBoxVideo.sys \
    169169        $(PATH_STAGE_BIN)/additions/VBoxDisp.dll \
    170        \
     170        \
    171171        $(PATH_STAGE_BIN)/additions/VBoxSF.sys \
    172172        $(PATH_STAGE_BIN)/additions/VBoxMRXNP.dll
    173173
    174174ifeq ($(KBUILD_TARGET_ARCH),amd64) # 32-bit network provider DLLs for 32-bit apps running on a 64-bit system
    175 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
    176         $(PATH_STAGE_BIN)/additions/VBoxMRXNP-x86.dll
     175 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
     176        $(PATH_STAGE_BIN)/additions/VBoxMRXNP-x86.dll
    177177endif
    178178
    179179if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
    180 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
    181         $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
    182         $(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \
    183         $(PATH_STAGE_BIN)/additions/VBoxGuest.cat \
    184         $(PATH_STAGE_BIN)/additions/VBoxGuest-PreW10.cat \
    185         $(PATH_STAGE_BIN)/additions/VBoxMouse.cat \
    186         $(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat
     180 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
     181        $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
     182        $(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \
     183        $(PATH_STAGE_BIN)/additions/VBoxGuest.cat \
     184        $(PATH_STAGE_BIN)/additions/VBoxGuest-PreW10.cat \
     185        $(PATH_STAGE_BIN)/additions/VBoxMouse.cat \
     186        $(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat
    187187endif
    188188
    … …  
    193193
    194194ifeq ($(KBUILD_TARGET_ARCH),x86)
    195 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
    196         $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \
    197         $(PATH_STAGE_BIN)/additions/VBoxSFW2K.sys
     195 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
     196        $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \
     197        $(PATH_STAGE_BIN)/additions/VBoxSFW2K.sys
    198198endif
    199199
    200200ifdef VBOX_WITH_WDDM
    201 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
    202         $(PATH_STAGE_BIN)/additions/VBoxWddm.inf \
    203         $(PATH_STAGE_BIN)/additions/VBoxWddm.sys \
    204         $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
     201 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
     202        $(PATH_STAGE_BIN)/additions/VBoxWddm.inf \
     203        $(PATH_STAGE_BIN)/additions/VBoxWddm.sys \
     204        $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
    205205 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    206 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
    207         $(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll
     206  VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
     207        $(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll
    208208 endif
    209209
    210210 ifdef VBOX_WITH_WDDM_DX
    211 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
    212         $(PATH_STAGE_BIN)/additions/VBoxDX.dll
     211  VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
     212        $(PATH_STAGE_BIN)/additions/VBoxDX.dll
    213213  ifeq ($(KBUILD_TARGET_ARCH),amd64)
    214 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
    215         $(PATH_STAGE_BIN)/additions/VBoxDX-x86.dll
     214   VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
     215        $(PATH_STAGE_BIN)/additions/VBoxDX-x86.dll
    216216  endif
    217217 endif
    218218
    219219 ifdef VBOX_WITH_MESA3D
    220 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
    221         $(PATH_STAGE_BIN)/additions/VBoxNine.dll \
    222         $(PATH_STAGE_BIN)/additions/VBoxSVGA.dll \
    223         $(PATH_STAGE_BIN)/additions/VBoxGL.dll
     220  VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
     221        $(PATH_STAGE_BIN)/additions/VBoxNine.dll \
     222        $(PATH_STAGE_BIN)/additions/VBoxSVGA.dll \
     223        $(PATH_STAGE_BIN)/additions/VBoxGL.dll
    224224  ifeq ($(KBUILD_TARGET_ARCH),amd64)
    225 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
    226         $(PATH_STAGE_BIN)/additions/VBoxNine-x86.dll \
    227         $(PATH_STAGE_BIN)/additions/VBoxSVGA-x86.dll \
    228         $(PATH_STAGE_BIN)/additions/VBoxGL-x86.dll
     225   VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
     226        $(PATH_STAGE_BIN)/additions/VBoxNine-x86.dll \
     227        $(PATH_STAGE_BIN)/additions/VBoxSVGA-x86.dll \
     228        $(PATH_STAGE_BIN)/additions/VBoxGL-x86.dll
    229229  endif
    230230 endif
    231231
    232232 if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
    233 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
    234         $(PATH_STAGE_BIN)/additions/VBoxWddm.cat \
    235         $(PATH_STAGE_BIN)/additions/VBoxWddm-PreW10.cat
     233  VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
     234        $(PATH_STAGE_BIN)/additions/VBoxWddm.cat \
     235        $(PATH_STAGE_BIN)/additions/VBoxWddm-PreW10.cat
    236236 endif
    237237endif # VBOX_WITH_WDDM
    238238
    239239ifdef env.VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
    240 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
    241         $(PATH_STAGE_BIN)/additions/VBoxAudioTest.exe
     240 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
     241        $(PATH_STAGE_BIN)/additions/VBoxAudioTest.exe
    242242endif
    243243
    … …  
    280280        -E 'KBUILD_TYPE=$(KBUILD_TYPE)' \
    281281        -E 'KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)' \
    282        $(foreach base, VBOX_GA_CERT_ROOT_SHA1 VBOX_GA_CERT_ROOT_SHA2 VBOX_GA_CERT_ROOT_SHA2_R3 \
    283        ,-E '$(base)=$(firstword $($(base)) none)' -E '$(base)_TS=$(firstword $($(base)_TS) none)')
     282        $(foreach base, VBOX_GA_CERT_ROOT_SHA1 VBOX_GA_CERT_ROOT_SHA2 VBOX_GA_CERT_ROOT_SHA2_R3 \
     283        ,-E '$(base)=$(firstword $($(base)) none)' -E '$(base)_TS=$(firstword $($(base)_TS) none)')
    284284
    285285$(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \
    … …  
    328328
    329329ifdef VBOX_SIGNING_MODE
    330 #
    331 # This is a hack to sign the uninstaller.
    332 # See http://nsis.sourceforge.net/Signing_an_Uninstaller for more details.
    333 #
    334 OTHER_CLEAN += \
    335         $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe \
    336         $(PATH_TARGET)/uninst.exe
    337 $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe: \
    338                 $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \
    339                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsCommon.nsh \
    340                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsExternal.nsh \
    341                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsLog.nsh \
    342                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstall.nsh \
    343                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
    344                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsW2KXP.nsh \
    345                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
    346                 $(PATH_SUB_CURRENT)/dumplog.nsh \
    347                 $(PATH_SUB_CURRENT)/ReplaceDLL.nsh \
    348                 $(PATH_SUB_CURRENT)/servicepack.nsh \
    349                 $(PATH_SUB_CURRENT)/strstr.nsh \
    350                 $(PATH_SUB_CURRENT)/winver.nsh \
    351                 $(PATH_SUB_CURRENT)/Languages/English.nsh \
    352                 $(PATH_SUB_CURRENT)/Languages/German.nsh \
    353                 $(PATH_SUB_CURRENT)/Languages/French.nsh \
    354                 $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) \
    355                 $(VBOX_WINDOWS_ADDITIONS_OTHER_FILES) \
    356                 $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
    357                 $(VBOX_NSIS_ICON_FILE) \
    358                 $(VBOX_VERSION_STAMP) \
    359                $$(VBoxDrvInst_1_STAGE_TARGET) \
    360                 | $$(dir $$@)
     330 #
     331 # This is a hack to sign the uninstaller.
     332 # See http://nsis.sourceforge.net/Signing_an_Uninstaller for more details.
     333 #
     334 OTHER_CLEAN += \
     335        $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe \
     336        $(PATH_TARGET)/uninst.exe
     337 $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe: \
     338                $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \
     339                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsCommon.nsh \
     340                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsExternal.nsh \
     341                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsLog.nsh \
     342                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstall.nsh \
     343                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
     344                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsW2KXP.nsh \
     345                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
     346                $(PATH_SUB_CURRENT)/dumplog.nsh \
     347                $(PATH_SUB_CURRENT)/ReplaceDLL.nsh \
     348                $(PATH_SUB_CURRENT)/servicepack.nsh \
     349                $(PATH_SUB_CURRENT)/strstr.nsh \
     350                $(PATH_SUB_CURRENT)/winver.nsh \
     351                $(PATH_SUB_CURRENT)/Languages/English.nsh \
     352                $(PATH_SUB_CURRENT)/Languages/German.nsh \
     353                $(PATH_SUB_CURRENT)/Languages/French.nsh \
     354                $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) \
     355                $(VBOX_WINDOWS_ADDITIONS_OTHER_FILES) \
     356                $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
     357                $(VBOX_NSIS_ICON_FILE) \
     358                $(VBOX_VERSION_STAMP) \
     359                $$(VBoxDrvInst_1_STAGE_TARGET) \
     360                | $$(dir $$@)
    361361        $(call MSG_L1,Creating $@, from $<)
    362362        $(QUIET)$(REDIRECT) -C $(VBOX_PATH_WIN_ADD_INS_SRC) \
    … …  
    370370                        '$(subst /,\,$<)'
    371371
    372 $(PATH_TARGET)/uninst.exe: $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe | $$(dir $$@)
     372 $(PATH_TARGET)/uninst.exe: $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe | $$(dir $$@)
    373373        $(call MSG_L1,Creating $@, from $<)
    374374        $(QUIET)$(RM) -f $@
    … …  
    381381
    382382if defined(VBOX_GA_ATTESTATION_SIGNING) && defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
    383 #
    384 # This automagically attestation signs the GA drivers.
    385 #
    386 $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME): \
    387                 $(PATH_OUT)/repackadd/sign-attestation.sh \
    388                 $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME)
     383 #
     384 # This automagically attestation signs the GA drivers.
     385 #
     386 $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME): \
     387                $(PATH_OUT)/repackadd/sign-attestation.sh \
     388                $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME)
    389389        $(RM_EXT) -f $(PATH_OUT)/repackadd/*.zip
    390390        cd $(PATH_OUT)/repackadd && $(SHELL) $(PATH_OUT)/repackadd/sign-attestation.sh $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME)
    391391        $(MV_EXT) $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME).*.zip $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME)
    392392
    393 #
    394 # This creates a .CAB file of the driver files that should be attestation signed.
    395 #
    396 $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME): \
    397                 $(PATH_OUT)/repackadd/PackDriversForSubmission.cmd \
    398 #               $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) - is is unsafe, because of the 'ing ugly hack replacing most of them above during packing.
     393 #
     394 # This creates a .CAB file of the driver files that should be attestation signed.
     395 #
     396 $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME): \
     397                $(PATH_OUT)/repackadd/PackDriversForSubmission.cmd \
     398                # $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) - is is unsafe, because of the 'ing ugly hack replacing most of them above during packing.
    399399        $(RM_EXT) -f $(PATH_OUT)/repackadd/*.cab
    400400        $(RM_EXT) -f $(PATH_OUT)/repackadd/*.ddf
    … …  
    424424
    425425ifndef VBOX_OSE
    426 RePackScriptsAdd_SOURCES += \
    427         $(RePackScriptsAdd_0_OUTDIR)/Combined-0-Additions.cmd \
    428         $(RePackScriptsAdd_0_OUTDIR)/Combined-2-SignAdditions.cmd \
    429         ../../../Installer/win/Scripts/sign-attestation.sh
     426 RePackScriptsAdd_SOURCES += \
     427        $(RePackScriptsAdd_0_OUTDIR)/Combined-0-Additions.cmd \
     428        $(RePackScriptsAdd_0_OUTDIR)/Combined-2-SignAdditions.cmd \
     429        ../../../Installer/win/Scripts/sign-attestation.sh
    430430endif
    431431
    … …  
    433433$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-1-Prepare.cmd,Combined-1-Prepare.cmd)
    434434ifndef VBOX_OSE
    435 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-0-Additions.cmd,Combined-0-Additions.cmd)
    436 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-2-SignAdditions.cmd,Combined-2-SignAdditions.cmd)
     435 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-0-Additions.cmd,Combined-0-Additions.cmd)
     436 $(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-2-SignAdditions.cmd,Combined-2-SignAdditions.cmd)
    437437endif
    438438$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScriptsAdd,../../../Installer/win/Scripts/Combined-3-RepackAdditions.cmd,Combined-3-RepackAdditions.cmd)
    … …  
    470470        VBoxGuestAdditionsCommon.nsh \
    471471        VBoxGuestAdditionsExternal.nsh \
    472         VBoxGuestAdditionsLog.nsh\
     472        VBoxGuestAdditionsLog.nsh \
    473473        VBoxGuestAdditionsNT4.nsh \
    474474        VBoxGuestAdditionsUninstall.nsh \
    475475        VBoxGuestAdditionsUninstallOld.nsh \
    476         VBoxGuestAdditionsVista.nsh\
    477         VBoxGuestAdditionsW2KXP.nsh\
     476        VBoxGuestAdditionsVista.nsh \
     477        VBoxGuestAdditionsW2KXP.nsh \
    478478        winver.nsh \
    479479        ISO/AUTORUN.INF \
    480480        ISO/NT3xReadme.txt \
    481        \
     481        \
    482482        Languages/English.nsh=>Languages/English.nsh \
    483483        Languages/French.nsh=>Languages/French.nsh \
    … …  
    494494PROGRAMS.win.x86 += VBoxAddInstallNt3x
    495495ifdef VBOX_WITH_NOCRT_STATIC
    496 ## @todo noCRT: the result is much too big. Got rid of log.cpp, but still pretty big. Work on reducing it.
    497 VBoxAddInstallNt3x_TEMPLATE := VBoxGuestR3Exe
     496 ## @todo noCRT: the result is much too big. Got rid of log.cpp, but still pretty big. Work on reducing it.
     497 VBoxAddInstallNt3x_TEMPLATE := VBoxGuestR3Exe
    498498else
    499 VBoxAddInstallNt3x_TEMPLATE := VBoxGuestR3NoCrtExe
     499 VBoxAddInstallNt3x_TEMPLATE := VBoxGuestR3NoCrtExe
    500500endif
    501501VBoxAddInstallNt3x_SOURCES  := VBoxAddInstallNt3x.cpp
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