Changeset 74770 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Oct 11, 2018 12:59:30 PM (7 years ago)

Author:

vboxsync

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

125709

Message:

Dropping VBoxDD2R0.r0 & VBoxDDR2RC.rc as they are empty (and thereby causes darwin signing issues). bugref:9232

Location:

trunk/src/VBox/Installer/win

Files:

• Scripts/PackDriversForSubmission.cmd (modified) (1 diff)
• Scripts/VMMR0.inf (modified) (2 diffs)
• VBoxMergeApp.wxi (modified) (2 diffs)

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

@@ -233 +233 @@
 echo %_MY_OPT_BINDIR%\VBoxDDR0.r0 VBoxDDR0.r0>>                                         "%_MY_OPT_DDF_FILE%"
 if "%_MY_OPT_WITH_PDB%" == "1" echo %_MY_OPT_PDBDIR%\VBoxDDR0.pdb VBoxDDR0.pdb>>        "%_MY_OPT_DDF_FILE%"
-if not exist %_MY_OPT_BINDIR%\VBoxDD2R0.r0 goto no_vboxdd2r0
-echo %_MY_OPT_BINDIR%\VBoxDD2R0.r0 VBoxDD2R0.r0>>                                       "%_MY_OPT_DDF_FILE%"
-if "%_MY_OPT_WITH_PDB%" == "1" echo %_MY_OPT_PDBDIR%\VBoxDD2R0.pdb VBoxDD2R0.pdb>>      "%_MY_OPT_DDF_FILE%"
-:no_vboxdd2r0
 
 if "%_MY_OPT_WITH_EXTPACK" == "0"   goto no_extpack_ddf

trunk/src/VBox/Installer/win/Scripts/VMMR0.inf

@@ -30 +30 @@
 VMMR0.r0=1
 VBoxDDR0.r0=1
-VBoxDD2R0.r0=1
 
 [DestinationDirs]
@@ -48 +47 @@
 VMMR0.r0,,,2
 VBoxDDR0.r0,,,2
-VBoxDD2R0.r0,,,2
 
 [Strings]

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -307 +307 @@
         <File Id="file_VBoxDDRC.rc" Name="VBoxDDRC.rc"
               Source="$(env.PATH_OUT)\bin\VBoxDDRC.rc" />
-        <File Id="file_VBoxDD2RC.rc" Name="VBoxDD2RC.rc"
-              Source="$(env.PATH_OUT)\bin\VBoxDD2RC.rc" />
 
         <File Id="file_VMMR0.r0" Name="VMMR0.r0"
@@ -314 +312 @@
         <File Id="file_VBoxDDR0.r0" Name="VBoxDDR0.r0"
               Source="$(env.PATH_OUT)\bin\VBoxDDR0.r0" />
-        <File Id="file_VBoxDD2R0.r0" Name="VBoxDD2R0.r0"
-              Source="$(env.PATH_OUT)\bin\VBoxDD2R0.r0" />
 
 <?if $(env.VBOX_WITH_CROGL) = "yes" ?>