Fix a bug of unreference PCD token defined in FPD does *not* be autogened into emulat...

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

diff --git a/Tools/bin/PackageEditor.bat b/Tools/bin/PackageEditor.bat
index 5a496663b01124e760be4bfb7354e322e6ef23e2..cf2f909ce6e9151d1b36c2279fdacd478c55861c 100644 (file)
--- a/Tools/bin/PackageEditor.bat
+++ b/Tools/bin/PackageEditor.bat
@@ -13,20 +13,33 @@
 \r
 :check_java\r
 if "%JAVA_HOME%"=="" goto no_jdk\r
+\r
 :check_wks\r
 if "%WORKSPACE%"=="" goto no_wks\r
 \r
-set ANT_HOME=%WORKSPACE%\Tools\bin\apache-ant\r
-set XMLBEANS_HOME=%WORKSPACE%\Tools\bin\xmlbeans\r
+:check_ant\r
+if "%ANT_HOME%"=="" goto no_ant\r
+@REM set ANT_HOME=%WORKSPACE%\Tools\bin\apache-ant\r
+\r
+:check_xmlbeans\r
+if "%XMLBEANS_HOME"=="" goto no_xmlbeans\r
+@REM set XMLBEANS_HOME=%WORKSPACE%\Tools\bin\xmlbeans\r
+\r
 set Framework_Tools_Path=%WORKSPACE%\Tools\bin\r
 \r
 set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%WORKSPACE%\Tools\bin;%XMLBEANS_HOME%\bin;%PATH%\r
 \r
-set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%WORKSPACE%\Tools\Jars\GenBuild.jar;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.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\saxon8-jdom.jar;%XMLBEANS_HOME%\lib\saxon8-sql.jar;%XMLBEANS_HOME%\lib\resolver.jar\r
+set 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
+set CLASSPATH=%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\saxon8-jdom.jar\r
+set CLASSPATH=%CLASSPATH%;%XMLBEANS_HOME%\lib\saxon8-sql.jar;%XMLBEANS_HOME%\lib\resolver.jar\r
+set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\bin\PackageEditor.jar\r
 \r
 call "ant" -f %WORKSPACE%\Tools\Source\PackageEditor\build.xml\r
 \r
-call "java" -jar %WORKSPACE%\Tools\bin\PackageEditor.jar\r
+call "java" org.tianocore.packaging.PackagingMain\r
 \r
 goto end\r
 \r
@@ -40,6 +53,18 @@ goto check_wks
 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
+goto check_xmlbeans\r
+\r
+:no_xmlbeans\r
+echo.\r
+echo !!! Please set XMLBEANS_HOME !!!\r
+echo.\r
 goto end\r
 \r
 :end\r