Fixed the GCC assembler issue. Now we can use full GCC tools to build our package.

[mirror_edk2.git] / edksetup.bat

diff --git a/edksetup.bat b/edksetup.bat
index 99a33bc172927ea87429aed2d1e403aa7225e13e..255abdab69d6f1e5b09c8abf7aebd5c6ca009b0c 100644 (file)
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -15,6 +15,9 @@
 @REM set XMLBEANS_HOME=C:\xmlbeans\r
 @REM set CYGWIN_HOME=C:\cygwin\r
 \r
+@REM usage: edksetup.bat [skip]\r
+@REM if the argument, skip is present, only the paths and the\r
+@REM test and set of environment settings are performed. \r
 \r
 @REM ##############################################################\r
 @REM # You should not have to modify anything below this line\r
@@ -62,15 +65,30 @@ if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8
 @REM\r
 set WORKSPACE=%CD%\r
 \r
-set Framework_Tools_Path=%WORKSPACE%\Tools\bin\r
-set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%Framework_Tools_Path%;%PATH%\r
+set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin\r
+\r
+if defined WORKSPACE_TOOLS_PATH goto check_path\r
+set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH%\r
+set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH%\r
+echo Setting the PATH variable to include the Framework_Tools_Path for this WORKSPACE\r
+goto path_ok\r
+\r
+:check_path\r
+if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok\r
+set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH%\r
+set WORKSPACE_PATH=%WORKSPACE%\r
+echo Resetting the PATH variable to include the Framework_Tools_Path for this WORKSPACE\r
+\r
+:path_ok\r
+\r
+if "%1"=="skip" goto skipbuild\r
 \r
 echo.\r
+echo WORKSPACE:     %WORKSPACE%\r
 echo JAVA_HOME:     %JAVA_HOME%\r
 echo ANT_HOME:      %ANT_HOME%\r
 echo XMLBEANS_HOME: %XMLBEANS_HOME%\r
 echo CYGWIN_HOME:   %CYGWIN_HOME%\r
-echo WORKSPACE:     %WORKSPACE%\r
 echo PATH:          %PATH%\r
 echo.\r
 \r
@@ -78,6 +96,7 @@ echo.
 @REM Start to build the Framework Tools\r
 @REM\r
 \r
+\r
 echo.\r
 echo Building the Framework Tools\r
 echo.\r
@@ -87,17 +106,22 @@ echo.
 @REM Java Programs can use it.\r
 @REM It needs the XMLBEANS libraries in order to compile.\r
 @REM\r
-set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar\r
+set CLASSPATH=.;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar\r
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar\r
 set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar;%XMLBEANS_HOME%\lib\resolver.jar\r
 \r
+@if "%1" neq "ForceRebuild" goto NormalBuild\r
+call ant -f %WORKSPACE%\Tools\build.xml cleanall\r
+\r
+:NormalBuild\r
 call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea\r
 \r
 @REM\r
 @REM Now we can make the other Java Programs\r
 @REM All of the remaining Java Programs require the SurfaceArea library to compile\r
 @REM\r
-set CLASSPATH=%CLASSPATH%;%WORKSPACE\%Tools\Jars\SurfaceArea.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\%Tools\Jars\SurfaceArea.jar\r
+\r
 \r
 call ant -f %WORKSPACE%\Tools\build.xml JavaCode\r
 \r
@@ -105,7 +129,8 @@ 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\r
 @REM using the cpp-tasks to create our tools\r
 @REM\r
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%WORKSPACE%\Tools\Jars\GenBuild.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\Common.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.jar\r
 \r
 call ant -f %WORKSPACE%\Tools\build.xml C_Code\r
@@ -145,6 +170,25 @@ echo !!! Please copy saxon8.jar file to XMLBEANS_HOME\lib !!!
 echo.\r
 goto end\r
 \r
+:skipbuild\r
+@REM\r
+@REM This just sets up the CLASSPATH, the rest of the environment should have been set already.\r
+@REM\r
+echo.\r
+echo WORKSPACE:     %WORKSPACE%\r
+echo JAVA_HOME:     %JAVA_HOME%\r
+echo ANT_HOME:      %ANT_HOME%\r
+echo XMLBEANS_HOME: %XMLBEANS_HOME%\r
+echo CYGWIN_HOME:   %CYGWIN_HOME%\r
+echo PATH:          %PATH%\r
+echo.\r
+set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar\r
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar\r
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8.jar;%XMLBEANS_HOME%\lib\resolver.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%WORKSPACE%\Tools\Jars\GenBuild.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.jar\r
+goto end\r
+\r
 :end\r
 @echo on\r
 \r