VirtualBox

Changeset 104863 in vbox for trunk/src/VBox


Ignore:
Timestamp:
Jun 6, 2024 2:29:21 PM (8 months ago)
Author:
vboxsync
Message:

Config.kmk, ExtPacks/Puel, Installer/win, ValidationKit, tools/bin: bugref:10690: Rebranding ExtPack; No webtools, they will go as separate commit.

Location:
trunk/src/VBox
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Installer/win/Scripts/Combined-1-Prepare.cmd

    r98103 r104863  
    4747set _MY_OPT_UNTAR_DIR=%_MY_SCRIPT_DIR%\..\..\..
    4848for %%i in (%_MY_OPT_UNTAR_DIR%) do set _MY_OPT_UNTAR_DIR=%%~fi
    49 set _MY_OPT_EXTPACK=%_MY_OPT_UNTAR_DIR%\Oracle_VM_VirtualBox_Extension_Pack-%_MY_VER_REV%.vbox-extpack
    50 set _MY_OPT_EXTPACK_ENTERPRISE=%_MY_OPT_UNTAR_DIR%\Oracle_VM_VirtualBox_Extension_Pack-%_MY_VER_REV%-ENTERPRISE.vbox-extpack
     49set _MY_OPT_EXTPACK=%_MY_OPT_UNTAR_DIR%\Oracle_VirtualBox_Extension_Pack-%_MY_VER_REV%.vbox-extpack
     50set _MY_OPT_EXTPACK_ENTERPRISE=%_MY_OPT_UNTAR_DIR%\Oracle_VirtualBox_Extension_Pack-%_MY_VER_REV%-ENTERPRISE.vbox-extpack
    5151set _MY_OPT_BUILD_TYPE=@KBUILD_TYPE@
    5252set _MY_OPT_OUTDIR=%_MY_OPT_UNTAR_DIR%\output
    … …  
    213213rem
    214214echo on
    215 copy /y "%_MY_OPT_EXTPACK%" "%_MY_BINDIR_AMD64%\Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack" || goto end_failed
    216 copy /y "%_MY_OPT_EXTPACK%"   "%_MY_BINDIR_X86%\Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack" || goto end_failed
     215copy /y "%_MY_OPT_EXTPACK%" "%_MY_BINDIR_AMD64%\Oracle_VirtualBox_Extension_Pack.vbox-extpack" || goto end_failed
     216copy /y "%_MY_OPT_EXTPACK%"   "%_MY_BINDIR_X86%\Oracle_VirtualBox_Extension_Pack.vbox-extpack" || goto end_failed
    217217@echo off
    218218

  • trunk/src/VBox/Installer/win/Scripts/Combined-3-Repack.cmd

    r99676 r104863  
    4545set _MY_OPT_UNTAR_DIR=%_MY_SCRIPT_DIR%\..\..\..\
    4646for %%i in (%_MY_OPT_UNTAR_DIR%) do set _MY_OPT_UNTAR_DIR=%%~fi
    47 set _MY_OPT_EXTPACK=%_MY_OPT_UNTAR_DIR%\Oracle_VM_VirtualBox_Extension_Pack-%_MY_VER_REV%.vbox-extpack
    48 set _MY_OPT_EXTPACK_ENTERPRISE=%_MY_OPT_UNTAR_DIR%\Oracle_VM_VirtualBox_Extension_Pack-%_MY_VER_REV%-ENTERPRISE.vbox-extpack
     47set _MY_OPT_EXTPACK=%_MY_OPT_UNTAR_DIR%\Oracle_VirtualBox_Extension_Pack-%_MY_VER_REV%.vbox-extpack
     48set _MY_OPT_EXTPACK_ENTERPRISE=%_MY_OPT_UNTAR_DIR%\Oracle_VirtualBox_Extension_Pack-%_MY_VER_REV%-ENTERPRISE.vbox-extpack
    4949set _MY_OPT_BUILD_TYPE=@KBUILD_TYPE@
    5050set _MY_OPT_OUTDIR=%_MY_OPT_UNTAR_DIR%\output

  • trunk/src/VBox/Installer/win/Scripts/PackDriversForSubmission.cmd

    r104431 r104863  
    199199if "%_MY_OPT_WITH_EXTPACK%" == "0"  goto no_extpack_validation
    200200if "%_MY_OPT_NO_EXTRACT%" == "1"    goto no_extpack_validation
    201 if ".%_MY_OPT_EXTPACK%" == "."      set _MY_OPT_EXTPACK=%_MY_OPT_BINDIR%\Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack
     201if ".%_MY_OPT_EXTPACK%" == "."      set _MY_OPT_EXTPACK=%_MY_OPT_BINDIR%\Oracle_VirtualBox_Extension_Pack.vbox-extpack
    202202if not exist "%_MY_OPT_EXTPACK%"    goto error_extpack_does_not_exist
    203203:no_extpack_validation
    … …  
    224224set PATH=%SystemRoot%\System32;%PATH%;%_MY_OPT_BINDIR%
    225225if "%_MY_OPT_WITH_EXTPACK%" == "0" goto no_extpack_unpack
    226 set _MY_EXTPACK_DIR=%_MY_OPT_BINDIR%\ExtensionPacks\Oracle_VM_VirtualBox_Extension_Pack
     226set _MY_EXTPACK_DIR=%_MY_OPT_BINDIR%\ExtensionPacks\Oracle_VirtualBox_Extension_Pack
    227227if not exist "%_MY_OPT_BINDIR%\ExtensionPacks"  ( mkdir "%_MY_OPT_BINDIR%\ExtensionPacks" || goto end_failed )
    228228if not exist "%_MY_EXTPACK_DIR%"                ( mkdir "%_MY_EXTPACK_DIR%" || goto end_failed )

  • trunk/src/VBox/Installer/win/Scripts/RepackExtPack.cmd

    r98103 r104863  
    142142if not exist "%_MY_OPT_BINDIR_AMD64%" goto error_bindir_amd64_does_not_exist
    143143
    144 if ".%_MY_OPT_INPUT%" == "."        set _MY_OPT_INPUT=%_MY_OPT_BINDIR_X86%\Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack
     144if ".%_MY_OPT_INPUT%" == "."        set _MY_OPT_INPUT=%_MY_OPT_BINDIR_X86%\Oracle_VirtualBox_Extension_Pack.vbox-extpack
    145145if not exist "%_MY_OPT_INPUT%"      goto error_input_not_found
    146146

  • trunk/src/VBox/Installer/win/Scripts/Single-1-Prepare.cmd

    r98103 r104863  
    4545set _MY_OPT_UNTAR_DIR=%_MY_SCRIPT_DIR%\..\
    4646for %%i in (%_MY_OPT_UNTAR_DIR%) do set _MY_OPT_UNTAR_DIR=%%~fi
    47 set _MY_OPT_EXTPACK=%_MY_OPT_UNTAR_DIR%\Oracle_VM_VirtualBox_Extension_Pack-%_MY_VER_REV%.vbox-extpack
    48 set _MY_OPT_EXTPACK_ENTERPRISE=%_MY_OPT_UNTAR_DIR%\Oracle_VM_VirtualBox_Extension_Pack-%_MY_VER_REV%-ENTERPRISE.vbox-extpack
     47set _MY_OPT_EXTPACK=%_MY_OPT_UNTAR_DIR%\Oracle_VirtualBox_Extension_Pack-%_MY_VER_REV%.vbox-extpack
     48set _MY_OPT_EXTPACK_ENTERPRISE=%_MY_OPT_UNTAR_DIR%\Oracle_VirtualBox_Extension_Pack-%_MY_VER_REV%-ENTERPRISE.vbox-extpack
    4949set _MY_OPT_BUILD_TYPE=@KBUILD_TYPE@
    5050set _MY_OPT_OUTDIR=%_MY_OPT_UNTAR_DIR%\output
    … …  
    188188rem
    189189echo on
    190 copy /y "%_MY_OPT_EXTPACK%" "%_MY_BINDIR%\Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack" || goto end_failed
     190copy /y "%_MY_OPT_EXTPACK%" "%_MY_BINDIR%\Oracle_VirtualBox_Extension_Pack.vbox-extpack" || goto end_failed
    191191@echo off
    192192

  • trunk/src/VBox/Installer/win/Scripts/Single-3-Repack.cmd

    r100152 r104863  
    4545set _MY_OPT_UNTAR_DIR=%_MY_SCRIPT_DIR%\..\
    4646for %%i in (%_MY_OPT_UNTAR_DIR%) do set _MY_OPT_UNTAR_DIR=%%~fi
    47 set _MY_OPT_EXTPACK=%_MY_OPT_UNTAR_DIR%\Oracle_VM_VirtualBox_Extension_Pack-%_MY_VER_REV%.vbox-extpack
    48 set _MY_OPT_EXTPACK_ENTERPRISE=%_MY_OPT_UNTAR_DIR%\Oracle_VM_VirtualBox_Extension_Pack-%_MY_VER_REV%-ENTERPRISE.vbox-extpack
     47set _MY_OPT_EXTPACK=%_MY_OPT_UNTAR_DIR%\Oracle_VirtualBox_Extension_Pack-%_MY_VER_REV%.vbox-extpack
     48set _MY_OPT_EXTPACK_ENTERPRISE=%_MY_OPT_UNTAR_DIR%\Oracle_VirtualBox_Extension_Pack-%_MY_VER_REV%-ENTERPRISE.vbox-extpack
    4949set _MY_OPT_BUILD_TYPE=@KBUILD_TYPE@
    5050set _MY_OPT_OUTDIR=%_MY_OPT_UNTAR_DIR%\output

  • trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py

    r104689 r104863  
    12131213            return False;
    12141214
    1215         sExtPack = self._findFile('Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack');
     1215        sExtPack = self._findFile('Oracle_VirtualBox_Extension_Pack.vbox-extpack');
    12161216        if sExtPack is None:
    1217             sExtPack = self._findFile('Oracle_VM_VirtualBox_Extension_Pack.*.vbox-extpack');
     1217            sExtPack = self._findFile('Oracle_VirtualBox_Extension_Pack.*.vbox-extpack');
    12181218        if sExtPack is None:
    12191219            return True;
    12201220
    1221         sDstDir = os.path.join(sExtPackDir, 'Oracle_VM_VirtualBox_Extension_Pack');
     1221        sDstDir = os.path.join(sExtPackDir, 'Oracle_VirtualBox_Extension_Pack');
    12221222        reporter.log('Installing extension pack "%s" to "%s"...' % (sExtPack, sExtPackDir));
    12231223        fRc, _ = self._sudoExecuteSync([ self.getBinTool('vts_tar'),
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