*/
/*
- * The build_command field of the project config file is used to invoke the
- * relevant build command. This command tells make where to find the rules.
- * The ${s src/script/scons.py} expands to a path into the baseline during
- * development if the script file is not in the change. Look in aesub(5)
- * for more information about command substitutions.
+ * The build_command field of the project config file is used to invoke
+ * the relevant build command. This command tells SCons where to find
+ * the rules.
+ *
+ * The ${bl}/build/scons-src/src/engine points $SCONS_LIB_DIR points
+ * SCons at the last-built scons-src package, which should have
+ * everything. This means that, under Aegis, we're really using the
+ * currently-checked-in baseline to build the current version. This
+ * implies that using a new feature in our own SConscripts is a
+ * two-stage process: check in the underlying feature, then check in a
+ * change to use it in our SConscripts.
+ *
+ * The ${s src/script/scons.py} expands to a path into the baseline
+ * during development if the script file is not in the change.
+ *
+ * Look in aesub(5) for more information about command substitutions.
*/
-build_command = "SCONS_LIB_DIR=src/engine python ${Source src/script/scons.py} -Y${SUBSTitute : \\ -Y $Search_Path} date='${DAte %Y/%m/%d %H:%M:%S}' developer=${DEVeloper} version=${VERsion} change=${Change}";
+build_command = "SCONS_LIB_DIR=${BaseLine}/build/scons-src/src/engine python ${Source src/script/scons.py} -Y${SUBSTitute : \\ -Y $Search_Path} date='${DAte %Y/%m/%d %H:%M:%S}' developer=${DEVeloper} version=${VERsion} change=${Change}";
/*
* SCons removes its targets before constructing them, which qualifies it
}
#
- # We have to tell Cons to QuickScan the top-level SGML files which
+ # We have to tell SCons to scan the top-level SGML files which
# get included by the document SGML files in the subdirectories.
#
included_sgml = [
jpg = os.path.join(htmldir, '%s.jpg' % g)
env.Command(jpg, fig,
"%s -L jpeg -q 100 $SOURCES $TARGET" % fig2dev)
- env.Depends(ps, jpg)
+ env.Depends(html, jpg)
+ Local(jpg)
if docs[doc].get('ps') and jadetex:
env.Command(ps, main, [
eps = os.path.join('PS', '%s.eps' % g)
env.Command(eps, fig, "%s -L eps $SOURCES $TARGET" % fig2dev)
env.Depends(ps, eps)
+ Local(eps)
if docs[doc].get('pdf') and pdfjadetex:
env.Command(pdf, main, [
latex
lex
masm
+mslib
mslink
msvc
nasm
/usr/lib/scons/SCons/Tool/latex.pyc
/usr/lib/scons/SCons/Tool/lex.py
/usr/lib/scons/SCons/Tool/lex.pyc
-/usr/lib/scons/SCons/Tool/lib.py
-/usr/lib/scons/SCons/Tool/lib.pyc
/usr/lib/scons/SCons/Tool/masm.py
/usr/lib/scons/SCons/Tool/masm.pyc
+/usr/lib/scons/SCons/Tool/mslib.py
+/usr/lib/scons/SCons/Tool/mslib.pyc
/usr/lib/scons/SCons/Tool/mslink.py
/usr/lib/scons/SCons/Tool/mslink.pyc
/usr/lib/scons/SCons/Tool/msvc.py
- Prevent SCons from unlinking files in certain situations when
the -n option is used.
+ - Change the name of Tool/lib.py to Tool/mslib.py.
+
From Steven Knight and Anthony Roach:
- Man page: document the fact that Builder calls return Node objects.
formally succeeded despite the absence of a scanned file will now
fail unless the -k (keep going on error) flag is used.
+ - The specification of the name for the 'lib' tool (the Microsoft
+ library archiver) has now been changed to 'mslib'. If you
+ previously used the Tool() method to fetch the 'lib' tool
+ explicitly, you will need to change the name in the call to
+ 'mslib':
+
+ env = Environment(tools = [ Tool('mslib') ])
+
Please note the following important changes since release 0.07:
- Builder objects no longer automatically split target and source
SCons/Tool/ilink.py
SCons/Tool/latex.py
SCons/Tool/lex.py
-SCons/Tool/lib.py
SCons/Tool/masm.py
+SCons/Tool/mslib.py
SCons/Tool/mslink.py
SCons/Tool/msvc.py
SCons/Tool/nasm.py
c_compilers = ['msvc', 'gcc', 'icc']
assemblers = ['masm', 'nasm', 'gas']
fortran_compilers = ['g77', 'ifl']
- ars = ['lib', 'ar']
+ ars = ['mslib', 'ar']
elif str(platform) == 'os2':
"prefer IBM tools on OS/2"
linkers = ['ilink', 'gnulink', 'mslink']
c_compilers = ['icc', 'gcc', 'msvc']
assemblers = ['nasm', 'masm', 'gas']
fortran_compilers = ['ifl', 'g77']
- ars = ['ar', 'lib']
+ ars = ['ar', 'mslib']
else:
"prefer GNU tools on all other platforms"
linkers = ['gnulink', 'mslink', 'ilink']
c_compilers = ['gcc', 'msvc', 'icc']
assemblers = ['gas', 'nasm', 'masm']
fortran_compilers = ['g77', 'ifl']
- ars = ['ar', 'lib']
+ ars = ['ar', 'mslib']
linker = FindTool(linkers, env) or linkers[0]
c_compiler = FindTool(c_compilers, env) or c_compilers[0]
-"""SCons.Tool.lib
+"""SCons.Tool.mslib
Tool-specific initialization for lib (MicroSoft library archiver).
res = mapPaths([ file, 'baz', 'blat/boo', '#test' ], dir)
assert res[0] == file, res[0]
- assert res[1] == os.path.normpath('foo/baz'), res[1]
- assert res[2] == os.path.normpath('foo/blat/boo'), res[2]
+ assert res[1] == os.path.join('foo', 'baz'), res[1]
+ assert res[2] == os.path.join('foo', 'blat/boo'), res[2]
assert res[3] == '#test', res[3]
env=DummyEnv()
# to print what's going on when -n is used. Following the
# directions on the XXX lines below whenever that gets fixed.
#
+install_f3_in = os.path.join('install', 'f3.in')
# XXX Uncomment the next line and remove the one after it when we
# fix the Install print during -n.
-#expect = test.wrap_stdout('Install file: "f3.in" as "install/f3.in"\n')
+#expect = test.wrap_stdout('Install file: "f3.in" as "%s"\n' % install_f3_in)
expect = test.wrap_stdout('')
test.run(arguments = '-n install', stdout = expect)
test.fail_test(os.path.exists(test.workpath('install', 'f3.in')))
# XXX Remove the next line when we fix the Install print during -n.
-expect = test.wrap_stdout('Install file: "f3.in" as "install/f3.in"\n')
+expect = test.wrap_stdout('Install file: "f3.in" as "%s"\n' % install_f3_in)
test.run(arguments = 'install', stdout = expect)
test.fail_test(not os.path.exists(test.workpath('install', 'f3.in')))
projects / scons.git / commitdiff