summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-04-30 02:48:52 (GMT)
committerSteven Knight <knight@baldmt.com>2002-04-30 02:48:52 (GMT)
commit35a9fe7b3a3575367b74fbaf84f5336ee4ca5573 (patch)
treebc47231e4aaccd9999f7a8e895d3fe32a40d106c /src
parentba9fa12fcc465eb09debdcbd4ccf1ca2d5e8a56e (diff)
downloadSCons-35a9fe7b3a3575367b74fbaf84f5336ee4ca5573.zip
SCons-35a9fe7b3a3575367b74fbaf84f5336ee4ca5573.tar.gz
SCons-35a9fe7b3a3575367b74fbaf84f5336ee4ca5573.tar.bz2
Improve the scons.bat script. (Alex Jacques)
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt9
-rw-r--r--src/script/scons.bat15
2 files changed, 22 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 3cd3402..28375d2 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -78,6 +78,11 @@ RELEASE 0.07 - Thu, 25 Apr 2002 06:24:50 -0500
- Fix for relative CPPPATH directories in subsidiary SConscript files
(broken in 0.06).
+ From Alex Jacques:
+
+ - Create a better scons.bat file from a py2bat.py script on the Python
+ mailing list two years ago (modeled after pl2bat.pl).
+
From Steven Knight:
- Fix so that -c -n does *not* remove the targets!
@@ -96,6 +101,10 @@ RELEASE 0.07 - Thu, 25 Apr 2002 06:24:50 -0500
- Support building a PDF file directly from a TeX or LaTeX file
using pdftex or pdflatex.
+ - Add a -x option to runtest.py to specify the script being tested.
+ A -X option indicates it's an executable, not a script to feed
+ to the Python interpreter.
+
From Steve Leblanc:
- Add the SConscriptChdir() method.
diff --git a/src/script/scons.bat b/src/script/scons.bat
index e66b5d1..3955f28 100644
--- a/src/script/scons.bat
+++ b/src/script/scons.bat
@@ -1,2 +1,13 @@
-@rem __FILE__ __REVISION__ __DATE__ __DEVELOPER__
-@python -c "import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9
+@echo off
+if "%OS%" == "Windows_NT" goto WinNT
+REM for 9x/Me you better not have more than 9 args
+python -c "import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9
+REM no way to set exit status of this script for 9x/Me
+goto endscons
+:WinNT
+python -c "import SCons.Script; SCons.Script.main()" %*
+if NOT "%COMSPEC%" == "%SystemRoot%\system32\cmd.exe" goto endscons
+if errorlevel 9009 echo you do not have python in your PATH
+REM color 00 causes this script to exit with non-zero exit status
+if errorlevel 1 color 00
+:endscons