2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Simplified Build scripts for Kit and PE

Browse source 
* If the script doesn't exist when called then an :UnknownError is called
  * Checking if it exists and jumping to an additional error is a bit redundant
  * dandi_set_env check remains to alert the tech WADK is missing
This commit is contained in:
2Shirt 2017-12-18 00:49:25 -07:00
parent c1e391132b
commit 8260746d7f
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Build Kit.cmd
View file

@ -7,10 +7,6 @@ setlocal
title Wizard Kit: Build Tool title Wizard Kit: Build Tool
call :CheckFlags %* call :CheckFlags %*
:LaunchPrep
rem Verifies the environment before launching item
if not exist ".bin\Scripts\build_kit.ps1" (goto ErrorBuildKitMissing)
:PrepNewKit :PrepNewKit
rem Copy base files to a new folder OUT_KIT rem Copy base files to a new folder OUT_KIT
robocopy /e .bin OUT_KIT\.bin robocopy /e .bin OUT_KIT\.bin
@ -43,11 +39,6 @@ for %%f in (%*) do (
@exit /b 0 @exit /b 0
:: Errors :: :: Errors ::
:ErrorBuildKitMissing
echo.
echo ERROR: build_kit.ps1 script not found.
goto Abort
:ErrorUnknown :ErrorUnknown
echo. echo.
echo ERROR: Encountered an unknown error. echo ERROR: Encountered an unknown error.

11
Build PE.cmd
View file

@ -8,13 +8,11 @@ title Wizard Kit: Windows PE Build Tool
call :CheckFlags %* call :CheckFlags %*
call :CheckElevation || goto Exit call :CheckElevation || goto Exit
call :FindKitsRoot || goto ErrorKitNotFound call :FindKitsRoot || goto ErrorKitNotFound
set "dandi_set_env=%adk_root%\Deployment Tools\DandISetEnv.bat"
set "ps_script=%~dp0\.bin\Scripts\build_pe.ps1"
:LaunchPrep :LaunchPrep
rem Verify scripts exists rem Update environment using WADK script
set "dandi_set_env=%adk_root%\Deployment Tools\DandISetEnv.bat"
if not exist "%dandi_set_env%" (goto ErrorKitNotFound) if not exist "%dandi_set_env%" (goto ErrorKitNotFound)
if not exist "%ps_script%" (goto ErrorPSScriptMissing)
call "%dandi_set_env%" || goto ErrorUnknown call "%dandi_set_env%" || goto ErrorUnknown
:EnsureCRLF :EnsureCRLF
@ -93,11 +91,6 @@ echo.
echo ERROR: Windows ADK installation not found. echo ERROR: Windows ADK installation not found.
goto Abort goto Abort
:ErrorPSScriptMissing
echo.
echo ERROR: build_pe.ps1 script not found.
goto Abort
:ErrorUnknown :ErrorUnknown
echo. echo.
echo ERROR: Encountered an unknown error. echo ERROR: Encountered an unknown error.