X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=47d0fd10cfe830eddd6c3517c3b57b2feb983610;hp=4a5abcc5869941a221fef24f1f244df4eb52db08;hb=8d7538351f1460a3312f69db2f5eb5aaf2c2a1df;hpb=11f009f190e49bcfd888cc0b4c808e0037204c16 diff --git a/edksetup.bat b/edksetup.bat index 4a5abcc586..47d0fd10cf 100644 --- a/edksetup.bat +++ b/edksetup.bat @@ -10,12 +10,12 @@ @REM @REM set following environment in this file or in command shell -@REM set JAVA_HOME=C:\Java\jdk1.5.0_04 +@REM set JAVA_HOME=C:\Java\jdk1.5.0_06 @REM set ANT_HOME=C:\ANT @REM set XMLBEANS_HOME=C:\xmlbeans @REM set CYGWIN_HOME=C:\cygwin -@REM usage: edksetup.bat [Rebuild] [ForceRebuild] +@REM usage: edksetup.bat [Rebuild] [ForceRebuild] [Reconfig] @REM if the argument, skip is present, only the paths and the @REM test and set of environment settings are performed. @@ -67,6 +67,9 @@ set WORKSPACE=%CD% set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin +if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH=%CLASSPATH% +set CLASSPATH=%ORIGINAL_CLASSPATH% + if defined WORKSPACE_TOOLS_PATH goto check_path set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH% set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH% @@ -76,19 +79,22 @@ goto path_ok :check_path if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH% -set WORKSPACE_PATH=%WORKSPACE% +set WORKSPACE_TOOLS_PATH=%WORKSPACE%\Tools\bin echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE :path_ok -@if "%1"=="-h" goto Usage -@if "%1"=="-help" goto Usage -@if "%1"=="--help" goto Usage -@if "%1"=="/h" goto Usage -@if "%1"=="/?" goto Usage -@if "%1"=="/help" goto Usage +@if /I "%1"=="-h" goto Usage +@if /I "%1"=="-help" goto Usage +@if /I "%1"=="--help" goto Usage +@if /I "%1"=="/h" goto Usage +@if /I "%1"=="/?" goto Usage +@if /I "%1"=="/help" goto Usage +@if /I "%1"=="ForceRebuild" goto ForceBuild +@if /I "%1"=="Reconfig" goto Reconfig @IF NOT EXIST "Tools\Jars\Common.jar" goto NormalBuild +@IF NOT EXIST "Tools\Jars\PcdTools.jar" goto NormalBuild @IF NOT EXIST "Tools\Jars\GenBuild.jar" goto NormalBuild @IF NOT EXIST "Tools\Jars\SurfaceArea.jar" goto NormalBuild @IF NOT EXIST "Tools\Jars\cpptasks.jar" goto NormalBuild @@ -126,14 +132,13 @@ echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WO @IF NOT EXIST "Tools\bin\antlr.exe" goto NormalBuild @IF NOT EXIST "Tools\bin\dlg.exe" goto NormalBuild -@if "%1"=="Rebuild" goto NormalBuild -@if "%1"=="ForceRebuild" goto ForceBuild +@if /I "%1"=="Rebuild" goto NormalBuild @if NOT "%1"=="" goto Usage goto skipbuild -:ForceBuild -call ant -f %WORKSPACE%\Tools\build.xml cleanall +:ForceBuild +call ant -f %WORKSPACE%\Tools\build.xml -noclasspath cleanall :NormalBuild @REM @@ -149,13 +154,13 @@ echo. @REM Java Programs can use it. @REM It needs the XMLBEANS libraries in order to compile. @REM -set CLASSPATH=%XMLBEANS_HOME%\lib -set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar -set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar -set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar -set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xmlpublic.jar -set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar -set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar +set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH% call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea @@ -163,7 +168,7 @@ call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea @REM Now we can make the other Java Programs @REM All of the remaining Java Programs require the SurfaceArea library to compile @REM -set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar +set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH% call ant -f %WORKSPACE%\Tools\build.xml JavaCode @@ -171,11 +176,13 @@ call ant -f %WORKSPACE%\Tools\build.xml JavaCode @REM We have all of the Java Programs and add-in classes created, so we can start @REM using the cpp-tasks to create our tools @REM -set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar -set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar -set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar -set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar -set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar +set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH% call ant -f %WORKSPACE%\Tools\build.xml C_Code @@ -226,25 +233,43 @@ echo XMLBEANS_HOME: %XMLBEANS_HOME% echo CYGWIN_HOME: %CYGWIN_HOME% echo PATH: %PATH% echo. -set CLASSPATH=%XMLBEANS_HOME%\lib -set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar -set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean.jar -set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar -set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xmlpublic.jar -set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar -set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\resolver.jar -set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar -set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar -set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar -set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar -set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar -set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar +set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8-dom.jar;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8-xpath.jar;%CLASSPATH% +set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH% +set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH% echo CLASSPATH: %CLASSPATH% goto end +:Reconfig +@REM +@REM Reinstall all config files +@REM +call ant -f %WORKSPACE%\Tools\build.xml reconfig +goto end + :Usage echo. -echo Usage: %0 [Rebuild] [ForceRebuild] +echo Usage: %0 [Rebuild] [ForceRebuild] [Reconfig] +echo Rebuild: Incremental build, only build those updated tools; +echo ForceRebuild: Rebuild all tools neither updated or not; +echo Reconfig: Reinstall target.txt, tools_def.txt, FrameworkDatabase.db. +echo. +echo Note that target.template, tools_def.template, FrameworkDatabase.template will be +echo only copied to target.txt, tools_def.txt, FrameworkDatabase.db respectively if they +echo are not existed. Using option [Reconfig] to do the force copy. echo. :end