towards a successful build

sagemath · Jun 16, 2014 · 145ebed · 145ebed
1 parent 1f0eeeb
commit 145ebed
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/build/manager/sage_pkg/package/base.py b/build/manager/sage_pkg/package/base.py
@@ -402,7 +402,7 @@ def build_tasks(self, dependencies, stop_at='install'):
         tasklist.append(prev)
         if stop_at == 'compile':
             return tasklist
-        if self.want_check():
+        if self.want_check() or (stop_at == 'check'):
             test = [prev] + [dependencies[dep] for dep in self.get_test_dependencies()]
             task_check     = prev = Task(self.check,     test,   name='{0}:check'    .format(self.name))
             tasklist.append(prev)

diff --git a/build/manager/sage_pkg/upgrade_v1.py b/build/manager/sage_pkg/upgrade_v1.py
@@ -39,6 +39,7 @@
 
 
 DEPENDENCIES = {
+    'conway_polynomials': [],
     'sqlite': ['readline', ],
     'bzip2': ['pkgconf'],
     'patch': ['bzip2'],
@@ -123,7 +124,7 @@
     'ecl': ['mpir', 'readline', 'boehm_gc'],
     'maxima': ['ecl'],
     'r': ['atlas', 'iconv', 'readline', 'pkgconf'],
-    'rpy': ['python', 'r'],
+    'rpy2': ['python', 'r'],
     'sympy': ['python'],
     'cython': ['python'],
     'flintqs': ['mpir'],

diff --git a/build/pkgs/conway_polynomials/package.yaml b/build/pkgs/conway_polynomials/package.yaml
@@ -2,7 +2,7 @@ name:
     conway_polynomials
 
 category:
-    optional
+    standard
 
 source:
     version:  
@@ -15,3 +15,6 @@ builder:
     type:            SpkgInstallScript
     install_script:  spkg-install
 
+
+depends:
+    hard:
diff --git a/build/pkgs/graphs/spkg-install b/build/pkgs/graphs/spkg-install
@@ -2,5 +2,5 @@
 
 rm -rf "$SAGE_SHARE"/graphs
 
-mkdir -p "$SAGE_SHARE"
-mv src "$SAGE_SHARE"/graphs
+mkdir -p "$SAGE_SHARE"/graphs
+cp -r -f src/* "$SAGE_SHARE"/graphs
diff --git a/build/pkgs/pari/spkg-install b/build/pkgs/pari/spkg-install
@@ -209,7 +209,8 @@ install()
     fi
 
     # Copy gprc.expect to $SAGE_LOCAL/etc
-    cp -f "$TOP/gprc.expect" "$SAGE_LOCAL/etc"
+    mkdir -p "$SAGE_LOCAL/etc"
+    cp -f "$TOP/gprc.expect" "$SAGE_LOCAL/etc/"
     if [ $? -ne 0 ]; then
         echo >&2 "Error installing gprc.expect"
         exit 1

diff --git a/build/pkgs/rpy2/package.yaml b/build/pkgs/rpy2/package.yaml
@@ -2,7 +2,7 @@ name:
     rpy2
 
 category:
-    optional
+    standard
 
 source:
     version:  
@@ -15,3 +15,8 @@ builder:
     type:            SpkgInstallScript
     install_script:  spkg-install
 
+
+depends:
+    hard:
+        - python
+        - r