Log of /branches/ROBW_XPLATFORM/SConstruct
Parent Directory
|
Revision Log
Revision
678 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Sun Mar 26 12:20:00 2006 UTC
(17 years ago)
by
robwdcock
File length: 11660 byte(s)
Diff to
previous 677
+Allow for environment variable PATH, LD_LIBRARY_PATH, and PYTHONPATH to
not exist in the users environment.
Revision
677 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Sun Mar 26 11:25:19 2006 UTC
(17 years ago)
by
robwdcock
File length: 11467 byte(s)
Diff to
previous 676
+ Opps forgot to commit the lines that add the PYTHONPATH to the scons ENV used for calling external programs
Revision
676 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Sun Mar 26 10:13:34 2006 UTC
(17 years ago)
by
robwdcock
File length: 11280 byte(s)
Diff to
previous 675
+ Modified test SConscript dependencies to remove redundant call to explicit dependency
+ Modified scon_extensions.py - run unit tests (py and C++) now use scons::Execute rather than python os.system. This ensures the development environment
is used rather than the users environment to run the tests
+ SConstruct file now sets up LD_LIBRARY_PATH and PYTHONPATH to point to the current builds pyinstall and libinstall paths as required.
IT IS NO LONGER NECESSARY TO SET LD_LIBRARY_PATH and PYTHONPATH to point at your build outputs. Much safer in the presence of multiple checked out builds.
Under these circumstances you are better of using scons to run the tests rather than doing so directly. Easiest way to do this is to build the test output target for the test you want:
e.g. scons build/posix/bruce/test/python/ImportTest.passed
or if you prefer
cd build/posix/bruce/test/python
scons -u ImportTest.passed
Revision
673 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Sun Mar 26 07:16:42 2006 UTC
(17 years ago)
by
robwdcock
File length: 10829 byte(s)
Diff to
previous 667
+ Added some svn:ignore properties so .pyc files aren't reported during svn status and friends
+ Removed esys directory. Build system will create the pyinstall/esys target and touch the __init__.py file in it as part of the build process. This means you can now direct scons to perform an install of the python directly into your desired location rather than just in the root of the source tree.
Revision
667 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 24 13:25:00 2006 UTC
(17 years ago)
by
robwdcock
File length: 10600 byte(s)
Diff to
previous 666
+ OUCH ARGHH
+ Okay the wizzy linkHack doesn't work. Not sure why but py_tests fail
when the shared library is on the link line directly (without a -l)
+ Unfortunately we can't figure out how to use -l without it prepending
a lib prefix. Hence all the shareable objects in python now need to be
called libblah.so (and lib will need to be prepended on windows!!!!).
This is not the python way and its very annoying. Why do we have this
problem? Because the C++ shared libraries link with each other.
Revision
666 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 24 11:29:40 2006 UTC
(17 years ago)
by
robwdcock
File length: 10728 byte(s)
Diff to
previous 662
+ Fix up python esys area:
+ libraries are named without lib prefix on posix platforms (python standard)
+ libraries are now installed into the pyinstall area (python standard)
+ symlinks removed, no longer required
+ LD_LIBRARY_PATH is now optional for PYTHON programs (still required for c++)
+ lib PREFIX removal NOTES:
+ removing the lib prefix is non-standard for the linker. As such we've created a
custom function sharedLinkHack to specify the .so on the link command line
(as opposed to using -l<archive> which will prepend the lib). This has a
a small slight of hand for scons which was being to "helpful". Scons
verifies that when creating a shared libray all objects specified are
created shareable (e.g. ensure objects are compiler with -fPIC). Since
we are linking a .so out of the blue we had to wrap it up in a File note
and flag it as shared.
Easily done, once you know how. Thankfully this is all wrapped
up in a simple function (sharedLinkHack) that looks like ordinary scons so
you will never know!
Revision
651 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 24 06:44:23 2006 UTC
(17 years ago)
by
robwdcock
File length: 10508 byte(s)
Diff to
previous 650
+Python file now compile and install into pyinstall directory
Revision
648 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 24 06:04:57 2006 UTC
(17 years ago)
by
robwdcock
File length: 11052 byte(s)
Diff to
previous 642
+Finely unit tests now running in build system
All C++ tests run and compile on Altix, I expect the same result for Linux so you may not see another log message for that.
Revision
642 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 23 14:03:49 2006 UTC
(17 years ago)
by
robwdcock
File length: 11144 byte(s)
Diff to
previous 641
+ Bruce unit tests consolidated and added to build system
Revision
641 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 23 14:02:26 2006 UTC
(17 years ago)
by
robwdcock
File length: 11240 byte(s)
Diff to
previous 639
+ First compilation under Linux with new xplatform build system. Some minor adjustments because didn't like None objects in a list so using '' instead
Note: Most everything appears to compile but the Data test suite is failing to pass in testMore - Exercise wherePositive method.
This test passes on altix.
Revision
635 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 23 08:56:35 2006 UTC
(17 years ago)
by
robwdcock
File length: 11302 byte(s)
Diff to
previous 634
+EsysExceptionTest and build_tests and run_tests targets now operating as per original build system
Revision
634 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 23 06:03:46 2006 UTC
(17 years ago)
by
robwdcock
File length: 11035 byte(s)
Diff to
previous 632
+ Opps windows build wasn't getting options passed into environment!
Note: Windows build environment for intel_c compiler is only partially building. Looks like there will be a few source code adjustments necessary to tweak things. Still, much better than the msvc compiler. It also has openmp support - now I just need a dual core cpu notebook upgrade.
Revision
632 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 23 05:00:51 2006 UTC
(17 years ago)
by
robwdcock
File length: 11039 byte(s)
Diff to
previous 623
+Fix problem in setting flags when no options file is used
Revision
623 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Mar 22 14:11:03 2006 UTC
(17 years ago)
by
robwdcock
File length: 11128 byte(s)
Diff to
previous 622
Beginning of a fully cross-platform (win32+intelc, linux+g++, altix+intelc)
scons build system
WORK IN PROGRESS NOT COMPLETE
+Incorporates ideas from trunks scons build system and the RW_WIN32 branch
+New Header layout as include/<modulename>, hence the changes to the headers
+Not all modules or features from trunk build system are fully implemented
-Removes need for intermediary SConstruct files - the top SConstruct is more complex but handle cross-platform better AND the SConscript are a LOT simpler
and only differ slightly. It should be simpler to maintain
-Options are now handled via either a: config file supplied on command line, a config file in the scons/hostname_options.py, or as individual command line arguments
-Need help with options: scons -h will give you a list of options and their current settings
Revision
622 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Wed Mar 22 14:00:08 2006 UTC
(17 years ago)
by
robwdcock
File length: 683 byte(s)
Diff to
previous 618
Creating a private branch so I can test and verify cross-platform build
Revision
425 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Tue Jan 10 04:10:39 2006 UTC
(17 years, 2 months ago)
by
gross
Original Path:
trunk/SConstruct
File length: 647 byte(s)
Diff to
previous 380
The sparse solver can be called by paso now.
the building has been change to reduce some code redundancy:
now all scons SCscripts are importing scons/esys_options.py which
imports platform specific settings.
Revision
340 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Dec 12 05:10:45 2005 UTC
(17 years, 3 months ago)
by
jgs
Original Path:
trunk/SConstruct
File length: 1268 byte(s)
Diff to
previous 288
pass in pyinstall value from top-level scons script and add
correct suffix in module level scons scipr
Revision
214 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 24 05:15:26 2005 UTC
(17 years, 4 months ago)
by
jgs
Original Path:
trunk/SConstruct
File length: 996 byte(s)
Diff to
previous 192
collect all information needed to determine build
configuration (ie: debug/nodebug, host, platform etc)
Revision
192 -
(
view)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 21 04:52:14 2005 UTC
(17 years, 4 months ago)
by
jgs
Original Path:
trunk/SConstruct
File length: 275 byte(s)
Diff to
previous 189
pass in top level install directory for finley/escript/bruce/paso
libraries when building via top level scons script
Revision
189 -
(
view)
(
annotate)
-
[select for diffs]
Added
Mon Nov 21 03:26:46 2005 UTC
(17 years, 4 months ago)
by
jgs
Original Path:
trunk/SConstruct
File length: 226 byte(s)
add top level SConstruct file to enable coordinated building of all esys libraries
This form allows you to request diffs between any two revisions of this file.
For each of the two "sides" of the diff,
enter a numeric revision.