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

diff --git a/Tools/bin/FrameworkWizard.bat b/Tools/bin/FrameworkWizard.bat
index 136faae1a32f6b4e41dd4c9a89ee2f18af73572d..f8e448c31fb8a3392f34dd61b6de5d1976e40f9d 100644 (file)
--- 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.\r
 @REM\r
 \r
-@echo on\r
+@echo off\r
 \r
 :check_java\r
 if "%JAVA_HOME%"=="" goto no_jdk\r
@@ -19,16 +19,14 @@ if "%WORKSPACE%"=="" goto no_wks
 if "%ANT_HOME%"=="" goto no_ant\r
 :check_xmlbeans\r
 if "%XMLBEANS_HOME%"=="" goto no_xmlbeans\r
-\r
-set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%WORKSPACE%\Tools\bin;%XMLBEANS_HOME%\bin;%PATH%\r
-\r
-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;.\r
-\r
-@REM Build SurfaceArea first\r
-call "ant" -f %WORKSPACE%\Tools\build.xml SurfaceArea\r
-\r
-@REM Build Framework Wizard\r
-call "ant" -f %WORKSPACE%\Tools\Source\FrameworkWizard\build.xml\r
+:check_surfacearea\r
+if not exist %WORKSPACE%\Tools\Jars\SurfaceArea.jar (\r
+  goto no_surfacearea\r
+)\r
+:check_frameworkwizard\r
+if not exist %WORKSPACE%\Tools\bin\FrameworkWizard.jar (\r
+  goto no_frameworkwizard\r
+)\r
 \r
 @REM Run Framework Wizard\r
 call "java" org.tianocore.frameworkwizard.FrameworkWizardUI\r
@@ -36,27 +34,39 @@ call "java" org.tianocore.frameworkwizard.FrameworkWizardUI
 goto end\r
 \r
 :no_jdk\r
-echo.\r
-echo !!! Please set JAVA_HOME !!!\r
-echo.\r
+@echo.\r
+@echo !!! Please set JAVA_HOME !!!\r
+@echo.\r
 goto check_wks\r
 \r
 :no_wks\r
-echo.\r
-echo !!! Please set WORKSPACE !!!\r
-echo.\r
+@echo.\r
+@echo !!! Please set WORKSPACE !!!\r
+@echo.\r
 goto check_ant\r
 \r
 :no_ant\r
-echo.\r
-echo !!! Please set ANT_HOME !!!\r
-echo.\r
+@echo.\r
+@echo !!! Please set ANT_HOME !!!\r
+@echo.\r
 goto check_xmlbeans\r
 \r
 :no_xmlbeans\r
-echo.\r
-echo !!! Please set XMLBEANS_HOME !!!\r
-echo.\r
+@echo.\r
+@echo !!! Please set XMLBEANS_HOME !!!\r
+@echo.\r
+goto end\r
+\r
+:no_surfacearea\r
+@echo.\r
+@echo !!! Please run edksetup.bat to build SurfaceArea.jar !!!\r
+@echo.\r
+goto end\r
+\r
+:no_frameworkwizard\r
+@echo.\r
+@echo !!! Please run edksetup.bat to build FrameworkWizard.jar !!!\r
+@echo.\r
 goto end\r
 \r
 :end\r

diff --git a/edksetup.bat b/edksetup.bat
index 3e2da9a5e816d7d28a4d350685f01eb042354f30..59ddc33175722165057c3f8b0a591305c392b07d 100644 (file)
--- 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\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar\r
 set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\frameworktasks.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Bin\FrameworkWizard.jar\r
 \r
 call ant -f %WORKSPACE%\Tools\build.xml C_Code\r
 \r

diff --git a/edksetup.sh b/edksetup.sh
index 37d0b1c80fb4b468be3ca1944dea43196cc31575..8f7ce1bc559f48fb61751719a043f896c6a09703 100644 (file)
--- 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