2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-25 04:12:23 +00:00
Commit Graph

4866 Commits

Author SHA1 Message Date
Dave Abrahams
76572484ed Fix a bug wherein multiple python interpreters could get set on a
target.  My explanation from a mail to Martin Wille:


  IIUC, your
  configuration looks like:

     using python : 2.4 : ... ;
     using python : 2.4 : ... : : : <toolset>gcc <toolset-gcc:version>4.1.2_linux_x86_64 ;
     using python : 2.4 : ... : : : <toolset>gcc <toolset-gcc:version>4.1.0_linux_x86_64 ;

  The intention is of course that the latter pythons will be used in
  preference to the former one if their conditions are matched more
  explicitly.

  We are using the "flags" rule to directly associate the interpreter
  command with targets being built, provided the condition passed is
  matched.

      # Set up the PYTHON variable to point at the interpreter.
      flags python.capture-output PYTHON $(condition:J=/) : $(interpreter-cmd) ;

  Here's an excerpt of docs for the condition parameter on flags:

               condition * :    # A condition when this flag should be applied.
                                # Should be set of property sets. If one of
                                # those property sets is contained in build
                                # properties, the flag will be used.

  So what happens is that, because it's less specific, the flags
  invocation for the first python matches when either of the latter
  pythons was supposed to match, and the PYTHON variable that is used to
  hold the interpreter command on the testing target accumulates both
  interpreters.

  We have a mechanism for "choose the closest property match," but it
  doesn't apply to the flags rule: it's target alternatives.  Since we
  define target alternatives for the python library anyway, I think I
  can handle this by creating a property to hold the interpreter command
  and associating it with the appropriate target alternative, then
  keying off *that* command to set up flags.


[SVN r37272]
2007-03-23 14:21:49 +00:00
Dave Abrahams
de81f5be4f Removed pthread from hpux system libs per request of Boris
Grubenko (see http://docs.hp.com/en/8759/options.htm#opt-mt)


[SVN r37270]
2007-03-23 13:35:11 +00:00
Dave Abrahams
18d905490d Fix extension module suffix on HPUX for Python 2.4 and below
[SVN r37269]
2007-03-23 04:43:27 +00:00
Dave Abrahams
1c4b621eba factor out the search through Wow6432node in the registry of software
Make path-to-native work on zero or more paths, which simplifies lots
of code.

Factor native path translation out of compute-default-paths and into its caller.

Remove the path-to-native translation on the prefix from
candidate-interpreters, as the passed prefix has to be native anyway.

Fix the capturing of the exec_prefix for use in setting dll-path for
windows targets.


[SVN r37255]
2007-03-21 17:44:24 +00:00
Vladimir Prus
9fcc9247f1 Merge: Remove outdated comment
[SVN r37254]
2007-03-21 15:53:57 +00:00
Vladimir Prus
07e1cdeb8b Remove outdated comment
[SVN r37253]
2007-03-21 15:52:56 +00:00
Dave Abrahams
b7bd9d6748 Some simplifications. Building on Cygwin from an NT bjam is broken again :(
[SVN r37252]
2007-03-21 08:02:27 +00:00
Dave Abrahams
a2454307d1 Properly set up <dll-path> for windows embedding targets.
[SVN r37251]
2007-03-21 05:42:31 +00:00
Vladimir Prus
0ff87fbbb9 Fix python's generator error
[SVN r37243]
2007-03-20 16:48:05 +00:00
Vladimir Prus
1a0e9f436b Merge
[SVN r37239]
2007-03-20 07:37:16 +00:00
Vladimir Prus
d536640e8e Quoted DEF_FILE.
Patch from David Deakins.


[SVN r37238]
2007-03-20 07:36:14 +00:00
Dave Abrahams
89de7521a3 tools/build/v2/tools/python.jam:
* add ".lib" to the target name for libpython.  *** This is a kluge!
   I don't know why it should be necessary ***, but when I was
   inserting debugging code that did

      ECHO [ $(target).name ] ;

   it would always drop the 2nd digit, e.g. python-2.4 would come out
   as "python-2".  This change prevented it.

 * Fixed spelling and grammar in comments

 * Fix the incorrect assumption in capture-output that only one Python
   extension will participate (also in tools/build/v2/testing.jam).


[SVN r37215]
2007-03-17 20:25:04 +00:00
Dave Abrahams
567a3f7566 Make sure sys.platform isn't required
Update darwin handler so it will fall back to the standard *nix method
if Python isn't installed as a framework.


[SVN r37211]
2007-03-16 23:26:35 +00:00
Dave Abrahams
5a5288af94 Make sure that the libpython target is declared with distinct requirements each time, thus forming valid target alternatives.
[SVN r37210]
2007-03-16 23:05:14 +00:00
Dave Abrahams
3beb2c1966 Fix failure to print the cmd-or-prefix argument when --debug-configuration is passed.
[SVN r37203]
2007-03-16 16:15:55 +00:00
Dave Abrahams
57d0dda79b Fix bug reported by Markus Schöpflin
[SVN r37202]
2007-03-16 15:40:24 +00:00
Rene Rivera
4a55b80b48 Add some implementation comments. Fix bug that prevented some default arguments values from being generated.
[SVN r37187]
2007-03-15 05:24:12 +00:00
Dave Abrahams
dd941aea4f ** This comment represents the aggregate changes merged from the **
** bbv2python branch.                                            **

gcc.jam: build and use import libraries on Cygwin and Windows, but
         accept DLL-only linking with prebuilt DLLs.

builtin.jam: fix default-host-os so that <target-os> actually becomes
             a functional feature.  Improve English in comments

property-set.jam: add str method so we can print them in generator
                  debugging output.

generators.jam: improved debugging output

build-system.jam: add missing semicolon

python.jam:
* fix cross-NT/CYGWIN build support
* add condition to the build requirements of the python targets

os.jam:
* add the ability to get constants for a particular OS

builtin.jam:
* remove "optional" attribute from host-os
* fix confusing indents

python.jam
----------

* Removed comments about known problems because they make no sense.

* Unified MacOS initialization with NT and *nix

* Updated comment describing init behavior

* Support for passing Python command as first argument

* Removed unused get-python-interpreter and get-python-version rules,
  since they can't work with that interface.  Working versions of
  these will be reinstated for Doug Gregor in the near future.

* When invoking Python to collect configuration info, collect it all at at once.

* When a Cygwin symlink is found by an NT build of bjam, give hints
  about where to find the file it points at.

* Lots of refactoring

* Make the logic work plausibly even when no Python executable can be found


darwin.jam
----------

* Simplified logic for setting up FRAMEWORK_PATH

* Corrected logic for setting up -framework option


feature.jam
-----------

* Make feature.defaults, feature.attributes, feature.values, and
  feature.get-values resilient to feature names being passed without
  grist.


gcc.jam, python.jam, builtin.jam
--------------------------------

* Include some progress volodya has made toward support for <suppress-import-lib>


[SVN r37186]
2007-03-15 04:02:25 +00:00
Daniel James
52f5485975 Change STLport links to point to the sourceforge home page, which is the home
page for more recent releases.


[SVN r37110]
2007-02-28 00:01:33 +00:00
Daniel James
580d14cd82 Change STLport links to point to the sourceforge page.
[SVN r37108]
2007-02-27 23:59:40 +00:00
Rene Rivera
8ddd260606 Improve the detection logic so that it work under vc8 running a Win64 OS. It is now possible to build a 64bit variant of bjam with vc8. Document the new buid script syntax and the numerous bjam options.
[SVN r37055]
2007-02-24 20:43:24 +00:00
Dave Abrahams
656d7c36e1 Add missing semicolon
[SVN r37054]
2007-02-24 20:22:54 +00:00
Dave Abrahams
c8a8873ad5 Some support for amd64; correct broken ia64 option
[SVN r37053]
2007-02-24 11:41:19 +00:00
Dave Abrahams
843105bbc4 Some support for amd64; correct broken ia64 option
[SVN r37053]
2007-02-24 11:41:19 +00:00
Douglas Gregor
b0264186d4 Auto-detection of Microsoft's MPI toolchain
[SVN r36980]
2007-02-16 21:02:58 +00:00
Rene Rivera
6f5b0cab39 Add compiler path to RUN_PATH.
[SVN r36945]
2007-02-15 06:27:07 +00:00
Douglas Gregor
e10d7690f8 Import doxygen bits from 1.34.0 branch
[SVN r36910]
2007-02-08 19:27:41 +00:00
Dave Abrahams
787d13c3f0 Get rid of debugging message
[SVN r36902]
2007-02-06 21:52:48 +00:00
Dave Abrahams
af335fa167 Get rid of debugging message
[SVN r36902]
2007-02-06 21:52:48 +00:00
Vladimir Prus
a5c82a5ec0 Merge: Use -soname, not -h, since the latter does not
work with intel-9.0, for unknown reason.


[SVN r36900]
2007-02-06 18:27:41 +00:00
Vladimir Prus
8452835822 Use -soname, not -h, since the latter does not
work with intel-9.0, for unknown reason.


[SVN r36899]
2007-02-06 18:26:02 +00:00
Rene Rivera
d77765ca0a Update scanner to handle the newer quickbook include systax wqhich allows whitespace before "include".
[SVN r36868]
2007-02-01 04:00:53 +00:00
Jürgen Hunold
4efdd646a0 Prepare for separate include, library and binary prefixes for preinstalled Qt.
[SVN r36864]
2007-01-31 19:45:54 +00:00
Douglas Gregor
30fd319d5f Publish the python interpreter and version number, because others need it
[SVN r36846]
2007-01-30 15:23:09 +00:00
Douglas Gregor
dca25d906b Publish the python interpreter and version number, because others need it
[SVN r36846]
2007-01-30 15:23:09 +00:00
Vladimir Prus
27ab8f6ef2 Merge: increase page size for tlib
[SVN r36845]
2007-01-30 10:11:58 +00:00
Vladimir Prus
33e05be028 Increase page size for tlib.
[SVN r36844]
2007-01-30 10:11:02 +00:00
Vladimir Prus
0496dd4a6c Merge: Fix run-fail tests
[SVN r36770]
2007-01-23 20:51:39 +00:00
Vladimir Prus
7f2670f670 Fix run-fail tests
[SVN r36769]
2007-01-23 20:50:55 +00:00
Dave Abrahams
e73e73f8cc Minor fixes for python on Windows.
Handle spaces in pathnames in testing.jam


[SVN r36713]
2007-01-12 22:21:04 +00:00
Dave Abrahams
070b1c5aea Added --abbreviate-paths feature to help with windows length limitations.
[SVN r36709]
2007-01-12 17:58:53 +00:00
Dave Abrahams
7d1a1a4a44 Added --abbreviate-paths feature to help with windows length limitations.
[SVN r36709]
2007-01-12 17:58:53 +00:00
Dave Abrahams
53477f57c9 add missing quoting for Win32
[SVN r36702]
2007-01-12 05:18:26 +00:00
Dave Abrahams
008df97cd2 small fixes for Windows; big fixes to come later
[SVN r36700]
2007-01-12 03:28:36 +00:00
Rene Rivera
92411bf7cb (merge from head) Fix script errors when PATH contains parenthesis "()", like Win64 does. The fix corrects all instances of "set" just incase there are other places other than PATH where this is a problem.
[SVN r36694]
2007-01-11 21:50:48 +00:00
Rene Rivera
190fa8b548 Oops, silence the script.
[SVN r36693]
2007-01-11 21:47:52 +00:00
Rene Rivera
f0c33c0782 Fix script errors when PATH contains parenthesis "()", like Win64 does. The fix corrects all instances of "set" just incase there are other places other than PATH where this is a problem.
[SVN r36692]
2007-01-11 21:43:47 +00:00
Rene Rivera
bac2b24ebb Some minor cleanup.
[SVN r36687]
2007-01-11 05:29:43 +00:00
Vladimir Prus
d9e656930b Revert last merge, as it breaks everything.
[SVN r36669]
2007-01-08 21:29:35 +00:00
Vladimir Prus
eb4e12498a Merge: allow multiple sources for compile/compile-fail
[SVN r36643]
2007-01-07 18:44:06 +00:00