Commit Graph

39 Commits

Author SHA1 Message Date
Liming Gao 1ccc4d895d Revert BaseTools: PYTHON3 migration
This reverts commit 6693f359b3c213513c5096a06c6f67244a44dc52..
678f851312.

Python3 migration is the fundamental change. It requires every developer
to install Python3. Before this migration, the well communication and wide
verification must be done. But now, most people is not aware of this change,
and not try it. So, Python3 migration is reverted and be moved to edk2-staging
Python3 branch for the edk2 user evaluation.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
2018-10-15 08:29:14 +08:00
Yunhua Feng 04c47cd401 BaseTools: Update windows and linux run scripts file to use Python3
Modify windows script, PosixLike script, edksetup.sh, edksetup.bat to
use Python3

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
2018-10-13 09:57:14 +08:00
Chris Ruffin 95cc9a51e1 BaseTools/edksetup.sh: fix invalid test for current working directory
edksetup.sh implements a test that requires the current working
directory to contain the edksetup.sh script.  This test has the side
effect of requiring the WORKSPACE to be set to the same directory as
the edksetup.sh.  In a multiple workspace configuration, it is
required to be able to have a WORKSPACE that is different from the
directory that contains edksetup.sh.  This changeset skips this test
if PACKAGE_PATH is set.

Change-Id: Ie6f16a08c012baf4e650c48cc8e91cdc466d05f2
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chris Ruffin <chris.ruffin@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
2017-08-10 12:54:58 +08:00
Leif Lindholm c112e371ce edksetup.sh, BaseTools/BuildEnv: add --reconfig support
Add command line option --reconfig to edksetup.sh, forcing cached
copies of Conf/*.txt to be overwritten.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
2016-10-24 13:53:16 +01:00
Leif Lindholm 44f7942558 edksetup.sh: rework argument parsing and update usage information
Rework the argument parsing logic to a more extensible traditional
while/case setup to prepare for further additions.

While doing that, align the Usage printout to look a bit more like
the output of Edk2Setup.bat (and be more correct).

And also stop passing around command line options to the BuildEnv
script (which does not check them anyway).

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
2016-10-24 13:53:06 +01:00
Yonghong Zhu 445bfd9214 edksetup.sh: update the URL in edksetup.sh
Update the URL since http://edk2.tianocore.org is not valid

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
2016-09-15 16:04:14 +08:00
Liming Gao 094a67398f BaseTools: Update edksetup.sh to support multiple workspaces
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Wu Hao A <hao.a.wu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18584 6f19259b-4bc3-4df7-8a09-765794883524
2015-10-08 09:29:56 +00:00
Paolo Bonzini d54934498f edksetup.sh: Ensure that WORKSPACE points to the top of an edk2 checkout
Since WORKSPACE should point at the EDK2 tree, the right place
to check its validity is edksetup.sh, not BaseTools/BuildEnv.

This patch makes sure that BuildEnv is always invoked with a valid
WORKSPACE.  This lets us show better error messages, and ensures that
we never dirty the user's environment.

BuildEnv will maintain backwards-compatibility and, should the variable
be missing, it will be able to set a default WORKSPACE.  Only the sanity
checks will be of lower quality.

Note that the error message in SetupEnv will never be shown if
SetWorkspace sets WORKSPACE=`pwd`.

Suggested-by: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15701 6f19259b-4bc3-4df7-8a09-765794883524
2014-07-28 17:37:40 +00:00
Paolo Bonzini 7bc14212b3 edksetup.sh: Look for BuildEnv under EDK_TOOLS_PATH
EDK_TOOLS_PATH is basically a replacement for $WORKSPACE/BaseTools.

It makes sense to check for BuildEnv there, then, if $WORKSPACE
is absent but $EDK_TOOLS_PATH is present.

With this patch, it is possible to separately package tools in
/usr and use them compile EDK2 (doing "rm -rf BaseTools" in the
EDK2 tree).  This is desirable for OS distributions that need to
distribute the tools in a "free software" repository and OVMF in
a "non-free software" repository; bundling the same code in two
different packages causes confusion.  It is also simpler for distros
because the build process for BaseTools and OVMF is completely
different.

Contributed-under: TianoCore Contribution Agreement 1.0
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15700 6f19259b-4bc3-4df7-8a09-765794883524
2014-07-28 17:37:35 +00:00
Leif Lindholm 1bb6bfaa08 edksetup.sh: Fix typo and return code
The typo was a check for the string "BaseTool" instead of "BaseTools".

Also fixed the issue where the script returned success even when
configuration failed.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15200 6f19259b-4bc3-4df7-8a09-765794883524
2014-01-30 19:26:53 +00:00
Jordan Justen ef9086c3a5 edksetup.sh: Code style
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15199 6f19259b-4bc3-4df7-8a09-765794883524
2014-01-30 19:26:46 +00:00
Parmeshwr Prasad 729220eaca Handle command line parameter "-? -h --help" and any other.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Parmeshwr Prasad <parmeshwr_prasad@dell.com>
Reviewed-by: Gao, Liming <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15192 6f19259b-4bc3-4df7-8a09-765794883524
2014-01-28 02:18:23 +00:00
hhtian 92063c4e55 Correct copyright year
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11321 6f19259b-4bc3-4df7-8a09-765794883524
2011-02-16 12:21:31 +00:00
geekboy15a 9f2ced4e2b Removed the requirement to pass in at least one parameter to the script.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10642 6f19259b-4bc3-4df7-8a09-765794883524
2010-07-09 19:42:03 +00:00
hhtian 24542fb211 Update the copyright notice format
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10448 6f19259b-4bc3-4df7-8a09-765794883524
2010-04-29 15:17:20 +00:00
klu2 2b1473c1ba add more description in edksetup.sh
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8806 6f19259b-4bc3-4df7-8a09-765794883524
2009-07-08 05:54:53 +00:00
lhauch 3a6b4559e5 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
2008-12-31 16:57:24 +00:00
lhauch 76c6abd94f setting executable on these files
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5241 6f19259b-4bc3-4df7-8a09-765794883524
2008-05-20 17:43:07 +00:00
jljusten 000c06d236 edksetup.sh:
Support both BaseTools and AntTools.  Do not require the user
  to use BaseTools/BuildEnv for the BaseTools support.

  Use this command to for help: . edksetup.sh --help


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4687 6f19259b-4bc3-4df7-8a09-765794883524
2008-02-12 22:27:42 +00:00
jljusten 8352c27a29 Refer to $WORKSPACE/BaseTools rather than $WORKSPACE/Tools.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4149 6f19259b-4bc3-4df7-8a09-765794883524
2007-10-17 02:03:40 +00:00
jljusten a310886b9b edksetup.sh:
Now we look for the 'NewBuild' parameter, and if so, ask the user to
  'source' the correct script.  (. Tools/BuildEnv)

  Otherwise we 'source' the Tools/OldBuildEnv script for the user.

Tools/OldBuildEnv:
  This is the old contents of $WORKSPACE/edksetup.sh

Tools/BuildEnv:
  This script is used to configure the BaseTools build environment for
  unix-like operating systems.



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4141 6f19259b-4bc3-4df7-8a09-765794883524
2007-10-16 20:52:46 +00:00
jwang36 51ac2ffdab Added support for xmlbeans-2.2.0
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2203 6f19259b-4bc3-4df7-8a09-765794883524
2007-01-10 02:15:11 +00:00
jwang36 3088e81137 Changed the FrameworkWizard.jar path from Bin to bin
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2169 6f19259b-4bc3-4df7-8a09-765794883524
2007-01-04 07:37:06 +00:00
klu2 d6203412a9 Add ant-contrib.jar to class path
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2150 6f19259b-4bc3-4df7-8a09-765794883524
2006-12-28 09:26:39 +00:00
bbahnsen 6dbea97890 Cleanups for cygwin.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1953 6f19259b-4bc3-4df7-8a09-765794883524
2006-11-14 17:57:07 +00:00
qouyang 8f7f05d527 Fix EDKT140(CompressDll.dll does not build under cygwin gcc).
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1188 6f19259b-4bc3-4df7-8a09-765794883524
2006-08-04 03:17:05 +00:00
klu2 d14ebb4374 Because Pcd entity, exception and some action package are shared by Building tools and Wizard Tools, so I move them to Tools/Source folder and generated PcdTools.jar,
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1160 6f19259b-4bc3-4df7-8a09-765794883524
2006-07-31 18:55:26 +00:00
bbahnsen f98a565d9b Handle the FRAMEWORK_TOOLS_PATH properly on cygwin.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1126 6f19259b-4bc3-4df7-8a09-765794883524
2006-07-27 21:54:12 +00:00
bbahnsen 48186277b9 Check to see if the tools are built before trying a build.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1005 6f19259b-4bc3-4df7-8a09-765794883524
2006-07-14 08:02:04 +00:00
hche10x da1508dd53 1. Add build FrameworkWizard in edksetup.bat
2. Modify FrameworkWizard.bat to skip building and only run the program

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@934 6f19259b-4bc3-4df7-8a09-765794883524
2006-07-13 01:16:51 +00:00
klu2 ace425da36 Fix some bugs in edksetup.sh
1, WORKSPACE environment in unix-like system can be obtained automatically as edksetup.bat in window's environment.
2, XMLBEANS_HOME environment in unix-like system should be also check as edksetup.bat in windows's environment.
3, In some unix-like system like darwin's system, system environment should be export to user's environment explicitly, this behavior is different in microsoft windows's platform. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@849 6f19259b-4bc3-4df7-8a09-765794883524
2006-07-09 17:33:16 +00:00
bbahnsen bf0c93fdc5 Add a new classpath element.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@577 6f19259b-4bc3-4df7-8a09-765794883524
2006-06-20 22:12:27 +00:00
bbahnsen f79b595b7b Convert env var name to all caps.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@486 6f19259b-4bc3-4df7-8a09-765794883524
2006-06-12 17:15:58 +00:00
bbahnsen 7a05c964e6 Remove one of the saxon jars from the classpath.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@434 6f19259b-4bc3-4df7-8a09-765794883524
2006-06-06 23:41:12 +00:00
bbahnsen 4182ff457c Try to fix the Surface Area build.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@433 6f19259b-4bc3-4df7-8a09-765794883524
2006-06-06 23:06:37 +00:00
bbahnsen 0fff0c2629 Check for /workspace/externaltools/apache-ant
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@271 6f19259b-4bc3-4df7-8a09-765794883524
2006-05-24 22:03:09 +00:00
lhauch 24390b64ff Updated to use environment variables instead of hard-coded path for ANT_HOME and XMLBEANS_HOME
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@79 6f19259b-4bc3-4df7-8a09-765794883524
2006-04-28 19:33:16 +00:00
bbahnsen b9e16a843f Convert to Unix format.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14 6f19259b-4bc3-4df7-8a09-765794883524
2006-04-24 16:38:10 +00:00
bbahnsen 878ddf1fc3 Initial import.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3 6f19259b-4bc3-4df7-8a09-765794883524
2006-04-21 22:54:32 +00:00