2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-19 14:22:10 +00:00
Commit Graph

57 Commits

Author SHA1 Message Date
Dave Abrahams
6c13901b8c 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
a5c9a2a414 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
0f445e4efb Fix extension module suffix on HPUX for Python 2.4 and below
[SVN r37269]
2007-03-23 04:43:27 +00:00
Dave Abrahams
5322b17b5d 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
Dave Abrahams
90acae9278 Some simplifications. Building on Cygwin from an NT bjam is broken again :(
[SVN r37252]
2007-03-21 08:02:27 +00:00
Dave Abrahams
d691e3cd0f Properly set up <dll-path> for windows embedding targets.
[SVN r37251]
2007-03-21 05:42:31 +00:00
Vladimir Prus
0c4a03c607 Fix python's generator error
[SVN r37243]
2007-03-20 16:48:05 +00:00
Dave Abrahams
ac28d1cb89 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
549a94389e 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
444fa3c254 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
7adced1aea 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
d16686f3c0 Fix bug reported by Markus Schöpflin
[SVN r37202]
2007-03-16 15:40:24 +00:00
Dave Abrahams
9b89c2f459 ** 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
Dave Abrahams
96e4e6f2b2 Get rid of debugging message
[SVN r36902]
2007-02-06 21:52:48 +00:00
Douglas Gregor
f3be310698 Publish the python interpreter and version number, because others need it
[SVN r36846]
2007-01-30 15:23:09 +00:00
Dave Abrahams
b4400ed476 small fixes for Windows; big fixes to come later
[SVN r36700]
2007-01-12 03:28:36 +00:00
Dave Abrahams
b344cbeaa7 Patch for HPUX from Boris Grubenko
[SVN r36466]
2006-12-20 13:27:15 +00:00
Vladimir Prus
e3ba2edc70 Merge: Don't remove python scripts for Python tests.
[SVN r36074]
2006-11-18 09:00:49 +00:00
Vladimir Prus
bc4f5e0dbd Testing fixes from HEAD
[SVN r35610]
2006-10-14 10:46:17 +00:00
Dave Abrahams
714864acd8 Fix more python configuration bugs
[SVN r35455]
2006-10-03 13:45:22 +00:00
Dave Abrahams
a1965f414e merged from HEAD
[SVN r35443]
2006-10-02 15:16:00 +00:00
Vladimir Prus
91111aecd7 Merge: Add comment
[SVN r35431]
2006-09-30 09:31:35 +00:00
Markus Schöpflin
e999a2afd4 Removed libz from extra libs on Tru64.
[SVN r35414]
2006-09-29 13:29:30 +00:00
Dave Abrahams
3b48033de7 merged from HEAD
[SVN r35392]
2006-09-28 17:18:03 +00:00
Douglas Gregor
a640c0c36b Fix linking of libboost_python on Mac OS X
[SVN r35307]
2006-09-24 12:36:22 +00:00
Dave Abrahams
03fb5cbb67 merged from HEAD
[SVN r35201]
2006-09-19 13:56:26 +00:00
Dave Abrahams
381f08ae77 merge from HEAD
[SVN r35141]
2006-09-17 02:42:51 +00:00
Dave Abrahams
94ee5b6f1e merged from HEAD
[SVN r35139]
2006-09-16 18:50:43 +00:00
Dave Abrahams
3a902f42cd merged from trunk
[SVN r35065]
2006-09-10 23:46:12 +00:00
Vladimir Prus
755901712b Merge: Revive pthread & python comment.
[SVN r35010]
2006-08-31 08:08:57 +00:00
Vladimir Prus
4051a16c7a Merge: Really remove the dot from the Python version when forming library name.
[SVN r35008]
2006-08-31 08:02:38 +00:00
Dave Abrahams
a6b3f489bf merged from trunk
[SVN r35005]
2006-08-31 02:49:05 +00:00
Dave Abrahams
66b7ddae79 merged from trunk
[SVN r35003]
2006-08-30 20:56:59 +00:00
Vladimir Prus
b5e6815d4a Merge: fix spelling of 'find-library'
[SVN r34947]
2006-08-25 07:23:33 +00:00
Dave Abrahams
839e8fcd07 merged from trunk
[SVN r34888]
2006-08-15 17:35:48 +00:00
Dave Abrahams
64ff1dfeae merged from trunk
[SVN r34870]
2006-08-11 15:45:55 +00:00
Dave Abrahams
0baadb5dff merged from trunk
[SVN r34853]
2006-08-08 17:56:40 +00:00
Markus Schöpflin
27ab207998 Merged fix for missing librt on Tru64/gcc from trunk.
[SVN r34803]
2006-08-02 08:09:20 +00:00
Vladimir Prus
7789154664 Merge: fix logic for adding 'rt'
[SVN r34751]
2006-07-27 06:56:31 +00:00
Vladimir Prus
3579bd419d Merge: Link to rt on Sun
[SVN r34694]
2006-07-24 06:15:30 +00:00
Vladimir Prus
486a456b78 Merge: Don't link Boost.Python to python library
[SVN r34663]
2006-07-22 07:16:18 +00:00
Vladimir Prus
a9579a95c5 Merge from trunk
[SVN r34160]
2006-06-04 06:56:19 +00:00
Vladimir Prus
11cfb87e45 Merge from trunk
[SVN r34001]
2006-05-18 11:06:48 +00:00
Vladimir Prus
b3c08e13d6 Merge from trunk.
[SVN r33579]
2006-04-07 07:38:58 +00:00
Vladimir Prus
28e0619911 Merge fixes from HEAD.
[SVN r33484]
2006-03-27 12:05:57 +00:00
Vladimir Prus
b4903af911 Python/OSX fix from Noel Belcourt.
This change addresses how Darwin handles compiling for frameworks.  The
   python frameworks require specific #include syntax that is not present
   in the boost source code so this change specifically adds python
   framework includes to the compile line.


[SVN r33402]
2006-03-20 08:48:58 +00:00
Vladimir Prus
a79ef83bd4 On, windows, extension for Python modules should be .dll, not .so!
[SVN r33171]
2006-02-28 09:33:56 +00:00
Vladimir Prus
bec4788f50 For Windows, don't add version to Python interpreter name. Seem that this
does not work.


[SVN r33118]
2006-02-26 16:19:05 +00:00
Vladimir Prus
c5122d295c Fix detection of Python on Darwin.
Patch from Noel Belcourt.


[SVN r33117]
2006-02-26 16:17:20 +00:00
Vladimir Prus
01077db991 Try to property set interpreter for NT.
[SVN r33051]
2006-02-21 07:27:39 +00:00