diff options
| author | hche10x <hche10x@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-07-13 01:16:51 +0000 |
|---|---|---|
| committer | hche10x <hche10x@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-07-13 01:16:51 +0000 |
| commit | da1508dd532e99dcf1818655bf37ec0bfa1e5ca6 (patch) | |
| tree | 336672d76ff91e73c1b9a578947d9ab79d309baa | |
| parent | e42dab898f73567b4fa2cb8219cc7f443e7212ac (diff) | |
| download | edk2-da1508dd532e99dcf1818655bf37ec0bfa1e5ca6.tar.gz edk2-da1508dd532e99dcf1818655bf37ec0bfa1e5ca6.tar.bz2 edk2-da1508dd532e99dcf1818655bf37ec0bfa1e5ca6.zip | |
1. Add build FrameworkWizard in edksetup.bat
2. Modify FrameworkWizard.bat to skip building and only run the program
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@934 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | Tools/bin/FrameworkWizard.bat | 56 | ||||
| -rw-r--r-- | edksetup.bat | 1 | ||||
| -rw-r--r-- | edksetup.sh | 1 |
3 files changed, 35 insertions, 23 deletions
diff --git a/Tools/bin/FrameworkWizard.bat b/Tools/bin/FrameworkWizard.bat index 136faae1a3..f8e448c31f 100644 --- a/Tools/bin/FrameworkWizard.bat +++ b/Tools/bin/FrameworkWizard.bat @@ -9,7 +9,7 @@ @REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@REM
-@echo on
+@echo off
:check_java
if "%JAVA_HOME%"=="" goto no_jdk
@@ -19,16 +19,14 @@ if "%WORKSPACE%"=="" goto no_wks if "%ANT_HOME%"=="" goto no_ant
:check_xmlbeans
if "%XMLBEANS_HOME%"=="" goto no_xmlbeans
-
-set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%WORKSPACE%\Tools\bin;%XMLBEANS_HOME%\bin;%PATH%
-
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%XMLBEANS_HOME%\lib\xbean.jar;%XMLBEANS_HOME%\lib\xbean_xpath.jar;%XMLBEANS_HOME%\lib\xmlpublic.jar;%XMLBEANS_HOME%\lib\saxon8.jar;%XMLBEANS_HOME%\lib\resolver.jar;%WORKSPACE%\Tools\bin\FrameworkWizard.jar;.
-
-@REM Build SurfaceArea first
-call "ant" -f %WORKSPACE%\Tools\build.xml SurfaceArea
-
-@REM Build Framework Wizard
-call "ant" -f %WORKSPACE%\Tools\Source\FrameworkWizard\build.xml
+:check_surfacearea
+if not exist %WORKSPACE%\Tools\Jars\SurfaceArea.jar (
+ goto no_surfacearea
+)
+:check_frameworkwizard
+if not exist %WORKSPACE%\Tools\bin\FrameworkWizard.jar (
+ goto no_frameworkwizard
+)
@REM Run Framework Wizard
call "java" org.tianocore.frameworkwizard.FrameworkWizardUI
@@ -36,27 +34,39 @@ call "java" org.tianocore.frameworkwizard.FrameworkWizardUI goto end
:no_jdk
-echo.
-echo !!! Please set JAVA_HOME !!!
-echo.
+@echo.
+@echo !!! Please set JAVA_HOME !!!
+@echo.
goto check_wks
:no_wks
-echo.
-echo !!! Please set WORKSPACE !!!
-echo.
+@echo.
+@echo !!! Please set WORKSPACE !!!
+@echo.
goto check_ant
:no_ant
-echo.
-echo !!! Please set ANT_HOME !!!
-echo.
+@echo.
+@echo !!! Please set ANT_HOME !!!
+@echo.
goto check_xmlbeans
:no_xmlbeans
-echo.
-echo !!! Please set XMLBEANS_HOME !!!
-echo.
+@echo.
+@echo !!! Please set XMLBEANS_HOME !!!
+@echo.
+goto end
+
+:no_surfacearea
+@echo.
+@echo !!! Please run edksetup.bat to build SurfaceArea.jar !!!
+@echo.
+goto end
+
+:no_frameworkwizard
+@echo.
+@echo !!! Please run edksetup.bat to build FrameworkWizard.jar !!!
+@echo.
goto end
:end
diff --git a/edksetup.bat b/edksetup.bat index 3e2da9a5e8..59ddc33175 100644 --- a/edksetup.bat +++ b/edksetup.bat @@ -133,6 +133,7 @@ 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
call ant -f %WORKSPACE%\Tools\build.xml C_Code
diff --git a/edksetup.sh b/edksetup.sh index 37d0b1c80f..8f7ce1bc55 100644 --- a/edksetup.sh +++ b/edksetup.sh @@ -32,6 +32,7 @@ else # These should be ok as they are. export CLASSPATH=$WORKSPACE/Tools/Jars/SurfaceArea.jar:$WORKSPACE/Tools/Jars/frameworktasks.jar:$WORKSPACE/Tools/Jars/cpptasks.jar:$WORKSPACE/Tools/Jars/GenBuild.jar:$XMLBEANS_HOME/lib/resolver.jar:$XMLBEANS_HOME/lib/xbean.jar:$XMLBEANS_HOME/lib/xmlpublic.jar:$XMLBEANS_HOME/lib/jsr173_1.0_api.jar:$XMLBEANS_HOME/lib/saxon8.jar:$XMLBEANS_HOME/lib/xbean_xpath.jar export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Jars/Common.jar +export CLASSPATH=$CLASSPATH:$WORKSPACE/Tools/Bin/FrameworkWizard.jar export FRAMEWORK_TOOLS_PATH=$WORKSPACE/Tools/bin export PATH=$FRAMEWORK_TOOLS_PATH:$ANT_HOME/bin:$JAVA_HOME/bin:$PATH # In some unix-like system, following export is to export system's environment to user's environment |