Merge branch 'refactor' of github.com:numpy/numpy-refactor into refactor

RobAmos · Mar 1, 2011 · fdf6346 · fdf6346
2 parents 890f1d6 + 90f41d1
commit fdf6346
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/iron_egg.py b/iron_egg.py
@@ -7,7 +7,7 @@
 from os.path import join
 
 
-numpy_version = '2.0.0'
+numpy_version = '2.0.0b1'
 
 
 config_txt = """# this file is generated by iron_egg.py
@@ -67,14 +67,18 @@ def build_egg():
                     arcname = arcname[:-7] + '.py'
                 z.write(path, arcname)
 
-            elif fn.endswith('.dll') and fn not in ignore_libs:
+            elif (fn.endswith('.dll') and fn not in ignore_libs and
+                  '\\Release\\' in path):
                 z.write(path, 'EGG-INFO/prefix/DLLs/' + fn)
 
     z.write(r'numpy\NumpyDotNet\bin\Release\NumpyDotNet.dll',
             'EGG-INFO/prefix/DLLs/NumpyDotNet.dll')
-    z.write(join(os.environ['VSINSTALLDIR'],
-                 r'VC\redist\x86\Microsoft.VC100.CRT\msvcr100.dll'),
-            'EGG-INFO/prefix/DLLs/msvcr100.dll')
+
+    for fn in ('msvcr100.dll', 'msvcp100.dll'):
+        z.write(join(os.environ['VSINSTALLDIR'],
+                     r'VC\redist\x86\Microsoft.VC100.CRT', fn),
+                'EGG-INFO/prefix/DLLs/' + fn)
+
     z.writestr('numpy/__config__.py', config_txt)
     z.writestr('numpy/version.py', version_txt)
     z.writestr('EGG-INFO/spec/depend', spec_txt)