X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=d81e7fd5edd300b75a6258b67dc4db826adcbeb5;hp=23c2acdb871f365864e932726867b03512f82d42;hb=f45ce9d98c8e2cb009095366a5b3c0a0d4a68bbb;hpb=42b67fc47e70648bb2cf7f14c9f3fb35a24872a9

diff --git a/edksetup.bat b/edksetup.bat
old mode 100644
new mode 100755
index 23c2acdb87..d81e7fd5ed
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -1,18 +1,22 @@
+@REM @file
+@REM   Windows batch file to setup a WORKSPACE environment
 @REM
-@REM Copyright (c) 2006, Intel Corporation
+@REM Copyright (c) 2006 - 2008, Intel Corporation
 @REM All rights reserved. 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
-@REM 
+@REM
 @REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 @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 WORKSPACE=C:\mdk
+@REM set CYGWIN_HOME=C:\cygwin
 
+@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. 
 
 @REM ##############################################################
 @REM # You should not have to modify anything below this line
@@ -20,103 +24,93 @@
 
 @echo off
 
-:check_vc
-if defined VCINSTALLDIR goto check_java
-if defined VS71COMNTOOLS (
-  call "%VS71COMNTOOLS%vsvars32.bat"
-) else (
+@REM
+@REM Set the WORKSPACE to the current working directory
+@REM
+pushd .
+cd %~dp0
+set WORKSPACE=%CD%
+
+@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 VS71COMNTOOLS (
+    call "%VS71COMNTOOLS%\vsvars32.bat"
+  ) else (
+    if defined VS80COMNTOOLS (
+      call "%VS80COMNTOOLS%\vsvars32.bat"
+    ) else (
+      if defined VS90COMNTOOLS (
+        call "%VS90COMNTOOLS%\vsvars32.bat"
+      ) else (
+        echo.
+        echo !!! WARNING !!! Cannot find Visual Studio !!!
+        echo.
+      )
+    )
+  )
+)
+shift
+
+: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 %*
+@if /I "%1"=="Reconfig" shift
+@goto check_cygwin
+
+:BadBaseTools
+  @REM
+  @REM Need the BaseTools Package in order to build
+  @REM
   echo.
-  echo !!! WARNING !!!! Cannot find Visual Studio !!!
+  echo !!! ERROR !!! The BaseTools Package was not found !!!
   echo.
-)
-
-:check_java
-if "%JAVA_HOME%"=="" goto no_jdk
-echo.
-echo JAVA_HOME:     %JAVA_HOME%
-
-@REM Set the WORKSPACE to the Current Working Directory
-set WORKSPACE=%~dp0
-echo WORKSPACE:     %WORKSPACE%
-
-:set_cygwin
-if not defined CYGWIN_HOME (
-  if exist c:\cygwin (set CYGWIN_HOME=c:\cygwin) else (
-    echo.
-    echo !!! Not set CYGWIN_HOME, gcc build may not be used !!!
-    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
+
+:check_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.
   )
-) else (
-  echo CYGWIN_HOME:   %CYGWIN_HOME%
-)
-
-if "%ANT_HOME%"=="" goto no_ant
-echo ANT_HOME:      %ANT_HOME%
-if not exist %ANT_HOME%\lib\ant-contrib.jar goto no_antcontrib
-
-if "%XMLBEANS_HOME%"=="" goto no_xmlbeans
-echo XMLBEANS_HOME: %XMLBEANS_HOME%
-
-set Framework_Tools_Path=%WORKSPACE%\Tools\bin
-
-
-if "%PATHBACKUP%"=="" set PATHBACKUP=%PATH%
-set PATH=%JAVA_HOME%\bin;%ANT_HOME%\bin;%WORKSPACE%\Tools\bin;%XMLBEANS_HOME%\bin;%PATHBACKUP%;%CYGWIN_HOME%\bin
-
-echo PATH:      %PATH%
-echo.
-
-if not exist %XMLBEANS_HOME%\lib\saxon8.jar goto no_saxon8
-
-echo Building the Tiano Tools
-
-@REM We are going to create the SurfaceArea.jar file first so that other Java Program can use it
-set CLASSPATH=%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
-
-call ant -f %WORKSPACE%Tools\build.xml SurfaceArea
-
-@REM Now we can make the other Java Programs
-set 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
-
-call ant -f %WORKSPACE%Tools\build.xml JavaCode
-
-@REM We have all of the Java Programs and add-in classes created, so we can start using the cpp-tasks to create our tools
-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
-
-call ant -f %WORKSPACE%Tools\build.xml C_Code
-
-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 
+@if NOT "%1"=="" goto Usage
+@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 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
-@echo on
+  @popd
+  @echo on