Commit Graph

69 Commits

Author SHA1 Message Date
Yunhua Feng 40d1adb3eb BaseTools: Fix incorrect %EDK_TOOLS_PATH%
For non-root folder, such as "X:\test", the EDK_TOOLS_PATH will
resolve to "X:\test\edk2\BaseTools". This is OK.

But if WORKSPACE is at a root folder, such as "X:\", the EDK_TOOLS_PATH
will look like "X:\\BaseTools". The *double backslash* can fail the command
like "del" and thus affect the %ERRORLEVEL% variable, which may break
subsequent build processing.

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-08-08 08:44:22 +08:00
Chris Ruffin 1e6add9e47 BaseTools: suppress usage instructions with rebuild options
When using edksetup.bat Rebuild, the script outputs usage instructions
to the console, when no usage error is encountered.  Update the usage
instructions and suppress these usage instructions when using the
Rebuild, ForceRebuild options.

Change-Id: Ica98e19f3d5198df2519106e4c55314c255e04ac
Cc: Liming Gao <liming.gao@intel.com>
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-07-04 10:16:13 +08:00
Liming Gao 4e908975c6 edksetup.bat: make sure BASE_TOOLS_PATH be set correctly
Move checkNt32Flag before set BASE_TOOLS_PATH env to make sure it be set

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
2016-10-26 13:45:45 +08:00
Cinnamon Shia 92063b0b21 edksetup.bat: Support --nt32 X64
Support --nt32 X64 for building 64-bit NT32.
For setting up Windows environment variables requited by NT32, follow the
same approach as Edk2Setup.bat by using the get_vsvars.bat and
SetVisualStudio.bat.

Sync the help text of NT32 with Edk2Setup.bat.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Cinnamon Shia <cinnamon.shia@hpe.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
2016-10-24 10:49:16 +08:00
Yonghong Zhu 910e206238 Update edksetup.bat to check NASM system environment variable
If the NASM_PREFIX variable is not set, it would report warning message.
If there exist the C:\nasm\nasm.exe file, it would set the NASM_PREFIX
variable to C:\nasm\.

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-07-26 10:16:48 +08:00
Liming Gao cc7c6a37d4 Update edksetup.bat to check EDK_TOOLS_PATH before set it.
If EDK_TOOLS_PATH is set, then not set it again.
If EDK_TOOLS_PATH is not set, then set it.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
2016-04-11 16:20:28 +08:00
Wang Yu 5d9cd24ede BaseTools: Add VS2015 tool chain in tools_def.template
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wang Yu <yu.wang@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19101 6f19259b-4bc3-4df7-8a09-765794883524
2015-12-03 03:19:01 +00:00
Liming Gao dcc8078699 BaseTools: Update edksetup.bat to support multiple workspaces
1. Update edksetup.bat and toolsetup.bat to handle PACKAGES_PATH.
   BaseTools directory may be in PACKAGES_PATH instead of WORKSAPCE.
2. Introduce EDK_TOOLS_BIN env points to the windows binary tools dir.
   Windows BaseTools Win32 may be a separate directory.

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@18582 6f19259b-4bc3-4df7-8a09-765794883524
2015-10-08 09:29:09 +00:00
lhauch b176333801 Update edksetup.bat to support Microsoft Visual Studio 2013 when building the Nt32Pkg emulation platform (enabled using the --nt32 flag).
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lhauch <larry.hauch@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16277 6f19259b-4bc3-4df7-8a09-765794883524
2014-10-30 17:09:25 +00:00
Victor Gouveia c5ed01d9da Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Victor Gouveia <vc.gouveia@gmail.com>
Reviewed-by: Gao, Liming <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15565 6f19259b-4bc3-4df7-8a09-765794883524
2014-06-18 09:01:33 +00:00
Olivier Martin 1f9c860674 edksetup.bat: Fixed corrupts CYGWIN_HOME
The .BAT file checks for existance of the directory c:\cygwin and,
if it exists, always resets CYGWIN_HOME to that path.
That means that if CYGWIN_HOME is set to say c:\cygwin64, it gets corrupted.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by Yingke Liu <yingke.d.liu@intel.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15254 6f19259b-4bc3-4df7-8a09-765794883524
2014-02-24 14:14:13 +00:00
Olivier Martin 7ef23d9c2c BaseTools: Rectify use of @ in .BAT files.
Tracing of the .BAT files is obscured by use of the @ prefix
and is confused by the "echo on" at the end of toolsetup.bat.

Silent all the 'echo' with '@'. And remove '@' from the non
'echo' line to make easier to trace the batch files when 'echo on'.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by Yingke Liu <yingke.d.liu@intel.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15253 6f19259b-4bc3-4df7-8a09-765794883524
2014-02-24 14:09:00 +00:00
Liming Gao 4c633da4f4 Update edksetup.bat to check VS2012
Signed-off-by: Liming Gao <liming.gao@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14626 6f19259b-4bc3-4df7-8a09-765794883524
2013-09-04 07:41:04 +00:00
lgao4 48604ef952 Added VS2010 support in edksetup script.
Signed-off-by: Yu Wang <yu.wang@intel.com>
Reviewed-by: Jikui Su <jikui.su@intel.com>


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13181 6f19259b-4bc3-4df7-8a09-765794883524
2012-04-10 07:45:35 +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
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
lgao4 dff2673eec Set correct workspace when workspace is not set.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9816 6f19259b-4bc3-4df7-8a09-765794883524
2010-01-26 04:58:56 +00:00
lgao4 d27bd9e95b Clear EFI_SOURCE and EDK_SOURCE environment when workspace is changed.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9814 6f19259b-4bc3-4df7-8a09-765794883524
2010-01-26 02:42:37 +00:00
ywang c16243d8e6 Added support for VS2008.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9433 6f19259b-4bc3-4df7-8a09-765794883524
2009-11-16 23:02:57 +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
lhauch 8014e7ceb0 Removed newbuild option from edksetup.bat command-line, this is now the default.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4747 6f19259b-4bc3-4df7-8a09-765794883524
2008-02-22 16:31:23 +00:00
jwang36 402bbc765b Added VS2005 support
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4247 6f19259b-4bc3-4df7-8a09-765794883524
2007-10-31 09:12:54 +00:00
lhauch ae0c9fa612 Removed an echo statement I was using for debugging on the second time this was run.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4219 6f19259b-4bc3-4df7-8a09-765794883524
2007-10-25 18:55:17 +00:00
lhauch 20e51d2793 Added a test for NewBuild argument if this is the second time through the setup - VCINSTALLDIR is set, and cygwin is installed.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4218 6f19259b-4bc3-4df7-8a09-765794883524
2007-10-25 18:53:37 +00:00
lhauch 6f729b6aa2 Updated edksetup to support VS2005 iff VS2003 is not installed for the NT32 build
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4216 6f19259b-4bc3-4df7-8a09-765794883524
2007-10-25 16:37:48 +00:00
jljusten 5c240d733a Restoring $WORKSPACE/BaseTools location, as the plan is to deprecate
$WORKSPACE/Tools instead.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4148 6f19259b-4bc3-4df7-8a09-765794883524
2007-10-17 01:59:27 +00:00
jljusten 19ed1f42ff Moved $WORKSPACE/BaseTools to $WORKSPACE/Tools/BaseTools.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4140 6f19259b-4bc3-4df7-8a09-765794883524
2007-10-16 20:40:26 +00:00
jwang36 26096d369d Added help message for "NewBuild" and "--nt32" option
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4111 6f19259b-4bc3-4df7-8a09-765794883524
2007-10-15 01:58:41 +00:00
jwang36 b7509087b0 a) Supported MAKE command in tools_def.txt
b) Cleaned several message strings in code
c) Solved hang issue when the build.exe is broken by Ctrl+C
d) Added more specific information for "-v" option of build.exe
e) Added "-v"/"-d"/"-q" option for GenFds.exe in makefile if build.exe is called with one of them.
f) Removed the calling to vsvars32.bat and added "--nt32" option in edksetup.bat because the nmake.exe's path has been put in tools_def.txt and build.exe will use that information to call nmake.exe
g) Removed the calling to vsvars32.bat in BaseTools/toolsetup.bat


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4091 6f19259b-4bc3-4df7-8a09-765794883524
2007-10-11 08:58:33 +00:00
lhauch cafa987d67 Only set EDK_TOOLS_PATH if it is not already set
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3931 6f19259b-4bc3-4df7-8a09-765794883524
2007-09-26 21:35:57 +00:00
jwang36 3fab94ed1e Added "NewBuild" option to incorporate new build system locating in $(WORKSPACE)\BaseTools. This is a temporary solution which is subject to change in the future. Don't use it in formal platform or module build.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2706 6f19259b-4bc3-4df7-8a09-765794883524
2007-06-22 06:25:37 +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
wuyizhong d02920ead2 make edksetup.bat accept case-insensitive parameters.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2084 6f19259b-4bc3-4df7-8a09-765794883524
2006-12-12 05:35:03 +00:00
wuyizhong a9008cdd8a Fix a bug for setting CLASSPATH environment variable. Remove space after '=' when set the CLASSPATH.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1880 6f19259b-4bc3-4df7-8a09-765794883524
2006-11-01 03:12:47 +00:00
jwang36 d2f9b39f43 Put the our jar files before the system's CLASSPATH
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1798 6f19259b-4bc3-4df7-8a09-765794883524
2006-10-19 07:12:29 +00:00
wuyizhong 2fcfed38cb Provide a way to update config files[target.txt, tools_def.txt, FrameworkDatabase.db] even they are existed. Using edksetup.bat Reconfig. Give a more detail edksetup.bat help usage.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1773 6f19259b-4bc3-4df7-8a09-765794883524
2006-10-17 07:07:24 +00:00
jwang36 7b8617fbc9 Fixed a little issue which will cause just one duplicated classpath
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1770 6f19259b-4bc3-4df7-8a09-765794883524
2006-10-17 06:38:16 +00:00
jwang36 eb614e7e39 Fixed EDKT381. We can keep the system's CLASSPATH value after executing edksetup.bat and won't duplicate it with more than one time of execution.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1769 6f19259b-4bc3-4df7-8a09-765794883524
2006-10-17 06:24:21 +00:00
lhauch 9dac0c36b6 Set the comment for JAVA_HOME to point to the minimum release version of SUN JDK, 1.5.0_06, not 1.5.0_04
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1716 6f19259b-4bc3-4df7-8a09-765794883524
2006-10-10 23:03:33 +00:00
qouyang 3a9b722922 Fix the warning of "Unknown argument: -noclasspath" when calling "edksetup ForceRebuild".
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1396 6f19259b-4bc3-4df7-8a09-765794883524
2006-08-28 13:06:24 +00:00
alfred 1915103e27 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1247 6f19259b-4bc3-4df7-8a09-765794883524 2006-08-14 05:03:11 +00:00
alfred 3ecfb29256 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1234 6f19259b-4bc3-4df7-8a09-765794883524 2006-08-10 09:33:40 +00:00
lhauch 13681235d4 Fixed a bug in resetting the tools path when you switched workspaces.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1217 6f19259b-4bc3-4df7-8a09-765794883524
2006-08-08 19:48:49 +00:00
lhauch 80d1b384da added -noclasspath option to the ant cleanall for ForceRebuild, also changed edkii in readme to edk2 for the directory path.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1209 6f19259b-4bc3-4df7-8a09-765794883524
2006-08-07 22:17:13 +00:00
klu2 fb1025120d Add judgement for PcdTools.jar in NormalBuild path in edksetup.bat
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1161 6f19259b-4bc3-4df7-8a09-765794883524
2006-07-31 19:06:25 +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
lhauch 11f009f190 Added test to ensure that the only options that can be used are the help optiops, Rebuild and ForceRebuild. Added printout of the CLASSPATH variable. Fixed case in two comments.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1087 6f19259b-4bc3-4df7-8a09-765794883524
2006-07-24 16:03:47 +00:00
wuyizhong b0108f04c6 Add a file separate char for VS71COMNTOOLS.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1042 6f19259b-4bc3-4df7-8a09-765794883524
2006-07-19 06:10:12 +00:00
lhauch ec2d320473 Removing references to obsolete files.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1004 6f19259b-4bc3-4df7-8a09-765794883524
2006-07-14 07:55:35 +00:00