X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2Fbin%2FPackageEditor.bat;h=cf2f909ce6e9151d1b36c2279fdacd478c55861c;hp=5a496663b01124e760be4bfb7354e322e6ef23e2;hb=98fc92fcbd2e63805ace94c908c6ffabe093db5c;hpb=878ddf1fc3540a715f63594ed22b6929e881afb4

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