From 3a6b4559e5182bd50a2f1de5abe5373d6c379388 Mon Sep 17 00:00:00 2001 From: lhauch Date: Wed, 31 Dec 2008 16:57:24 +0000 Subject: [PATCH] Removed Java/Ant specific content from the setup scripts. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7169 6f19259b-4bc3-4df7-8a09-765794883524 --- edksetup.bat | 293 ++++----------------------------------------------- edksetup.sh | 28 +---- 2 files changed, 24 insertions(+), 297 deletions(-) diff --git a/edksetup.bat b/edksetup.bat index 30c8da17b5..4412ac27ed 100755 --- a/edksetup.bat +++ b/edksetup.bat @@ -11,11 +11,6 @@ @REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. @REM -@REM set following environment in this file or in command shell for the older, -@REM JAVA/Ant build -@REM set JAVA_HOME=C:\Java\jdk1.5.0_06 -@REM set ANT_HOME=C:\ANT -@REM set XMLBEANS_HOME=C:\xmlbeans @REM set CYGWIN_HOME=C:\cygwin @REM usage: @@ -43,7 +38,7 @@ set WORKSPACE=%CD% @if /I "%1"=="/?" goto Usage @if /I "%1"=="/help" goto Usage -@if /I not "%1"=="--nt32" goto check_Ant_build +@if /I not "%1"=="--nt32" goto no_nt32 @REM Flag, --nt32 is set @REM The Nt32 Emluation Platform requires Microsoft Libraries @@ -64,18 +59,13 @@ if not defined VCINSTALLDIR ( ) shift -:check_Ant_build - @if /I "%1"=="AntBuild" goto AntBuild - -@REM -@REM Default is new, Makefile Base Build -@REM - +:no_nt32 @if /I "%1"=="NewBuild" shift @if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools @IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools @call %EDK_TOOLS_PATH%\toolsetup.bat %* -@goto end +@if /I "%1"=="Reconfig" shift +@goto check_cygwin :BadBaseTools @REM @@ -91,272 +81,29 @@ shift echo. @goto end -@REM With the exception of the :end and :Usage tags, all information below -@REM these lines is for the JAVA/Ant Build! - -:AntBuild - @REM - @REM Check the required system environment variables - @REM - @if /I "%1"=="AntBuild" shift - - set FOUND="FALSE" - if exist "Tools\Jars" set FOUND="TRUE" - if exist "%EDK_TOOLS_PATH%\Tools\Jars" set FOUND="TRUE" - if %FOUND%=="FALSE" ( - echo. - echo !!! ERROR !!! You have selected the Java/Ant build, however those tools - echo cannot be found in this WORKSPACE. - echo. - echo Please double check that the AntTools project is installed - echo in this WORKSPACE. - echo. - set FOUND="" - goto end - ) - set FOUND="" - -:check_vc - if defined VCINSTALLDIR goto check_cygwin - if defined VS71COMNTOOLS ( - call "%VS71COMNTOOLS%\vsvars32.bat" - ) else ( - echo. - echo !!! WARNING !!! Cannot find Visual Studio !!! - echo. - ) - :check_cygwin - if defined CYGWIN_HOME goto check_java - if exist c:\cygwin ( - set CYGWIN_HOME=c:\cygwin + @if exist c:\cygwin ( + @set CYGWIN_HOME=c:\cygwin ) else ( - echo. - echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!! - echo. + @echo. + @echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!! + @echo. ) -:check_java - if "%JAVA_HOME%"=="" goto no_jdk - -:check_ant - if "%ANT_HOME%"=="" goto no_ant - if not exist %ANT_HOME%\lib\ant-contrib.jar goto no_antcontrib - -:check_xmlbeans - if "%XMLBEANS_HOME%"=="" goto no_xmlbeans - if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8 - -set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin - -if not defined ORIGINAL_CLASSPATH set ORIGINAL_CLASSPATH=%CLASSPATH% -set CLASSPATH=%ORIGINAL_CLASSPATH% - -if defined WORKSPACE_TOOLS_PATH goto check_path -set PATH=%FRAMEWORK_TOOLS_PATH%;%JAVA_HOME%\bin;%ANT_HOME%\bin;%XMLBEANS_HOME%\bin;%PATH% -set WORKSPACE_TOOLS_PATH=%FRAMEWORK_TOOLS_PATH% -echo Setting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE -goto path_ok - -:check_path - if "%FRAMEWORK_TOOLS_PATH%"=="%WORKSPACE_TOOLS_PATH%" goto path_ok - set PATH=%FRAMEWORK_TOOLS_PATH%;%PATH% - set WORKSPACE_TOOLS_PATH=%WORKSPACE%\Tools\bin - echo Resetting the PATH variable to include the FRAMEWORK_TOOLS_PATH for this WORKSPACE - -:path_ok - - @if /I "%1"=="ForceRebuild" goto ForceBuild - @if /I "%1"=="Reconfig" goto Reconfig - -@IF NOT EXIST "Tools\Jars\Common.jar" goto NormalBuild -@IF NOT EXIST "Tools\Jars\PcdTools.jar" goto NormalBuild -@IF NOT EXIST "Tools\Jars\GenBuild.jar" goto NormalBuild -@IF NOT EXIST "Tools\Jars\SurfaceArea.jar" goto NormalBuild -@IF NOT EXIST "Tools\Jars\cpptasks.jar" goto NormalBuild -@IF NOT EXIST "Tools\Jars\frameworktasks.jar" goto NormalBuild -@IF NOT EXIST "Tools\bin\FrameworkWizard.jar" goto NormalBuild -@IF NOT EXIST "Tools\bin\CompressDll.dll" goto NormalBuild -@IF NOT EXIST "Tools\bin\CompressDll.lib" goto NormalBuild -@IF NOT EXIST "Tools\bin\CreateMtFile.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\EfiCompress.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\EfiRom.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\FlashMap.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\FwImage.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\GenAcpiTable.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\GenCRC32Section.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\GenCapsuleHdr.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\GenDepex.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\GenFfsFile.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\GenFvImage.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\GenSection.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\GenTEImage.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\GuidChk.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\MakeDeps.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\ModifyInf.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\PeiRebase_Ia32.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\PeiRebase_Ipf.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\PeiRebase_X64.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\SecApResetVectorFixup.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\SecFixup.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\SetStamp.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\SplitFile.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\StrGather.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\Strip.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\VfrCompile.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\ZeroDebugData.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\antlr.exe" goto NormalBuild -@IF NOT EXIST "Tools\bin\dlg.exe" goto NormalBuild - -@if /I "%1"=="Rebuild" goto NormalBuild @if NOT "%1"=="" goto Usage - -goto skipbuild - -:ForceBuild - call ant -f %WORKSPACE%\Tools\build.xml -noclasspath cleanall - -:NormalBuild - @REM - @REM Start to build the Framework Tools - @REM - - echo. - echo Building the Framework Tools - echo. - - @REM - @REM We are going to create the SurfaceArea.jar file first so that the other - @REM Java Programs can use it. - @REM It needs the XMLBEANS libraries in order to compile. - @REM - set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH% - - call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea - - @REM - @REM Now we can make the other Java Programs - @REM All of the remaining Java Programs require the SurfaceArea library to compile - @REM - set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH% - - call ant -f %WORKSPACE%\Tools\build.xml JavaCode - - @REM - @REM We have all of the Java Programs and add-in classes created, so we can start - @REM using the cpp-tasks to create our tools - @REM - set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH% - - call ant -f %WORKSPACE%\Tools\build.xml C_Code - - @REM - @REM Done!!! - @REM - goto end - -:no_jdk - echo. - echo !!! Please install Java, and set JAVA_HOME !!! - echo. - goto end - -:no_ant - echo. - echo !!! Please install Apache Ant, and set ANT_HOME !!! - echo. - goto end - -:no_antcontrib - echo. - echo !!! Please install Ant-contrib to ANT_HOME !!! - echo. - goto end - -:no_xmlbeans - echo. - echo !!! Please install XML Beans, and set XMLBEANS_HOME !!! - echo. - goto end - -:no_saxon8 - echo. - echo !!! Please copy saxon8.jar file to XMLBEANS_HOME\lib !!! - echo. - goto end - -:skipbuild - @REM - @REM This just sets up the CLASSPATH, the rest of the environment should have been set already. - @REM - echo. - echo WORKSPACE: %WORKSPACE% - echo JAVA_HOME: %JAVA_HOME% - echo ANT_HOME: %ANT_HOME% - echo XMLBEANS_HOME: %XMLBEANS_HOME% - echo CYGWIN_HOME: %CYGWIN_HOME% - echo PATH: %PATH% - echo. - set CLASSPATH=%XMLBEANS_HOME%\lib;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\jsr173_1.0_api.jar;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\xbean.jar;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\xbean_xpath.jar;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\xmlpublic.jar;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8.jar;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8-dom.jar;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\saxon8-xpath.jar;%CLASSPATH% - set CLASSPATH=%XMLBEANS_HOME%\lib\resolver.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Jars\Common.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Jars\PcdTools.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Jars\GenBuild.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Jars\cpptasks.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Jars\frameworktasks.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Bin\FrameworkWizard.jar;%CLASSPATH% - set CLASSPATH=%WORKSPACE%\Tools\Bin\MigrationTools.jar;%CLASSPATH% - echo CLASSPATH: %CLASSPATH% - goto end - -:Reconfig - @REM - @REM Reinstall all config files - @REM - call ant -f %WORKSPACE%\Tools\build.xml reconfig - goto end +@goto end :Usage - echo. - echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32] [AntBuild | Rebuild | ForceRebuild ] [Reconfig]" - echo --nt32 Call vsvars32.bat for NT32 platform build. - echo. - echo Rebuild If sources are available perform an Incremental build, only - echo build those updated tools. - echo ForceRebuild If sources are available, rebuild all tools regardless of - echo whether they have been updated or not. - echo Reconfig Reinstall target.txt, tools_def.txt and build_rule.txt. - echo. - echo JAVA/ANT Build - echo AntBuild Using older Java/ANT build tools in Tools directory. - echo Rebuild Incremental build, only build those updated tools. - echo ForceRebuild Rebuild all tools regardless of whether they have been updated or not. - echo Reconfig Reinstall target.txt, tools_def.txt and FrameworkDatabase.db. - echo. - echo Note that target.template, tools_def.template, build_rules.template and the - echo FrameworkDatabase.template will be only copied to target.txt, tools_def.txt, build_rule.txt and - echo FrameworkDatabase.db respectively if they do not exist. Using option [Reconfig] to force the copy. - echo. + @echo. + @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32] [Reconfig]" + @echo --nt32 Call vsvars32.bat for NT32 platform build. + @echo. + @echo Reconfig Reinstall target.txt, tools_def.txt and build_rule.txt. + @echo. + @echo Note that target.template, tools_def.template and build_rules.template + @echo will be only copied to target.txt, tools_def.txt and build_rule.txt + @echo respectively if they do not exist. Using option [Reconfig] to force the copy. + @echo. @goto end :end diff --git a/edksetup.sh b/edksetup.sh index 323b0f3d87..b5a1cb14de 100755 --- a/edksetup.sh +++ b/edksetup.sh @@ -22,38 +22,18 @@ if [ \ "$1" = "--help" \ ] then - echo BaseTools Usage: \'. edksetup.sh BaseTools\' - echo Ant Tools Usage: \'. edksetup.sh [AntBuild \| ForceRebuild]\' + echo BaseTools Usage: \'. edksetup.sh\' echo echo Please note: This script must be \'sourced\' so the environment can be changed. echo \(Either \'. edksetup.sh\' or \'source edksetup.sh\'\) return fi -if [ "$1" = BaseTools ] +if [ -z "$WORKSPACE" ] then - if [ -z "$WORKSPACE" ] - then - . BaseTools/BuildEnv $* - else - . $WORKSPACE/BaseTools/BuildEnv $* - fi + . BaseTools/BuildEnv $* else - if [ "$1" = AntBuild -o "$1" = ForceRebuild ] - then - if [ -z "$WORKSPACE" ] - then - if [ "$1" = AntBuild ] - then - shift - fi - . Tools/OldBuildEnv $* - else - . $WORKSPACE/Tools/OldBuildEnv $* - fi - else - echo Please run \'. edksetup.sh --help\' for help. - fi + . $WORKSPACE/BaseTools/BuildEnv $* fi -- 2.39.2