Remove additional / or \ in relative path.

[mirror_edk2.git] / Tools / bin / FrameworkWizard.bat

diff --git a/Tools/bin/FrameworkWizard.bat b/Tools/bin/FrameworkWizard.bat
index ef7745980c23a1b0ba09191bc4fba9995ea9e2a5..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,44 +19,54 @@ if "%WORKSPACE%"=="" goto no_wks
 if "%ANT_HOME%"=="" goto no_ant\r
 :check_xmlbeans\r
 if "%XMLBEANS_HOME%"=="" goto no_xmlbeans\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
-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 ModuleEditor\r
-call "ant" -f %WORKSPACE%\Tools\Source\FrameworkWizard\build.xml\r
-\r
-@REM Run ModuleEditor\r
+@REM Run Framework Wizard\r
 call "java" org.tianocore.frameworkwizard.FrameworkWizardUI\r
 \r
 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