summaryrefslogtreecommitdiff
path: root/numpy/distutils/command
diff options
context:
space:
mode:
authorDavid Cournapeau <cournape@gmail.com>2009-02-22 03:41:06 +0000
committerDavid Cournapeau <cournape@gmail.com>2009-02-22 03:41:06 +0000
commit919eef58a3fdf0c2d45ae717d5b793c6d3c11cbb (patch)
tree04da2939722f56b3a7e68d19e58f5154fafd5055 /numpy/distutils/command
parent0ef0ac2fffd119c66d244c7a335a3735a091f948 (diff)
parente223c83c8b8a2edc44b29791bbd41c8236b2deca (diff)
downloadnumpy-919eef58a3fdf0c2d45ae717d5b793c6d3c11cbb.tar.gz
Merged revisions 6398-6400,6410,6421-6424,6426-6428,6431,6433,6441-6442 via svnmerge from
http://svn.scipy.org/svn/numpy/trunk ................ r6398 | charris | 2009-02-19 05:54:52 +0900 (Thu, 19 Feb 2009) | 2 lines Coding style cleanups. ................ r6399 | charris | 2009-02-19 09:45:14 +0900 (Thu, 19 Feb 2009) | 2 lines Coding style cleanups. ................ r6400 | charris | 2009-02-19 13:58:23 +0900 (Thu, 19 Feb 2009) | 1 line Coding style cleanups. ................ r6410 | cdavid | 2009-02-19 19:05:28 +0900 (Thu, 19 Feb 2009) | 1 line Tag known failure on win32. ................ r6421 | stefan | 2009-02-20 04:28:08 +0900 (Fri, 20 Feb 2009) | 1 line Fix tests using strptime to be Python 2.4 compatible. ................ r6422 | charris | 2009-02-20 08:25:01 +0900 (Fri, 20 Feb 2009) | 2 lines Coding style cleanups. ................ r6423 | charris | 2009-02-20 12:40:53 +0900 (Fri, 20 Feb 2009) | 1 line Coding style cleanups. ................ r6424 | cdavid | 2009-02-20 22:30:20 +0900 (Fri, 20 Feb 2009) | 1 line Unhelpful message for compaq fortran compiler. ................ r6426 | charris | 2009-02-21 07:28:05 +0900 (Sat, 21 Feb 2009) | 2 lines Change indentation of switch statements. ................ r6427 | charris | 2009-02-21 13:21:50 +0900 (Sat, 21 Feb 2009) | 1 line Coding style cleanups. ................ r6428 | cdavid | 2009-02-21 13:35:57 +0900 (Sat, 21 Feb 2009) | 3 lines Removed merge tracking for "svnmerge" for http://svn.scipy.org/svn/numpy/branches/fix_float_format ................ r6431 | charris | 2009-02-21 13:41:17 +0900 (Sat, 21 Feb 2009) | 1 line Remove terminating ";" from macro to fix ticket #918. ................ r6433 | cdavid | 2009-02-21 14:38:29 +0900 (Sat, 21 Feb 2009) | 3 lines Removed merge tracking for "svnmerge" for http://svn.scipy.org/svn/numpy/branches/visualstudio_manifest ................ r6441 | cdavid | 2009-02-22 02:25:09 +0900 (Sun, 22 Feb 2009) | 105 lines Merged revisions 6153-6173,6176-6178,6184 via svnmerge from http://svn.scipy.org/svn/numpy/branches/numpy-mingw-w64 ........ r6153 | cdavid | 2008-12-19 17:06:06 +0900 (Fri, 19 Dec 2008) | 1 line Add a function to find python dll on windows. ........ r6154 | cdavid | 2008-12-19 17:28:49 +0900 (Fri, 19 Dec 2008) | 1 line Fix typo when getting system32 location. ........ r6155 | cdavid | 2008-12-19 17:37:19 +0900 (Fri, 19 Dec 2008) | 1 line Add a function to get a dump of private headers from dll. ........ r6156 | cdavid | 2008-12-19 17:41:39 +0900 (Fri, 19 Dec 2008) | 1 line Add a function to generate a .def file from a dll. ........ r6157 | cdavid | 2008-12-19 17:43:56 +0900 (Fri, 19 Dec 2008) | 1 line Forgot to add the regex for the generate_def function. ........ r6158 | cdavid | 2008-12-19 17:53:49 +0900 (Fri, 19 Dec 2008) | 1 line Fix .def file generation. ........ r6159 | cdavid | 2008-12-19 17:56:54 +0900 (Fri, 19 Dec 2008) | 1 line Add a warning if no symbols found in the dll (if stripped, for example). ........ r6160 | cdavid | 2008-12-19 18:02:24 +0900 (Fri, 19 Dec 2008) | 1 line Refactor build_import_library to take into account multi arch. ........ r6161 | cdavid | 2008-12-19 18:10:03 +0900 (Fri, 19 Dec 2008) | 1 line Do not generate manifest when built with msver 8.*, it does not look like it is needed, and we dont support it anyway ATM. ........ r6162 | cdavid | 2008-12-19 18:18:08 +0900 (Fri, 19 Dec 2008) | 1 line Show arch in the log when building import library. ........ r6163 | cdavid | 2008-12-19 18:22:18 +0900 (Fri, 19 Dec 2008) | 1 line Fix missing out filename. ........ r6164 | cdavid | 2008-12-19 18:32:46 +0900 (Fri, 19 Dec 2008) | 1 line Actually build the import library for mingw on amd64. ........ r6165 | cdavid | 2008-12-19 18:46:30 +0900 (Fri, 19 Dec 2008) | 1 line Do not generate ordinal, and use the basename of the dll instead of the full path in the def.file. ........ r6166 | cdavid | 2008-12-19 18:48:01 +0900 (Fri, 19 Dec 2008) | 1 line Trailing spaces. ........ r6167 | cdavid | 2008-12-19 18:55:16 +0900 (Fri, 19 Dec 2008) | 1 line Add MS_WIN64 macro when built on amd64 + mingw. ........ r6168 | cdavid | 2008-12-19 18:57:06 +0900 (Fri, 19 Dec 2008) | 1 line Forgot to import get_build_architecture. ........ r6169 | cdavid | 2008-12-19 18:57:52 +0900 (Fri, 19 Dec 2008) | 1 line Use a tuple when defining the MS_WIN64 macro. ........ r6170 | cdavid | 2008-12-19 19:05:03 +0900 (Fri, 19 Dec 2008) | 1 line Fix macro def. ........ r6171 | cdavid | 2008-12-19 19:21:54 +0900 (Fri, 19 Dec 2008) | 2 lines Do not use g++ for linking on amd64. ........ r6172 | cdavid | 2008-12-19 19:25:18 +0900 (Fri, 19 Dec 2008) | 1 line do not regenerate the import library if already there. ........ r6173 | cdavid | 2008-12-19 19:28:39 +0900 (Fri, 19 Dec 2008) | 1 line Add one full msvcrt version for 80 (for manifest generation). ........ r6176 | cdavid | 2008-12-21 02:31:48 +0900 (Sun, 21 Dec 2008) | 1 line Remove optimization flags for now, to speed up builds. ........ r6177 | cdavid | 2008-12-21 02:32:11 +0900 (Sun, 21 Dec 2008) | 1 line Add MS_WIN64 for every compile command. ........ r6178 | cdavid | 2008-12-21 02:32:33 +0900 (Sun, 21 Dec 2008) | 1 line Remove handling of MS_WIN64 in commands: deal with it in mingw tool only. ........ r6184 | cdavid | 2008-12-21 16:46:28 +0900 (Sun, 21 Dec 2008) | 1 line Hardcode size of long double, because it is broken with mingw. ........ ................ r6442 | cdavid | 2009-02-22 02:36:15 +0900 (Sun, 22 Feb 2009) | 1 line Re-enable real check for long double size. ................
Diffstat (limited to 'numpy/distutils/command')
-rw-r--r--numpy/distutils/command/build_ext.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py
index 3092167c6..904cb9067 100644
--- a/numpy/distutils/command/build_ext.py
+++ b/numpy/distutils/command/build_ext.py
@@ -16,7 +16,7 @@ from numpy.distutils.exec_command import exec_command
from numpy.distutils.system_info import combine_paths
from numpy.distutils.misc_util import filter_sources, has_f_sources, \
has_cxx_sources, get_ext_source_files, \
- get_numpy_include_dirs, is_sequence
+ get_numpy_include_dirs, is_sequence, get_build_architecture
from numpy.distutils.command.config_compiler import show_fortran_compilers
try:
View Lorry Controller Status