fixed DLLs included in egg

numpy · Feb 23, 2011 · 6d48674 · 6d48674
1 parent aafd012
commit 6d48674
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/iron_egg.py b/iron_egg.py
@@ -47,7 +47,10 @@ def build_egg():
                    "Microsoft.Scripting.Metadata.dll",
                    "Microsoft.Dynamic.dll",
                    "IronPython.dll",
-                   "IronPython.Modules.dll"]
+                   "IronPython.Modules.dll",
+                   # ignore multipe copies and add one below
+                   "NumpyDotNet.dll",
+                   ]
 
     # Recursively walk the numpy tree and add all files to the egg
     for root, dirs, files in os.walk("numpy"):
@@ -62,8 +65,8 @@ def build_egg():
             elif fn.endswith('.dll') and fn not in ignore_libs:
                 z.write(path, 'EGG-INFO/prefix/DLLs/' + fn)
 
-    z.write(r'libndarray\windows\bin\Debug\ndarray.dll',
-            'EGG-INFO/prefix/DLLs/ndarray.dll')
+    z.write(r'numpy\NumpyDotNet\bin\Debug\NumpyDotNet.dll',
+            'EGG-INFO/prefix/DLLs/NumpyDotNet.dll')
     z.writestr('numpy/__config__.py', config_txt)
     z.writestr('numpy/version.py', version_txt)
     z.writestr('EGG-INFO/spec/depend', spec_txt)

diff --git a/iron_install.py b/iron_install.py
@@ -48,6 +48,7 @@ def install():
                 shutil.copy(rel_path, dst_file)
             elif fn.endswith('.dll') and fn not in ignore_libs:
                 dst_file = join(dll_dir, fn)
+                print rel_path
                 if isfile(dst_file):
                     # Rename existing file because it is probably in use
                     # by the ipy command.