Fixes to build system.

fperez · fperez · commit 2a174cb3717b · 2008-08-14T19:33:53.000-07:00
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,6 +1,7 @@
 include README_Windows.txt
 include win32_manual_post_install.py
 include ipython.py
+include setupbase.py
 
 graft scripts
 
diff --git a/setup.py b/setup.py
@@ -75,17 +75,17 @@
     to_update = [
                   # FIXME - Disabled for now: we need to redo an automatic way
                   # of generating the magic info inside the rst.                
-                  #('doc/magic.tex',
+                  #('docs/magic.tex',
                   #['IPython/Magic.py'],
                   #"cd doc && ./update_magic.sh" ),
                  
-                 ('doc/ipython.1.gz',
-                  ['doc/ipython.1'],
-                  "cd doc && gzip -9c ipython.1 > ipython.1.gz"),
+                 ('docs/man/ipython.1.gz',
+                  ['docs/man/ipython.1'],
+                  "cd docs/man && gzip -9c ipython.1 > ipython.1.gz"),
 
-                 ('doc/pycolor.1.gz',
-                  ['doc/pycolor.1'],
-                  "cd doc && gzip -9c pycolor.1 > pycolor.1.gz"),
+                 ('docs/man/pycolor.1.gz',
+                  ['docs/man/pycolor.1'],
+                  "cd docs/man && gzip -9c pycolor.1 > pycolor.1.gz"),
                  ]
 
     # Only build the docs is sphinx is present
@@ -101,8 +101,8 @@
         # The do_sphinx scripts builds html and pdf, so just one
         # target is enough to cover all manual generation
         # to_update.append(
-        #     ('doc/manual/ipython.pdf',
-        #     ['IPython/Release.py','doc/source/ipython.rst'],
+        #     ('docs/manual/ipython.pdf',
+        #     ['IPython/Release.py','docs/source/ipython.rst'],
         #     "cd docs && python do_sphinx.py")
         # )
     [ target_update(*t) for t in to_update ]
diff --git a/setupbase.py b/setupbase.py
@@ -158,8 +158,10 @@ def find_data_files():
     exclude     = ('.sh','.1.gz')
     # We need to figure out how we want to package all of our rst docs?
     # docfiles    = filter(lambda f:file_doesnt_endwith(f,exclude),glob('docs/*'))
+    # XXX  - For now all the example files 
     examfiles   = filter(isfile, glob('docs/examples/core/*.py'))
-    examfiles.append(filter(isfile, glob('docs/examples/kernel/*.py')))
+    examfiles  += filter(isfile, glob('docs/examples/kernel/*.py'))
+    
     manpages    = filter(isfile, glob('docs/man/*.1.gz'))
     igridhelpfiles = filter(isfile, glob('IPython/Extensions/igrid_help.*'))
     
@@ -168,9 +170,14 @@ def find_data_files():
                  ('data', manpagebase, manpages),
                  ('data',pjoin(docdirbase, 'extensions'),igridhelpfiles),
                  ]
-    # import pprint
-    # pprint.pprint(data_files)
-    return []
+    
+    ## import pprint  # dbg
+    ## print '*'*80
+    ## print 'data files'
+    ## pprint.pprint(data_files)
+    ## print '*'*80
+    
+    return data_files
 
 #---------------------------------------------------------------------------
 # Find scripts
