Fixed a bug in the script - missing % on a WORKSPACE declaration. Also, added an argument, skip, that will skip building tools and re-setting the PATH. executing edksetup skip sets WORKSPACE, FRAMEWORK_TOOLS_PATH, CYGWIN_HOME (if c:\cygwin exists) and the CLASSPATH. This arg was added so that folks who might run the program more than one time from the same command window do not end up with a PATH environment that exceeds the max number of characters.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@456 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lhauch 2006-06-09 15:26:28 +00:00
parent 164803cb04
commit 302e0e4a1f
1 changed files with 30 additions and 2 deletions

View File

@ -15,6 +15,9 @@
@REM set XMLBEANS_HOME=C:\xmlbeans @REM set XMLBEANS_HOME=C:\xmlbeans
@REM set CYGWIN_HOME=C:\cygwin @REM set CYGWIN_HOME=C:\cygwin
@REM usage: edksetup.bat [skip]
@REM if the argument, skip is present, only the paths and the
@REM test and set of environment settings are performed.
@REM ############################################################## @REM ##############################################################
@REM # You should not have to modify anything below this line @REM # You should not have to modify anything below this line
@ -26,6 +29,8 @@
@REM Check the required system environment variables @REM Check the required system environment variables
@REM @REM
if "%1"=="skip" goto skipbuild
:check_vc :check_vc
if defined VCINSTALLDIR goto check_cygwin if defined VCINSTALLDIR goto check_cygwin
if defined VS71COMNTOOLS ( if defined VS71COMNTOOLS (
@ -78,6 +83,7 @@ echo.
@REM Start to build the Framework Tools @REM Start to build the Framework Tools
@REM @REM
echo. echo.
echo Building the Framework Tools echo Building the Framework Tools
echo. echo.
@ -97,7 +103,7 @@ call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea
@REM Now we can make the other Java Programs @REM Now we can make the other Java Programs
@REM All of the remaining Java Programs require the SurfaceArea library to compile @REM All of the remaining Java Programs require the SurfaceArea library to compile
@REM @REM
set CLASSPATH=%CLASSPATH%;%WORKSPACE\%Tools\Jars\SurfaceArea.jar set CLASSPATH=%CLASSPATH%;%WORKSPACE%\%Tools\Jars\SurfaceArea.jar
call ant -f %WORKSPACE%\Tools\build.xml JavaCode call ant -f %WORKSPACE%\Tools\build.xml JavaCode
@ -105,7 +111,7 @@ 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 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 using the cpp-tasks to create our tools
@REM @REM
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%WORKSPACE%\Tools\Jars\GenBuild.jar set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.jar set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.jar
call ant -f %WORKSPACE%\Tools\build.xml C_Code call ant -f %WORKSPACE%\Tools\build.xml C_Code
@ -145,6 +151,28 @@ echo !!! Please copy saxon8.jar file to XMLBEANS_HOME\lib !!!
echo. echo.
goto end goto end
:skipbuild
@REM
@REM This just sets up the CLASSPATH, the rest of the environment should have been set already.
@REM
set WORKSPACE=%CD%
set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin
if exist c:\cygwin set CYGWIN_HOME=c:\cygwin
echo.
echo JAVA_HOME: %JAVA_HOME%
echo ANT_HOME: %ANT_HOME%
echo XMLBEANS_HOME: %XMLBEANS_HOME%
echo CYGWIN_HOME: %CYGWIN_HOME%
echo WORKSPACE: %WORKSPACE%
echo PATH: %PATH%
echo.
set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar
set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar;%XMLBEANS_HOME%\lib\resolver.jar
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%WORKSPACE%\Tools\Jars\GenBuild.jar
set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.jar
goto end
:end :end
@echo on @echo on