Changeset 7759:550728eeff77

Timestamp:

11/08/07 14:37:41 (6 years ago)

Author:

R. L. Miller <rlmillster@…>

Branch:

default

Parents:

7329:31a18043fb4d (diff), 7758:aff79c4f15e7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

local merge

Files:

• setup.py (modified) (1 diff)
• setup.py (modified) (2 diffs)

setup.py

@@ -840 +840 @@
               ['sage/graphs/graph_isom.pyx']
               ), \
-                            
+
     Extension('sage.graphs.bruhat_sn',
               ['sage/graphs/bruhat_sn.pyx']
+              ), \
+
+    Extension('sage.coding.binary_code',
+              ['sage/coding/binary_code.pyx']
               ), \
 

setup.py

@@ -1181 +1181 @@
                      'sage.dsage.misc',
                      'sage.dsage.misc.tests',
-                     'sage.dsage.scripts'
+                     'sage.dsage.web',
+                     'sage.dsage.scripts',
                      ],
       
@@ -1188 +1189 @@
                  'sage/dsage/scripts/dsage_setup.py'
                 ],
+
+      data_files = [('dsage/web/static',                       
+                     ['sage/dsage/web/static/dsage_web.css',
+                      'sage/dsage/web/static/dsage_web.js',
+                      'sage/dsage/web/static/jquery-latest.js',
+                      'sage/dsage/web/static/jquery.tablesorter.pack.js',
+                      'sage/dsage/web/static/index.html'])],
       
       ext_modules = ext_modules,