Changeset 72047 in vbox for trunk/src

Timestamp:

Apr 27, 2018 12:07:20 AM (7 years ago)

Author:

vboxsync

Message:

Installer/win,Config.kmk: First draft of toplevel scripts for combined builds. Added revision as comment on inf-files. Added VBOX_EDIT_VERSION_AND_BUILD_RULE_FN macro. bugref:8691

Location:

trunk/src/VBox/Installer/win

Files:

• Makefile.kmk (modified) (2 diffs)
• Scripts/Combined-1-Prepare.cmd (added)
• Scripts/Combined-3-Repack.cmd (added)
• Scripts/PackDriversForSubmission.cmd (modified) (4 diffs)
• Scripts/RepackExtPack.cmd (modified) (5 diffs)
• Scripts/UnpackBlessedDrivers.cmd (modified) (5 diffs)

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -1005 +1005 @@
 RePackScripts_INSTTYPE = stage
 RePackScripts_SOURCES = \
-        Scripts/PackDriversForSubmission.cmd \
         Scripts/UnpackBlessedDrivers.cmd \
+        $(RePackScripts_0_OUTDIR)/PackDriversForSubmission.cmd \
         $(RePackScripts_0_OUTDIR)/sign-dual.cmd \
         $(RePackScripts_0_OUTDIR)/sign-sha1.cmd \
@@ -1013 +1013 @@
 if !defined(VBOX_WITH_COMBINED_PACKAGE) || "$(KBUILD_TARGET_ARCH)" == "x86"
  RePackScripts_SOURCES += \
-        Scripts/RepackExtPack.cmd
+        $(RePackScripts_0_OUTDIR)/RepackExtPack.cmd
+endif
+if defined(VBOX_WITH_COMBINED_PACKAGE) && "$(KBUILD_TARGET_ARCH)" == "x86"
+ RePackScripts_SOURCES += \
+        $(RePackScripts_0_OUTDIR)/Combined-1-Prepare.cmd \
+        $(RePackScripts_0_OUTDIR)/Combined-3-Repack.cmd
 endif
 RePackScripts_CLEAN = \
+        $(RePackScripts_0_OUTDIR)/PackDriversForSubmission.cmd \
         $(RePackScripts_0_OUTDIR)/sign-dual.cmd \
         $(RePackScripts_0_OUTDIR)/sign-sha1.cmd \
         $(RePackScripts_0_OUTDIR)/VMMR0.inf \
         $(RePackScripts_0_OUTDIR)/VBoxExtPackPuel.inf
+
+$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/PackDriversForSubmission.cmd,PackDriversForSubmission.cmd)
+$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/RepackExtPack.cmd,RepackExtPack.cmd)
+$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-1-Prepare.cmd,Combined-1-Prepare.cmd)
+$(call VBOX_EDIT_VERSION_AND_BUILD_RULE_FN,RePackScripts,Scripts/Combined-3-Repack.cmd,Combined-3-Repack.cmd)
 
 $$(RePackScripts_0_OUTDIR)/sign-dual.cmd: | $$(dir $$@)

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

@@ -31 +31 @@
 set _MY_OPT_OUTPUT=
 set _MY_OPT_DDF_FILE=
-set _MY_OPT_ARCH=
+set _MY_OPT_ARCH=@KBUILD_TARGET_ARCH@
 
 :argument_loop
@@ -70 +70 @@
 
 :opt_a
-if ".%2" == "."             goto syntax_error_missing_value
+if ".%~2" == "."            goto syntax_error_missing_value
 if not "%2" == "x86" if not "%2" == "amd64" goto syntax_error_unknown_arch
-set _MY_OPT_ARCH=%2
+set _MY_OPT_ARCH=%~2
 goto argument_loop_next_with_value
 
 :opt_b
-if ".%2" == "."             goto syntax_error_missing_value
-set _MY_OPT_BINDIR=%2
+if ".%~2" == "."            goto syntax_error_missing_value
+set _MY_OPT_BINDIR=%~2
 goto argument_loop_next_with_value
 
 :opt_d
-if ".%2" == "."             goto syntax_error_missing_value
-set _MY_OPT_DDF_FILE=%2
+if ".%~2" == "."            goto syntax_error_missing_value
+set _MY_OPT_DDF_FILE=%~2
 goto argument_loop_next_with_value
 
 :opt_e
-if ".%2" == "."             goto syntax_error_missing_value
-set _MY_OPT_EXTPACK=%2
+if ".%~2" == "."            goto syntax_error_missing_value
+set _MY_OPT_EXTPACK=%~2
 goto argument_loop_next_with_value
 
@@ -106 +106 @@
 
 :opt_p
-if ".%2" == "."             goto syntax_error_missing_value
-set _MY_OPT_PDBDIR=%2
+if ".%~2" == "."            goto syntax_error_missing_value
+set _MY_OPT_PDBDIR=%~2
 goto argument_loop_next_with_value
 
 :opt_o
-if ".%2" == "."             goto syntax_error_missing_value
-set _MY_OPT_OUTPUT=%2
+if ".%~2" == "."            goto syntax_error_missing_value
+set _MY_OPT_OUTPUT=%~2
 goto argument_loop_next_with_value
 
@@ -162 +162 @@
 :no_extack_validation
 
-if ".%_MY_OPT_ARCH%" == "."         if exist "%_MY_OPT_BINDIR%\x86" set _MY_OPT_ARCH=amd64
-if ".%_MY_OPT_ARCH%" == "."         set _MY_OPT_ARCH=x86
-
-if ".%_MY_OPT_OUTPUT%" == "."       set _MY_OPT_OUTPUT=VBoxDrivers-%_MY_OPT_ARCH%.cab
+if ".%_MY_OPT_OUTPUT%" == "."       set _MY_OPT_OUTPUT=VBoxDrivers-@VBOX_VERSION_STRING@r@VBOX_SVN_REV@-%_MY_OPT_ARCH%.cab
 if exist "%_MY_OPT_OUTPUT%"         goto error_output_exists
 

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

@@ -30 +30 @@
 rem Parse arguments.
 rem
-set _MY_OPT_BINDIR_X86=..\bin
-set _MY_OPT_BINDIR_AMD64=
+set _MY_OPT_BINDIR_X86=..\..\..\win.x86\@KBUILD_TYPE@\bin
+set _MY_OPT_BINDIR_AMD64=..\..\..\win.amd64\@KBUILD_TYPE@\bin
 set _MY_OPT_INPUT=
 set _MY_OPT_OUTPUT=
 set _MY_OPT_STAGE_DIR=.\repack-extpack-%RANDOM%
+for %%i in (%_MY_OPT_STAGE_DIR%) do set _MY_OPT_STAGE_DIR=%%~fi
 set _MY_OPT_SIGN_CAT=1
 
@@ -68 +69 @@
 
 :opt_a
-if ".%2" == "."             goto syntax_error_missing_value
-set _MY_OPT_BINDIR_AMD64=%2
+if ".%~2" == "."            goto syntax_error_missing_value
+set _MY_OPT_BINDIR_AMD64=%~f2
 goto argument_loop_next_with_value
 
 :opt_b
-if ".%2" == "."             goto syntax_error_missing_value
-set _MY_OPT_BINDIR_X86=%2
+if ".%~2" == "."            goto syntax_error_missing_value
+set _MY_OPT_BINDIR_X86=%~f2
 goto argument_loop_next_with_value
 
@@ -90 +91 @@
 
 :opt_i
-if ".%2" == "."             goto syntax_error_missing_value
-set _MY_OPT_INPUT=%2
+if ".%~2" == "."            goto syntax_error_missing_value
+set _MY_OPT_INPUT=%~f2
 goto argument_loop_next_with_value
 
 :opt_o
-if ".%2" == "."             goto syntax_error_missing_value
-set _MY_OPT_OUTPUT=%2
+if ".%~2" == "."            goto syntax_error_missing_value
+set _MY_OPT_OUTPUT=%~f2
 goto argument_loop_next_with_value
 
 :opt_s
-if ".%2" == "."             goto syntax_error_missing_value
-set _MY_OPT_STAGE_DIR=%2
+if ".%~2" == "."            goto syntax_error_missing_value
+set _MY_OPT_STAGE_DIR=%~f2
 goto argument_loop_next_with_value
 
@@ -125 +126 @@
 
 :no_more_arguments
-rem validate specified options
-if not exist "%_MY_OPT_BINDIR_X86%" goto error_bindir_x86_does_not_exist
-
-if ".%_MY_OPT_BINDIR_AMD64%" == "." set _MY_OPT_BINDIR_AMD64=%_MY_OPT_BINDIR_X86%\..\..\..\win.amd64\release\bin
+rem
+rem Validate and adjust specified options.
+rem
+if not exist "%_MY_OPT_BINDIR_X86%"   goto error_bindir_x86_does_not_exist
 if not exist "%_MY_OPT_BINDIR_AMD64%" goto error_bindir_amd64_does_not_exist
 
@@ -134 +135 @@
 if not exist "%_MY_OPT_INPUT%"      goto error_input_not_found
 
-if ".%_MY_OPT_OUTPUT%" == "."       set _MY_OPT_OUTPUT=Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack
+if ".%_MY_OPT_OUTPUT%" == "."       for %%i in ("%_MY_OPT_INPUT%") do set _MY_OPT_OUTPUT=.\%%~nxi
 
 rem Make _MY_OPT_STAGE_DIR absolute.
-for %%i in (%_MY_OPT_STAGE_DIR%) do set _MY_OPT_STAGE_DIR=%%~fi
 if exist "%_MY_OPT_STAGE_DIR%"      goto error_stage_dir_exists
 

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

@@ -22 +22 @@
 
 rem
-rem Check for environment variables we need.
+rem Globals and Check for environment variables we need.
 rem
 if ".%KBUILD_DEVTOOLS%" == "." (echo KBUILD_DEVTOOLS is not set & goto end_failed)
+set _MY_DRIVER_BASE_NAMES=VBoxDrv VBoxNetAdp6 VBoxNetLwf VBoxUSB VBoxUSBMon
+set _MY_DRIVER_BASE_NAMES=VBoxDrv VBoxNetAdp6 VBoxNetLwf VBoxUSB VBoxUSBMon
+set _MY_UNZIP=%KBUILD_DEVTOOLS%\win.x86\bin\unzip.exe
+if not exist "%_MY_UNZIP%" (echo "%_MY_UNZIP%" does not exist & goto end_failed)
 
 rem
@@ -60 +64 @@
 
 :opt_b
-if ".%2" == "."             goto syntax_error_missing_value
-set _MY_OPT_BINDIR=%2
+if ".%~2" == "."            goto syntax_error_missing_value
+set _MY_OPT_BINDIR=%~2
 goto argument_loop_next_with_value
 
@@ -75 +79 @@
 
 :opt_i
-if ".%2" == "."             goto syntax_error_missing_value
-set _MY_OPT_INPUT=%2
+if ".%~2" == "."            goto syntax_error_missing_value
+set _MY_OPT_INPUT=%~2
 goto argument_loop_next_with_value
 
@@ -106 +110 @@
 rem
 rem Unpack the stuff.
+rem We ignore error level 1 here as that is what unzip returns on warning (slashes).
 rem
-%KBUILD_DEVTOOLS%\win.x86\bin\unzip.exe -o -j "%_MY_OPT_INPUT%" -d "%_MY_OPT_BINDIR%" || goto end_failed
+"%_MY_UNZIP%" -o -j "%_MY_OPT_INPUT%" -d "%_MY_OPT_BINDIR%" && goto unzip_okay
+if NOT ERRORLEVEL 1 goto end_failed
+:unzip_okay
+
+rem
+rem Verify it against the PreW10 catalog files we saved.
+rem
+set _MY_SIGNTOOL=%KBUILD_DEVTOOLS%\win.x86\sdk\v8.1\bin\x86\signtool.exe
+if not exist "%_MY_SIGNTOOL%" set _MY_SIGNTOOL=%KBUILD_DEVTOOLS%\win.x86\selfsign\r3\signtool.exe
+
+for %%d in (%_MY_DRIVER_BASE_NAMES%) do (
+    @echo * Verifying %%d against %%d.cat...
+    "%_MY_SIGNTOOL%" verify /kp /c "%_MY_OPT_BINDIR%\%%d.cat"        "%_MY_OPT_BINDIR%\%%d.inf" || goto end_failed
+    "%_MY_SIGNTOOL%" verify /kp /c "%_MY_OPT_BINDIR%\%%d.cat"        "%_MY_OPT_BINDIR%\%%d.sys" || goto end_failed
+    @echo * Verifying %%d against %%d-PreW10.cat...
+    "%_MY_SIGNTOOL%" verify /kp /c "%_MY_OPT_BINDIR%\%%d-PreW10.cat" "%_MY_OPT_BINDIR%\%%d.inf" || goto end_failed
+    "%_MY_SIGNTOOL%" verify /kp /c "%_MY_OPT_BINDIR%\%%d-PreW10.cat" "%_MY_OPT_BINDIR%\%%d.sys" || goto end_failed
+)
+
 
 rem
 rem Modify the catalog signatures.
 rem
-for %%cat in (VBoxDrv.cat VBoxNetAdp6.cat VBoxNetLwf.cat VBoxUSB.cat VBoxUSBMon.cat) do (
-    copy /y "%_MY_OPT_BINDIR%\%cat%" "%_MY_OPT_BINDIR%\%cat%.ms" || goto end_failed
-    call sign-dual.cmd "%_MY_OPT_BINDIR%\%cat%" || goto end_failed
-    "%_MY_OPT_BINDIR%\tools\RTSignTool.exe"  add-nested-exe-signature -v "%_MY_OPT_BINDIR%\%cat%" "%_MY_OPT_BINDIR%\%cat%.ms" || goto end_failed
+for %%d in (%_MY_DRIVER_BASE_NAMES%) do (
+    copy /y "%_MY_OPT_BINDIR%\%%d.cat" "%_MY_OPT_BINDIR%\%%d.cat.ms" || goto end_failed
+    call sign-dual.cmd "%_MY_OPT_BINDIR%\%%d.cat" || goto end_failed
+    "%_MY_OPT_BINDIR%\tools\RTSignTool.exe"  add-nested-exe-signature -v "%_MY_OPT_BINDIR%\%%d.cat" "%_MY_OPT_BINDIR%\%%d.cat.ms" || goto end_failed
 )
 
@@ -121 +144 @@
 
 :end_failed
+@echo failed (%ERRORLEVEL%)
 @endlocal
 @endlocal