X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=b69bd26857f573bc37c9e05437d6adb513bd0380;hp=60c55c4e4f5aded739411beaad3639722062abcc;hb=d967d6d96fc18d7a53d32223f5813b12cda19e8d;hpb=6de5f959d627648b33a2a7275c35bb9fd6856a26

diff --git a/edksetup.bat b/edksetup.bat
old mode 100644
new mode 100755
index 60c55c4e4f..b69bd26857
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -1,6 +1,8 @@
+@REM @file
+@REM   Windows batch file to setup a WORKSPACE environment
 @REM
-@REM Copyright (c) 2006, Intel Corporation
-@REM All rights reserved. This program and the accompanying materials
+@REM Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+@REM This program and the accompanying materials
 @REM are licensed and made available under the terms and conditions of the BSD License
 @REM which accompanies this distribution.  The full text of the license may be found at
 @REM http://opensource.org/licenses/bsd-license.php
@@ -9,13 +11,10 @@
 @REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 @REM
 
-@REM set following environment in this file or in command shell
-@REM set JAVA_HOME=C:\Java\jdk1.5.0_04
-@REM set ANT_HOME=C:\ANT
-@REM set XMLBEANS_HOME=C:\xmlbeans
 @REM set CYGWIN_HOME=C:\cygwin
 
-@REM usage: edksetup.bat [skip]
+@REM usage: 
+@REM   edksetup.bat [--nt32] [AntBuild] [Rebuild] [ForceRebuild] [Reconfig]
 @REM if the argument, skip is present, only the paths and the
 @REM test and set of environment settings are performed. 
 
@@ -26,163 +25,153 @@
 @echo off
 
 @REM
-@REM Check the required system environment variables
+@REM Set the WORKSPACE to the current working directory
 @REM
+pushd .
+cd %~dp0
 
-:check_vc
-if defined VCINSTALLDIR goto check_cygwin
-if defined VS71COMNTOOLS (
-  call "%VS71COMNTOOLS%vsvars32.bat"
-) else (
-  echo.
-  echo !!! WARNING !!!! Cannot find Visual Studio !!!
-  echo.
+if not defined WORKSPACE (
+  goto SetWorkSpace
 )
 
-:check_cygwin
-if defined CYGWIN_HOME goto check_java
-if exist c:\cygwin (
-  set CYGWIN_HOME=c:\cygwin
-) else (
-  echo.
-  echo !!! WARNING !!!! Not set CYGWIN_HOME, gcc build may not be used !!!
-  echo.
+if %WORKSPACE% == %CD% (
+  @REM Workspace is not changed.
+  goto ParseArgs
 )
 
-: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
-
-@REM
-@REM Set the WORKSPACE to the current working directory
-@REM
-set WORKSPACE=%CD%
-
-set FRAMEWORK_TOOLS_PATH=%WORKSPACE%\Tools\bin
-
-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_PATH=%WORKSPACE%
-echo Resetting the PATH variable to include the Framework_Tools_Path for this WORKSPACE
-
-:path_ok
-
-if "%1"=="skip" goto skipbuild
-
-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.
-
-@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\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\resolver.jar
-
-call ant -f %WORKSPACE%\Tools\build.xml SurfaceArea
+:SetWorkSpace
+@REM set new workspace
+@REM clear EFI_SOURCE and EDK_SOURCE for the new workspace
+if not defined WORKSPACE (
+  set WORKSPACE=%CD%
+  set EFI_SOURCE=
+  set EDK_SOURCE=
+)
 
-@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=%CLASSPATH%;%WORKSPACE%\%Tools\Jars\SurfaceArea.jar
+:ParseArgs
+if /I "%1"=="-h" goto Usage
+if /I "%1"=="-help" goto Usage
+if /I "%1"=="--help" goto Usage
+if /I "%1"=="/h" goto Usage
+if /I "%1"=="/?" goto Usage
+if /I "%1"=="/help" goto Usage
+
+if /I not "%1"=="--nt32" goto no_nt32
+
+@REM Flag, --nt32 is set
+@REM The Nt32 Emluation Platform requires Microsoft Libraries
+@REM and headers to interface with Windows.
+
+if not defined VCINSTALLDIR (
+  if defined VS140COMNTOOLS (
+    call "%VS140COMNTOOLS%\vsvars32.bat"
+  ) else (
+    if defined VS120COMNTOOLS (
+      call "%VS120COMNTOOLS%\vsvars32.bat"
+    ) else (	
+      if defined VS110COMNTOOLS (
+        call "%VS110COMNTOOLS%\vsvars32.bat"
+      ) else (
+        if defined VS100COMNTOOLS (
+          call "%VS100COMNTOOLS%\vsvars32.bat"
+        ) else (
+          if defined VS90COMNTOOLS (
+            call "%VS90COMNTOOLS%\vsvars32.bat"
+          ) else (
+            if defined VS80COMNTOOLS (
+              call "%VS80COMNTOOLS%\vsvars32.bat"
+            ) else (
+              if defined VS71COMNTOOLS (
+                call "%VS71COMNTOOLS%\vsvars32.bat"
+              ) else (
+                echo.
+                echo !!! WARNING !!! Cannot find Visual Studio !!!
+                echo.
+              )
+            )
+          )
+        )
+      )
+    )
+  )
+)
+shift
 
-call ant -f %WORKSPACE%\Tools\build.xml JavaCode
+:no_nt32
 
-@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=%CLASSPATH%;%WORKSPACE%\Tools\Jars\GenBuild.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.jar
+if /I "%1"=="NewBuild" shift
+if exist %WORKSPACE%\BaseTools (
+  set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
+) else (
+  if defined PACKAGES_PATH (
+    for %%i IN (%PACKAGES_PATH%) DO (
+      if exist %%~fi\BaseTools (
+        set EDK_TOOLS_PATH=%%~fi\BaseTools
+        goto checkBaseTools
+      )
+    )
+  ) else (
+    echo.
+    echo !!! ERROR !!! Cannot find BaseTools !!!
+    echo. 
+    goto BadBaseTools
+  )
+)
+if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=%EDK_TOOLS_PATH%
+
+:checkBaseTools
+IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools
+call %EDK_TOOLS_PATH%\toolsetup.bat %*
+if /I "%1"=="Reconfig" shift
+goto check_cygwin
+
+:BadBaseTools
+  @REM
+  REM Need the BaseTools Package in order to build
+  @REM
+  @echo.
+  @echo !!! ERROR !!! The BaseTools Package was not found !!!
+  @echo.
+  @echo Set the system environment variable, EDK_TOOLS_PATH to the BaseTools,
+  @echo For example,
+  @echo   set EDK_TOOLS_PATH=C:\MyTools\BaseTools
+  @echo The setup script, toolsetup.bat must reside in this folder.
+  @echo.
+  goto end
 
-call ant -f %WORKSPACE%\Tools\build.xml C_Code
+:check_cygwin
+if defined CYGWIN_HOME (
+  if not exist "%CYGWIN_HOME%" (
+    @echo.
+    @echo !!! WARNING !!! CYGWIN_HOME not found, gcc build may not be used !!!
+    @echo.
+  )
+) else (
+  if exist c:\cygwin (
+    set CYGWIN_HOME=c:\cygwin
+  ) else (
+    @echo.
+    @echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!!
+    @echo.
+  )
+)
 
-@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\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\resolver.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\SurfaceArea.jar;%WORKSPACE%\Tools\Jars\GenBuild.jar
-set CLASSPATH=%CLASSPATH%;%WORKSPACE%\Tools\Jars\cpptasks.jar;%WORKSPACE%\Tools\Jars\frameworktasks.jar
-goto end
+:cygwin_done
+if "%1"=="" goto end
+
+:Usage
+  @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 only be copied to target.txt, tools_def.txt and build_rule.txt
+  @echo  respectively if they do not exist. Use option [Reconfig] to force the copy.
+  @echo.
+  goto end
 
 :end
-@echo on
+  popd