jdemeyer commented 12 years ago

11073 changes the location of `testcc.sh` and `testcxx.sh` to `spkg/bin`. The following spkgs refer explicitly to `$SAGE_LOCAL/bin/testcc.sh`:

singular (fixed by #12562)
cliquer (also change the path to sage-env in a comment in Makefile.patch)
rubiks
sympow (fixed by #11920)

The following spkgs have testcc.sh included in the spkg:

libm4ri
libm4rie (fixed by #12501)

testcxx.sh is never used.

Changing these spkgs should allow us to stop copying testcc.sh and testcxx.sh from spkg/bin to local/bin in #12631.

New spkgs:

Depends on #11073 Depends on #11920 Depends on #12304 Depends on #12694

Component: packages: standard

Author: John Palmieri

Reviewer: Jeroen Demeyer

Merged: sage-5.0.beta11

Issue created by migration from https://trac.sagemath.org/ticket/12311

jdemeyer commented 12 years ago

Description changed:

--- 
+++ 
@@ -9,3 +9,5 @@
 * libm4rie

 `testcxx.sh` is never used.
+
+Changing these spkgs should allow us to stop copying `testcc.sh` and `testcxx.sh` from `spkg/bin` to `local/bin`.

jdemeyer commented 12 years ago

Dependencies: #11073, #11920

jdemeyer commented 12 years ago

Description changed:

--- 
+++ 
@@ -2,7 +2,7 @@
 * singular
 * cliquer
 * rubiks
-* sympow
+* sympow (fixed by #11920)

 The following spkgs have `testcc.sh` included in the spkg:
 * libm4ri

jdemeyer commented 12 years ago

Description changed:

--- 
+++ 
@@ -1,5 +1,5 @@
 #11073 changes the location of `testcc.sh` and `testcxx.sh` to `spkg/bin`.  The following spkgs refer explicitly to `$SAGE_LOCAL/bin/testcc.sh`:
-* singular
+* singular (should be based on #12304)
 * cliquer
 * rubiks
 * sympow (fixed by #11920)

jdemeyer commented 12 years ago

Changed dependencies from #11073, #11920 to #11073, #11920, #12304

jdemeyer commented 12 years ago

Description changed:

--- 
+++ 
@@ -1,6 +1,6 @@
 #11073 changes the location of `testcc.sh` and `testcxx.sh` to `spkg/bin`.  The following spkgs refer explicitly to `$SAGE_LOCAL/bin/testcc.sh`:
 * singular (should be based on #12304)
-* cliquer
+* cliquer (also change the path to `sage-env` in a comment in `Makefile.patch`)
 * rubiks
 * sympow (fixed by #11920)

jdemeyer commented 12 years ago

Description changed:

--- 
+++ 
@@ -6,7 +6,7 @@

 The following spkgs have `testcc.sh` included in the spkg:
 * libm4ri
-* libm4rie
+* libm4rie (fixed by #12501)

 `testcxx.sh` is never used.

jdemeyer commented 12 years ago

Description changed:

--- 
+++ 
@@ -1,5 +1,5 @@
 #11073 changes the location of `testcc.sh` and `testcxx.sh` to `spkg/bin`.  The following spkgs refer explicitly to `$SAGE_LOCAL/bin/testcc.sh`:
-* singular (should be based on #12304)
+* singular (fixed by #12562)
 * cliquer (also change the path to `sage-env` in a comment in `Makefile.patch`)
 * rubiks
 * sympow (fixed by #11920)

jhpalmieri commented 12 years ago

Author: John Palmieri

jhpalmieri commented 12 years ago

comment:8

Here are spkgs which make the remaining changes. (Since the necessary changes are mostly trivial, I thought we could deal with them all on this ticket.) Is it worth changing dir-0.1-install, since that file is likely to disappear anyway? I'll provide a patch for that, too, in case we want to use it for testing.

jhpalmieri commented 12 years ago

Description changed:

--- 
+++ 
@@ -11,3 +11,14 @@
 `testcxx.sh` is never used.

 Changing these spkgs should allow us to stop copying `testcc.sh` and `testcxx.sh` from `spkg/bin` to `local/bin`.
+
+---
+
+New spkgs:
+
+- [http://boxen.math.washington.edu/home/palmieri/SPKG/cliquer-1.2.p11.spkg](http://boxen.math.washington.edu/home/palmieri/SPKG/cliquer-1.2.p11.spkg)
+- [http://boxen.math.washington.edu/home/palmieri/SPKG/libm4ri-20111004.p1.spkg](http://boxen.math.washington.edu/home/palmieri/SPKG/libm4ri-20111004.p1.spkg)
+- [http://boxen.math.washington.edu/home/palmieri/SPKG/rubiks-20070912.p18.spkg](http://boxen.math.washington.edu/home/palmieri/SPKG/rubiks-20070912.p18.spkg)
+
+Apply [attachment: trac_12311-root.patch](https://github.com/sagemath/sage-prod/files/10654514/trac_12311-root.patch.gz) to the root repository.
+

jhpalmieri commented 12 years ago

Attachment: trac_12311-root.patch.gz

root repo

jhpalmieri commented 12 years ago

patch for cliquer spkg; for review only

jhpalmieri commented 12 years ago

comment:9

Attachment: trac_12311-cliquer.patch.gz

jhpalmieri commented 12 years ago

Description changed:

--- 
+++ 
@@ -17,7 +17,7 @@
 New spkgs:

 - [http://boxen.math.washington.edu/home/palmieri/SPKG/cliquer-1.2.p11.spkg](http://boxen.math.washington.edu/home/palmieri/SPKG/cliquer-1.2.p11.spkg)
-- [http://boxen.math.washington.edu/home/palmieri/SPKG/libm4ri-20111004.p1.spkg](http://boxen.math.washington.edu/home/palmieri/SPKG/libm4ri-20111004.p1.spkg)
+- [http://boxen.math.washington.edu/home/palmieri/SPKG/libm4ri-20111004.p2.spkg](http://boxen.math.washington.edu/home/palmieri/SPKG/libm4ri-20111004.p2.spkg)
 - [http://boxen.math.washington.edu/home/palmieri/SPKG/rubiks-20070912.p18.spkg](http://boxen.math.washington.edu/home/palmieri/SPKG/rubiks-20070912.p18.spkg)

 Apply [attachment: trac_12311-root.patch](https://github.com/sagemath/sage-prod/files/10654514/trac_12311-root.patch.gz) to the root repository.

jhpalmieri commented 12 years ago

Attachment: trac_12311-libm4ri.patch.gz

patch for libm4ri spkg; for review only

jhpalmieri commented 12 years ago

Changed dependencies from #11073, #11920, #12304 to #11073, #11920, #12304, #12694

jdemeyer commented 12 years ago

comment:11

in SPKG.txt,

=== rubiks-20070912.p17 (John Palmieri, 23 March 2012) ===

should be

=== rubiks-20070912.p18 (John Palmieri, 23 March 2012) ===

jhpalmieri commented 12 years ago

patch for rubiks spkg; for review only

jhpalmieri commented 12 years ago

comment:12

Attachment: trac_12311-rubiks.patch.gz

Oops, sorry, fixed.

jdemeyer commented 12 years ago

Description changed:

--- 
+++ 
@@ -10,7 +10,7 @@

 `testcxx.sh` is never used.

-Changing these spkgs should allow us to stop copying `testcc.sh` and `testcxx.sh` from `spkg/bin` to `local/bin`.
+Changing these spkgs should allow us to stop copying `testcc.sh` and `testcxx.sh` from `spkg/bin` to `local/bin` in #12631.

 ---

@@ -19,6 +19,3 @@
 - [http://boxen.math.washington.edu/home/palmieri/SPKG/cliquer-1.2.p11.spkg](http://boxen.math.washington.edu/home/palmieri/SPKG/cliquer-1.2.p11.spkg)
 - [http://boxen.math.washington.edu/home/palmieri/SPKG/libm4ri-20111004.p2.spkg](http://boxen.math.washington.edu/home/palmieri/SPKG/libm4ri-20111004.p2.spkg)
 - [http://boxen.math.washington.edu/home/palmieri/SPKG/rubiks-20070912.p18.spkg](http://boxen.math.washington.edu/home/palmieri/SPKG/rubiks-20070912.p18.spkg)
-
-Apply [attachment: trac_12311-root.patch](https://github.com/sagemath/sage-prod/files/10654514/trac_12311-root.patch.gz) to the root repository.
-

jdemeyer commented 12 years ago

Reviewer: Jeroen Demeyer

jdemeyer commented 12 years ago

comment:13

Looks good to me, thanks!

I propose not to apply the SAGE_ROOT patch and leave that to #12631.

jhpalmieri commented 12 years ago

comment:14

Replying to @jdemeyer:

Looks good to me, thanks!

I propose not to apply the SAGE_ROOT patch and leave that to #12631.

That's fine with me.

jdemeyer commented 12 years ago

Merged: sage-5.0.beta11

sagemath / sage

In spkgs, run testcc.sh and testcxx.sh without explicit path #12311

11073 changes the location of `testcc.sh` and `testcxx.sh` to `spkg/bin`. The following spkgs refer explicitly to `$SAGE_LOCAL/bin/testcc.sh`:

sagemath / sage

In spkgs, run testcc.sh and testcxx.sh without explicit path #12311

11073 changes the location of testcc.sh and testcxx.sh to spkg/bin. The following spkgs refer explicitly to $SAGE_LOCAL/bin/testcc.sh:

11073 changes the location of `testcc.sh` and `testcxx.sh` to `spkg/bin`. The following spkgs refer explicitly to `$SAGE_LOCAL/bin/testcc.sh`: