VirtualBox

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


Ignore:
Timestamp:
Jun 25, 2020 10:22:05 AM (4 years ago)
Author:
vboxsync
Message:

Installer/win,GA/NT/Installer: Stop using obsolete kBuild variable names.

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

Legend:

Unmodified
Added
Removed

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

    r83991 r84945  
    155155        -E 'VBOX_BRAND_LICENSE_RTF=$(subst /,\,$(VBOX_BRAND_LICENSE_RTF))' \
    156156        $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),-E 'VBOX_BRAND_$(lang)_LICENSE_RTF=$(VBOX_BRAND_$(lang)_LICENSE_RTF)') \
    157         -E 'BUILD_TYPE=$(KBUILD_TYPE)' \
    158         -E 'BUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)'
     157        -E 'KBUILD_TYPE=$(KBUILD_TYPE)' \
     158        -E 'KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)'
    159159
    160160ifdef VBOX_SIGNING_MODE

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

    r84433 r84945  
    1616;
    1717
    18 !if $%BUILD_TYPE% == "debug"
     18!if $%KBUILD_TYPE% == "debug"
    1919  !define _DEBUG     ; Turn this on to get extra output
    2020!endif
    … …  
    4545!define PRODUCT_PUBLISHER           "$%VBOX_VENDOR%"
    4646!define PRODUCT_COPYRIGHT           "(C) $%VBOX_C_YEAR% $%VBOX_VENDOR%"
    47 !define PRODUCT_OUTPUT              "VBoxWindowsAdditions-$%BUILD_TARGET_ARCH%.exe"
     47!define PRODUCT_OUTPUT              "VBoxWindowsAdditions-$%KBUILD_TARGET_ARCH%.exe"
    4848!define PRODUCT_WEB_SITE            "http://www.virtualbox.org"
    4949!define PRODUCT_INSTALL_KEY         "${VENDOR_ROOT_KEY}\VirtualBox Guest Additions"
    … …  
    9292!include "ReplaceDLL.nsh"
    9393
    94 !if $%BUILD_TARGET_ARCH% == "amd64"
     94!if $%KBUILD_TARGET_ARCH% == "amd64"
    9595  !include "x64.nsh"
    9696!endif
    … …  
    112112
    113113  ; Icons
    114   !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit
     114  !if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
    115115    !define MUI_ICON "$%VBOX_NSIS_ICON_FILE%"
    116116    !define MUI_UNICON "$%VBOX_NSIS_ICON_FILE%"
    … …  
    194194!ifdef UNINSTALLER_ONLY
    195195  !echo "Uninstaller only!"
    196   OutFile "$%PATH_TARGET%\VBoxWindowsAdditions-$%BUILD_TARGET_ARCH%-uninst.exe"
     196  OutFile "$%PATH_TARGET%\VBoxWindowsAdditions-$%KBUILD_TARGET_ARCH%-uninst.exe"
    197197!else
    198   OutFile "VBoxWindowsAdditions-$%BUILD_TARGET_ARCH%.exe"
     198  OutFile "VBoxWindowsAdditions-$%KBUILD_TARGET_ARCH%.exe"
    199199!endif ; UNINSTALLER_ONLY
    200200
    201201; Define default installation directory
    202 !if $%BUILD_TARGET_ARCH% == "x86" ; 32-bit
     202!if $%KBUILD_TARGET_ARCH% == "x86" ; 32-bit
    203203  InstallDir  "$PROGRAMFILES32\$%VBOX_VENDOR_SHORT%\VirtualBox Guest Additions"
    204204!else       ; 64-bit
    … …  
    252252!include "VBoxGuestAdditionsExternal.nsh"
    253253!include "VBoxGuestAdditionsCommon.nsh"
    254 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit only
     254!if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit only
    255255  !include "VBoxGuestAdditionsNT4.nsh"
    256256!endif
    … …  
    436436  ${EndIf}
    437437  MessageBox MB_OK "${PRODUCT_NAME} Installer$\r$\n$\r$\n \
    438                     Usage: VBoxWindowsAdditions-$%BUILD_TARGET_ARCH% [OPTIONS] [/l] [/S] [/D=<PATH>]$\r$\n$\r$\n \
     438                    Usage: VBoxWindowsAdditions-$%KBUILD_TARGET_ARCH% [OPTIONS] [/l] [/S] [/D=<PATH>]$\r$\n$\r$\n \
    439439                    Options:$\r$\n \
    440440                    /depth=BPP$\tSets the guest's display color depth (bits per pixel)$\r$\n \
    … …  
    622622    ${LogVerbose} "No previous version of ${PRODUCT_NAME} detected"
    623623  ${EndIf}
    624 !if $%BUILD_TARGET_ARCH% == "amd64"
     624!if $%KBUILD_TARGET_ARCH% == "amd64"
    625625  ${LogVerbose} "Detected OS: Windows $g_strWinVersion (64-bit)"
    626626!else
    … …  
    639639  ; Which OS are we using?
    640640  ; @todo Use logic lib here
    641 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit
     641!if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
    642642  StrCmp $g_strWinVersion "NT4" nt4     ; Windows NT 4.0
    643643!endif
    … …  
    657657  Goto notsupported
    658658
    659 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit
     659!if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
    660660nt4: ; Windows NT4
    661661
    … …  
    836836  ; Add Sun Ray  client info keys
    837837  ; Note: We only need 32-bit keys (HKLM\Software / HKLM\Software\Wow6432Node)
    838 !if $%BUILD_TARGET_ARCH% == "amd64"
     838!if $%KBUILD_TARGET_ARCH% == "amd64"
    839839  WriteRegStr HKLM "SOFTWARE\Wow6432Node\Oracle\Sun Ray\ClientInfoAgent\ReconnectActions" "" ""
    840840  WriteRegStr HKLM "SOFTWARE\Wow6432Node\Oracle\Sun Ray\ClientInfoAgent\DisconnectActions" "" ""
    … …  
    10051005  Pop $0
    10061006  ${If} $0 <> 0 ; Wrong architecture? Tell the world
    1007 !if $%BUILD_TARGET_ARCH% == "amd64"
     1007!if $%KBUILD_TARGET_ARCH% == "amd64"
    10081008    MessageBox MB_ICONSTOP $(VBOX_NOTICE_ARCH_AMD64) /SD IDOK
    10091009!else

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

    r84735 r84945  
    4545
    4646  Push $0
    47   StrCpy "$0" "$INSTDIR\$%BUILD_TARGET_ARCH%"
     47  StrCpy "$0" "$INSTDIR\$%KBUILD_TARGET_ARCH%"
    4848
    4949  ; Root files
    … …  
    7979  !endif
    8080
    81   !if $%BUILD_TARGET_ARCH% == "amd64"
     81  !if $%KBUILD_TARGET_ARCH% == "amd64"
    8282    FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
    8383    !if $%VBOX_WITH_MESA3D% == "1"
    … …  
    8888    !endif
    8989
    90   !endif ; $%BUILD_TARGET_ARCH% == "amd64"
     90  !endif ; $%KBUILD_TARGET_ARCH% == "amd64"
    9191!endif ; $%VBOX_WITH_WDDM% == "1"
    9292
    … …  
    9999!endif
    100100
    101 !if $%BUILD_TARGET_ARCH% == "x86"
     101!if $%KBUILD_TARGET_ARCH% == "x86"
    102102  SetOutPath "$0\VBoxMouse\NT4"
    103103  FILE "$%PATH_OUT%\bin\additions\VBoxMouseNT.sys"
    … …  
    123123  FILE "$%PATH_OUT%\bin\additions\VBoxSF.sys"
    124124  FILE "$%PATH_OUT%\bin\additions\VBoxMRXNP.dll"
    125   !if $%BUILD_TARGET_ARCH% == "amd64"
     125  !if $%KBUILD_TARGET_ARCH% == "amd64"
    126126    ; Only 64-bit installer: Also copy 32-bit DLLs on 64-bit target
    127127    FILE "$%PATH_OUT%\bin\additions\VBoxMRXNP-x86.dll"
    … …  
    138138  FILE "$%VBOX_PATH_DIFX%\DIFxAPI.dll"
    139139
    140 !if $%BUILD_TARGET_ARCH% == "x86"
     140!if $%KBUILD_TARGET_ARCH% == "x86"
    141141  SetOutPath "$0\Tools\NT4"
    142142  FILE "$%PATH_OUT%\bin\additions\VBoxGuestDrvInst.exe"
    … …  
    158158  ; R0 now contains 1 if we're a 64-bit process, or 0 if not
    159159
    160 !if $%BUILD_TARGET_ARCH% == "amd64"
     160!if $%KBUILD_TARGET_ARCH% == "amd64"
    161161  IntCmp $0 0 wrong_platform
    162162!else ; 32-bit
    … …  
    484484!macro SetAppMode32 un
    485485Function ${un}SetAppMode32
    486   !if $%BUILD_TARGET_ARCH% == "amd64"
     486  !if $%KBUILD_TARGET_ARCH% == "amd64"
    487487    ${EnableX64FSRedirection}
    488488    SetRegView 32
    … …  
    497497!macro SetAppMode64 un
    498498Function ${un}SetAppMode64
    499   !if $%BUILD_TARGET_ARCH% == "amd64"
     499  !if $%KBUILD_TARGET_ARCH% == "amd64"
    500500    ${DisableX64FSRedirection}
    501501    SetRegView 64
    … …  
    819819
    820820  ${LogVerbose} "Restoring original D3D files ..."
    821 !if $%BUILD_TARGET_ARCH% == "x86"
    822   ${CopyFileEx} "${un}" "$SYSDIR\msd3d8.dll" "$SYSDIR\d3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
    823 !endif
    824   ${CopyFileEx} "${un}" "$SYSDIR\msd3d9.dll" "$SYSDIR\d3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
     821!if $%KBUILD_TARGET_ARCH% == "x86"
     822  ${CopyFileEx} "${un}" "$SYSDIR\msd3d8.dll" "$SYSDIR\d3d8.dll" "Microsoft Corporation" "$%KBUILD_TARGET_ARCH%"
     823!endif
     824  ${CopyFileEx} "${un}" "$SYSDIR\msd3d9.dll" "$SYSDIR\d3d9.dll" "Microsoft Corporation" "$%KBUILD_TARGET_ARCH%"
    825825
    826826  ${If} $g_bCapDllCache == "true"
    827 !if $%BUILD_TARGET_ARCH% == "x86"
    828     ${CopyFileEx} "${un}" "$SYSDIR\dllcache\msd3d8.dll" "$SYSDIR\dllcache\d3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
    829 !endif
    830     ${CopyFileEx} "${un}" "$SYSDIR\dllcache\msd3d9.dll" "$SYSDIR\dllcache\d3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
    831   ${EndIf}
    832 
    833 !if $%BUILD_TARGET_ARCH% == "amd64"
     827!if $%KBUILD_TARGET_ARCH% == "x86"
     828    ${CopyFileEx} "${un}" "$SYSDIR\dllcache\msd3d8.dll" "$SYSDIR\dllcache\d3d8.dll" "Microsoft Corporation" "$%KBUILD_TARGET_ARCH%"
     829!endif
     830    ${CopyFileEx} "${un}" "$SYSDIR\dllcache\msd3d9.dll" "$SYSDIR\dllcache\d3d9.dll" "Microsoft Corporation" "$%KBUILD_TARGET_ARCH%"
     831  ${EndIf}
     832
     833!if $%KBUILD_TARGET_ARCH% == "amd64"
    834834  ${CopyFileEx} "${un}" "$g_strSysWow64\msd3d8.dll" "$g_strSysWow64\d3d8.dll" "Microsoft Corporation" "x86"
    835835  ${CopyFileEx} "${un}" "$g_strSysWow64\msd3d9.dll" "$g_strSysWow64\d3d9.dll" "Microsoft Corporation" "x86"

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstall.nsh

    r82968 r84945  
    5353
    5454  ; Delete vendor installation directory (only if completely empty)
    55 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit
     55!if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
    5656  RMDir /REBOOTOK "$PROGRAMFILES32\$%VBOX_VENDOR_SHORT%"
    5757!else   ; 64-bit
    … …  
    7777
    7878  ; Which OS are we using?
    79 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit
     79!if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
    8080  StrCmp $g_strWinVersion "NT4" nt4     ; Windows NT 4.0
    8181!endif
    … …  
    9595  Goto notsupported
    9696
    97 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit
     97!if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
    9898nt4:
    9999
    … …  
    137137
    138138  ; Which OS are we using?
    139 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit
     139!if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
    140140  StrCmp $g_strWinVersion "NT4" nt4     ; Windows NT 4.0
    141141!endif
    … …  
    155155  Goto notsupported
    156156
    157 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit
     157!if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
    158158nt4:
    159159

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsUninstallOld.nsh

    r82968 r84945  
    181181
    182182  ; Delete vendor installation directory (only if completely empty)
    183 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit
     183!if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
    184184  RMDir /REBOOTOK "$PROGRAMFILES32\Sun"
    185185!else   ; 64-bit
    … …  
    248248
    249249  ; Delete vendor installation directory (only if completely empty)
    250 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit
     250!if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
    251251  RMDir /REBOOTOK "$PROGRAMFILES32\Sun"
    252252!else   ; 64-bit
    … …  
    339339
    340340  ; Delete vendor installation directory (only if completely empty)
    341 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit
     341!if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
    342342  RMDir /REBOOTOK "$PROGRAMFILES32\innotek"
    343343!else   ; 64-bit

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsVista.nsh

    r82968 r84945  
    8181Function ${un}Vista_UninstallInstDir
    8282
    83 !if $%BUILD_TARGET_ARCH% == "x86"       ; 32-bit
     83!if $%KBUILD_TARGET_ARCH% == "x86"       ; 32-bit
    8484  Delete /REBOOTOK "$INSTDIR\netamd.inf"
    8585  Delete /REBOOTOK "$INSTDIR\pcntpci5.cat"
    … …  
    120120  Delete /REBOOTOK "$g_strSystemDir\VBoxMMR.exe"
    121121
    122   !if $%BUILD_TARGET_ARCH% == "amd64"
     122  !if $%KBUILD_TARGET_ARCH% == "amd64"
    123123    Delete /REBOOTOK "$g_strSysWow64\VBoxMMRHook.dll"
    124124    Delete /REBOOTOK "$INSTDIR\VBoxMMR-x86.exe"

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

    r82968 r84945  
    247247    !endif
    248248
    249     !if $%BUILD_TARGET_ARCH% == "amd64"
     249    !if $%KBUILD_TARGET_ARCH% == "amd64"
    250250      FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
    251251      !if $%VBOX_WITH_MESA3D% == "1"
    … …  
    255255        FILE "$%PATH_OUT%\bin\additions\VBoxGL-x86.dll"
    256256      !endif
    257     !endif ; $%BUILD_TARGET_ARCH% == "amd64"
     257    !endif ; $%KBUILD_TARGET_ARCH% == "amd64"
    258258
    259259    Goto doneCr
    … …  
    305305  !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMRXNP.dll" "$g_strSystemDir\VBoxMRXNP.dll" "$INSTDIR"
    306306  AccessControl::GrantOnFile "$g_strSystemDir\VBoxMRXNP.dll" "(BU)" "GenericRead"
    307   !if $%BUILD_TARGET_ARCH% == "amd64"
     307  !if $%KBUILD_TARGET_ARCH% == "amd64"
    308308    ; Only 64-bit installer: Copy the 32-bit DLL for 32 bit applications.
    309309    !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMRXNP-x86.dll" "$g_strSysWow64\VBoxMRXNP.dll" "$INSTDIR"
    … …  
    457457    Delete /REBOOTOK "$INSTDIR\libWine.dll"
    458458
    459   !if $%BUILD_TARGET_ARCH% == "amd64"
     459  !if $%KBUILD_TARGET_ARCH% == "amd64"
    460460    Delete /REBOOTOK "$INSTDIR\VBoxDispD3D-x86.dll"
    461461    !if $%VBOX_WITH_MESA3D% == "1"
    … …  
    468468      Delete /REBOOTOK "$INSTDIR\VBoxD3D9wddm-x86.dll"
    469469      Delete /REBOOTOK "$INSTDIR\wined3dwddm-x86.dll"
    470   !endif ; $%BUILD_TARGET_ARCH% == "amd64"
     470  !endif ; $%KBUILD_TARGET_ARCH% == "amd64"
    471471!endif ; $%VBOX_WITH_WDDM% == "1"
    472472
    … …  
    525525
    526526  Delete /REBOOTOK "$g_strSystemDir\VBoxDispD3D.dll"
    527   !if $%BUILD_TARGET_ARCH% == "amd64"
     527  !if $%KBUILD_TARGET_ARCH% == "amd64"
    528528    Delete /REBOOTOK "$g_strSysWow64\VBoxDispD3D-x86.dll"
    529529  !endif
    … …  
    535535    Delete /REBOOTOK "$g_strSystemDir\VBoxGL.dll"
    536536
    537     !if $%BUILD_TARGET_ARCH% == "amd64"
     537    !if $%KBUILD_TARGET_ARCH% == "amd64"
    538538      Delete /REBOOTOK "$g_strSysWow64\VBoxNine-x86.dll"
    539539      Delete /REBOOTOK "$g_strSysWow64\VBoxSVGA-x86.dll"
    … …  
    586586  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxSF" "true"
    587587  Delete /REBOOTOK "$g_strSystemDir\VBoxMRXNP.dll" ; The network provider DLL will be locked
    588   !if $%BUILD_TARGET_ARCH% == "amd64"
     588  !if $%KBUILD_TARGET_ARCH% == "amd64"
    589589    ; Only 64-bit installer: Also remove 32-bit DLLs on 64-bit target arch in Wow64 node
    590590    Delete /REBOOTOK "$g_strSysWow64\VBoxMRXNP.dll"
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