# HG changeset patch
# User J. H. Palmieri <palmieri@math.washington.edu>
# Date 1285380804 25200
# Node ID 26bffb659098f4048078f7808469005a92c7717d
# Parent 11e9ea4d3738bd7f14ddf9b8a334dee856b55738
#9433: put more files under revision control
diff -r 11e9ea4d3738 -r 26bffb659098 sage-bdist
a
|
b
|
PKGDIR=spkg |
17 | 17 | |
18 | 18 | CUR=`pwd` |
19 | 19 | |
20 | | OPT="pPR" |
| 20 | CP_OPT="-pPR" |
21 | 21 | |
22 | 22 | if [ $# -ne 2 ]; then |
23 | 23 | echo "Usage: $0 <SAGE_VERSION> <SAGE_ROOT>" |
… |
… |
SAGE_VERSION=$1 |
28 | 28 | SAGE_ROOT=$2 |
29 | 29 | export SAGE_VERSION SAGE_ROOT |
30 | 30 | |
31 | | TARGET=sage-"$SAGE_VERSION"-`uname -m`-`uname` |
| 31 | TARGET=sage-$SAGE_VERSION-`uname -m`-`uname` |
32 | 32 | TARGET=`echo $TARGET | sed -e 's/ //'` #no blank spaces |
33 | | TMP="$CUR/tmp/$TARGET" |
| 33 | TMP=$CUR/tmp/$TARGET |
34 | 34 | |
35 | | if [ ! -d "$CUR/tmp" ]; then |
36 | | mkdir "$CUR/tmp" |
| 35 | mkdir -p "$CUR/tmp" |
| 36 | |
| 37 | rm -rf "$TMP" |
| 38 | mkdir "$TMP" |
| 39 | |
| 40 | # copy sage root repo over: |
| 41 | cd "$SAGE_ROOT" |
| 42 | |
| 43 | echo "Copying root repository..." |
| 44 | "$SAGE_ROOT"/sage --hg clone --pull . "$TMP" |
| 45 | |
| 46 | if [ $? -ne 0 ]; then |
| 47 | echo "Error copying Sage root repository." |
| 48 | exit 1 |
37 | 49 | fi |
38 | 50 | |
39 | | if [ -d "$TMP" ]; then |
40 | | rm -rf "$TMP" |
41 | | fi |
42 | | |
43 | | mkdir "$TMP" |
| 51 | rm "$TMP"/.hg/hgrc |
| 52 | echo "Done copying root repository." |
44 | 53 | |
45 | 54 | cd "$SAGE_ROOT" |
46 | 55 | |
47 | 56 | echo "Copying files over to tmp directory" |
48 | | cp -$OPT examples local makefile *.txt *.sage sage ipython data "$TMP"/ |
| 57 | cp $CP_OPT examples local data "$TMP"/ |
49 | 58 | |
50 | 59 | if [ -d devel/sage-main ]; then |
51 | 60 | echo "Copying Sage library over" |
52 | 61 | mkdir "$TMP"/devel/ |
53 | | cp -L$OPT devel/sage-main "$TMP"/devel/sage-main |
54 | | cd $TMP/devel |
| 62 | cp -L $CP_OPT devel/sage-main "$TMP"/devel/sage-main |
| 63 | cd "$TMP"/devel |
55 | 64 | ln -s sage-main sage |
56 | 65 | cd sage |
57 | 66 | # Delete cython hash, so that "sage -br" works the first time. |
… |
… |
fi |
63 | 72 | |
64 | 73 | cd "$SAGE_ROOT" |
65 | 74 | |
66 | | if [ -d $PKGDIR ]; then |
| 75 | if [ -d "$PKGDIR" ]; then |
67 | 76 | echo "Making empty spkg's" |
68 | | cd $PKGDIR |
69 | | mkdir $TMP/$PKGDIR |
70 | | mkdir $TMP/$PKGDIR/build |
71 | | mkdir $TMP/$PKGDIR/optional |
72 | | cp -$OPT installed $TMP/$PKGDIR/ |
73 | | cp -$OPT standard $TMP/$PKGDIR/ |
74 | | cp install README.txt gen_html $TMP/$PKGDIR/ |
75 | | cd $TMP/$PKGDIR/standard/ |
| 77 | cd "$PKGDIR" |
| 78 | mkdir "$TMP/$PKGDIR"/build |
| 79 | mkdir "$TMP/$PKGDIR"/optional |
| 80 | cp $CP_OPT installed "$TMP/$PKGDIR/" |
| 81 | cp $CP_OPT standard "$TMP/$PKGDIR/" |
| 82 | cd "$TMP/$PKGDIR"/standard/ |
76 | 83 | for F in `/bin/ls *.spkg`; do |
77 | | echo "Placeholder spkg file so this binary version of Sage knows this package version used when installing Sage." > $F |
| 84 | echo "Placeholder spkg file so this binary version of Sage knows this package version used when installing Sage." > "$F" |
78 | 85 | done |
79 | 86 | fi |
80 | 87 | |
… |
… |
if [ "$UNAME" = "Darwin" ]; then |
83 | 90 | cd "$TARGET" |
84 | 91 | mkdir x |
85 | 92 | echo "There will be an error about x below that you can safely ignore." |
86 | | mv * x |
| 93 | mv * .hg* x |
87 | 94 | mv x sage |
88 | 95 | cp sage/local/bin/sage-README-osx.txt README.txt |
89 | 96 | |
90 | 97 | if [ "$SAGE_APP_BUNDLE" = "yes" ]; then |
91 | 98 | echo 'Copying Sage.app' |
92 | | cp -L$OPT "$SAGE_ROOT/data/extcode/sage/ext/mac-app/Sage.app" ./Sage.app |
| 99 | cp -L $CP_OPT "$SAGE_ROOT/data/extcode/sage/ext/mac-app/Sage.app" ./Sage.app |
93 | 100 | sed -i '' "s/SAGE_VERSION/$SAGE_VERSION/" \ |
94 | 101 | ./Sage.app/Contents/Info.plist \ |
95 | 102 | ./Sage.app/Contents/Resources/English.lproj/InfoPlist.strings |
… |
… |
if [ "$UNAME" = "Darwin" ]; then |
108 | 115 | if [ "$SAGE_APP_DMG" != "no" ]; then |
109 | 116 | echo "Creating dmg" |
110 | 117 | echo "(If you don't wish to create a disk image please set SAGE_APP_DMG=no)" |
111 | | DYLD_LIBRARY_PATH=$SAGE_ORIG_DYLD_LIBRARY_PATH; export DYLD_LIBRARY_PATH |
| 118 | DYLD_LIBRARY_PATH="$SAGE_ORIG_DYLD_LIBRARY_PATH"; export DYLD_LIBRARY_PATH |
112 | 119 | hdiutil create -srcfolder "$TARGET" -format UDBZ "$TARGET".dmg |
113 | 120 | else |
114 | 121 | echo 'If you wish to create a disk image please set' |
… |
… |
else |
123 | 130 | tar zcvf "$TARGET".tar.gz "$TARGET" |
124 | 131 | fi |
125 | 132 | |
126 | | if [ ! -d $SAGE_ROOT/dist ]; then |
127 | | mkdir $SAGE_ROOT/dist |
128 | | fi |
| 133 | mkdir -p "$SAGE_ROOT"/dist |
129 | 134 | |
130 | | if [ -d $SAGE_ROOT/dist/$TARGET ]; then |
131 | | rm -rf "$SAGE_ROOT/dist/$TARGET" |
132 | | fi |
| 135 | rm -rf "$SAGE_ROOT/dist/$TARGET" |
133 | 136 | |
134 | 137 | echo "Moving final distribution file to $SAGE_ROOT/dist" |
135 | 138 | |
136 | | mv $TARGET $SAGE_ROOT/dist/ |
137 | | mv $TARGET.* $SAGE_ROOT/dist/ |
| 139 | mv "$TARGET" "$SAGE_ROOT"/dist/ |
| 140 | mv "$TARGET".* "$SAGE_ROOT"/dist/ |
diff -r 11e9ea4d3738 -r 26bffb659098 sage-make_devel_packages
a
|
b
|
fi |
14 | 14 | |
15 | 15 | SAGE_VERSION=$1 |
16 | 16 | SAGE_ROOT=$2 |
17 | | SPKG_INST=$SAGE_ROOT/spkg/installed/ |
| 17 | SPKG_INST="$SAGE_ROOT"/spkg/installed/ |
18 | 18 | export SAGE_ROOT SAGE_VERSION |
19 | | TARGET="sage-"$1 |
| 19 | TARGET=sage-$1 |
20 | 20 | |
21 | 21 | # REMOVE OLD PACKAGES |
22 | 22 | cd "$SAGE_ROOT"/spkg/standard/ |
… |
… |
rm examples-*.spkg |
25 | 25 | rm extcode-*.spkg |
26 | 26 | rm sage-*.spkg |
27 | 27 | rm sage_scripts-*.spkg |
| 28 | rm sage_root-*.spkg |
28 | 29 | |
29 | 30 | if [ $# -eq 2 ]; then |
30 | 31 | DESTINATION="$SAGE_ROOT"/spkg/standard/ |
… |
… |
else |
32 | 33 | DESTINATION=$3 |
33 | 34 | fi |
34 | 35 | |
35 | | if [ ! -d $DESTINATION ]; then |
36 | | mkdir $DESTINATION |
| 36 | if [ ! -d "$DESTINATION" ]; then |
| 37 | mkdir "$DESTINATION" |
37 | 38 | fi |
38 | 39 | |
39 | 40 | cd "$DESTINATION" |
40 | 41 | DESTINATION=`pwd` |
41 | | PKG=$DESTINATION |
| 42 | PKG="$DESTINATION" |
42 | 43 | |
43 | 44 | # NEW SAGE SOURCE PACKAGE |
44 | | if [ -d $SAGE_ROOT/devel/sage-main ]; then |
45 | | cd $SAGE_ROOT/devel/sage-main |
| 45 | if [ -d "$SAGE_ROOT"/devel/sage-main ]; then |
| 46 | cd "$SAGE_ROOT"/devel/sage-main |
46 | 47 | hg diff |
47 | 48 | hg status |
48 | 49 | hg tag "$SAGE_VERSION" |
49 | 50 | hg commit -m "$SAGE_VERSION" |
50 | 51 | #./sage-push |
51 | 52 | chmod +x spkg-dist |
52 | | ./spkg-dist $SAGE_VERSION $SAGE_ROOT |
| 53 | ./spkg-dist "$SAGE_VERSION" "$SAGE_ROOT" |
53 | 54 | if [ $? -ne 0 ]; then |
54 | | echo "Error building the sage source code package" |
| 55 | echo "Error building the Sage source code package" |
55 | 56 | exit 1 |
56 | 57 | fi |
57 | | mv dist/sage-$SAGE_VERSION.spkg $DESTINATION/ |
58 | | touch $SPKG_INST/sage-$SAGE_VERSION |
| 58 | mv dist/sage-"$SAGE_VERSION".spkg "$DESTINATION"/ |
| 59 | touch "$SPKG_INST"/sage-"$SAGE_VERSION" |
59 | 60 | fi |
60 | 61 | |
61 | | if [ ! -f $PKG/sage-$SAGE_VERSION.spkg ]; then |
| 62 | if [ ! -f "$PKG"/sage-"$SAGE_VERSION".spkg ]; then |
62 | 63 | echo "The package sage-$SAGE_VERSION.spkg wasn't created." |
63 | 64 | exit 1 |
64 | 65 | fi |
65 | 66 | |
66 | 67 | # NEW SAGE EXTERNAL CODE PACKAGE |
67 | | if [ -d $SAGE_ROOT/data/extcode ]; then |
68 | | cd $SAGE_ROOT/data/extcode |
| 68 | if [ -d "$SAGE_ROOT"/data/extcode ]; then |
| 69 | cd "$SAGE_ROOT"/data/extcode |
69 | 70 | hg diff |
70 | 71 | hg status |
71 | 72 | hg tag "$SAGE_VERSION" |
… |
… |
if [ -d $SAGE_ROOT/data/extcode ]; then |
73 | 74 | |
74 | 75 | #./sage-push |
75 | 76 | chmod +x spkg-dist |
76 | | ./spkg-dist $SAGE_VERSION $SAGE_ROOT |
| 77 | ./spkg-dist "$SAGE_VERSION" "$SAGE_ROOT" |
77 | 78 | if [ $? -ne 0 ]; then |
78 | 79 | echo "Error building the extcode package" |
79 | 80 | exit 1 |
80 | 81 | fi |
81 | | mv extcode-$SAGE_VERSION.spkg $DESTINATION/ |
82 | | touch $SPKG_INST/extcode-$SAGE_VERSION |
| 82 | mv extcode-"$SAGE_VERSION".spkg "$DESTINATION"/ |
| 83 | touch "$SPKG_INST"/extcode-"$SAGE_VERSION" |
83 | 84 | fi |
84 | 85 | |
85 | 86 | |
86 | | if [ ! -f $PKG/extcode-$SAGE_VERSION.spkg ]; then |
| 87 | if [ ! -f "$PKG"/extcode-"$SAGE_VERSION".spkg ]; then |
87 | 88 | echo "The package extcode-$SAGE_VERSION.spkg wasn't created." |
88 | 89 | exit 1 |
89 | 90 | fi |
90 | 91 | |
91 | 92 | # NEW SAGE EXAMPLE CODE PACKAGE |
92 | | if [ -d $SAGE_ROOT/examples ]; then |
93 | | cd $SAGE_ROOT/examples |
| 93 | if [ -d "$SAGE_ROOT"/examples ]; then |
| 94 | cd "$SAGE_ROOT"/examples |
94 | 95 | hg diff |
95 | 96 | hg status |
96 | 97 | hg tag "$SAGE_VERSION" |
97 | 98 | hg commit -m "$SAGE_VERSION" |
98 | 99 | #./sage-push |
99 | 100 | cd .. |
100 | | rm -rf examples-$SAGE_VERSION |
101 | | cp -r examples examples-$SAGE_VERSION |
102 | | "$SAGE_ROOT"/sage -pkg examples-$SAGE_VERSION |
| 101 | rm -rf examples-"$SAGE_VERSION" |
| 102 | cp -r examples examples-"$SAGE_VERSION" |
| 103 | "$SAGE_ROOT"/sage -pkg examples-"$SAGE_VERSION" |
103 | 104 | if [ $? -ne 0 ]; then |
104 | 105 | echo "Error building examples package" |
105 | 106 | exit 1 |
106 | 107 | fi |
107 | | mv examples-$SAGE_VERSION.spkg $DESTINATION/ |
108 | | rm -rf examples-$SAGE_VERSION |
109 | | touch $SPKG_INST/examples-$SAGE_VERSION |
| 108 | mv examples-"$SAGE_VERSION".spkg "$DESTINATION"/ |
| 109 | rm -rf examples-"$SAGE_VERSION" |
| 110 | touch "$SPKG_INST"/examples-"$SAGE_VERSION" |
110 | 111 | fi |
111 | 112 | |
112 | | if [ ! -f $PKG/examples-$SAGE_VERSION.spkg ]; then |
| 113 | if [ ! -f "$PKG"/examples-"$SAGE_VERSION".spkg ]; then |
113 | 114 | echo "The package examples-$SAGE_VERSION.spkg wasn't created." |
114 | 115 | exit 1 |
115 | 116 | fi |
… |
… |
fi |
119 | 120 | |
120 | 121 | |
121 | 122 | # NEW SAGE SCRIPTS PACKAGE |
122 | | SCRIPTS=sage_scripts-$SAGE_VERSION |
123 | | cd $SAGE_ROOT/local/bin/ |
| 123 | SCRIPTS=sage_scripts-"$SAGE_VERSION" |
| 124 | cd "$SAGE_ROOT"/local/bin/ |
124 | 125 | |
125 | 126 | #./sage-push |
126 | 127 | hg diff |
… |
… |
if [ $? -ne 0 ]; then |
133 | 134 | exit 1 |
134 | 135 | fi |
135 | 136 | |
136 | | rm -rf $SCRIPTS |
137 | | mkdir $SCRIPTS |
| 137 | rm -rf "$SCRIPTS" |
| 138 | mkdir "$SCRIPTS" |
138 | 139 | chmod +x sage-* |
139 | 140 | chmod -x sage-README-osx.txt sage-banner sage-gdb-commands |
140 | 141 | chmod -x sage-maxima.lisp sage-verify-pyc |
141 | 142 | rm sage-*~ |
142 | 143 | |
143 | | cp -pr sage-* .hg* ipy_profile_sage.py $SCRIPTS/ |
144 | | cp -p $SAGE_ROOT/sage-python $SCRIPTS/ |
145 | | cp -p $SAGE_ROOT/*.txt $SCRIPTS/ |
146 | | cp -pr $SAGE_ROOT/ipython $SCRIPTS/ |
147 | | cp -p $SAGE_ROOT/spkg/install $SCRIPTS/ |
148 | | cp -p $SAGE_ROOT/local/bin/sage-spkg-install $SCRIPTS/spkg-install |
149 | | cp -p $SAGE_ROOT/local/bin/SbuildHack.pm $SCRIPTS/ |
150 | | cp -p $SAGE_ROOT/local/bin/ncadoctest.py $SCRIPTS/ |
151 | | cp -p $SAGE_ROOT/local/bin/sagedoctest.py $SCRIPTS/ |
| 144 | cp -pr sage-* .hg* ipy_profile_sage.py "$SCRIPTS"/ |
| 145 | cp -p "$SAGE_ROOT"/local/bin/sage-spkg-install "$SCRIPTS"/spkg-install |
| 146 | cp -p "$SAGE_ROOT"/local/bin/SbuildHack.pm "$SCRIPTS"/ |
| 147 | cp -p "$SAGE_ROOT"/local/bin/ncadoctest.py "$SCRIPTS"/ |
| 148 | cp -p "$SAGE_ROOT"/local/bin/sagedoctest.py "$SCRIPTS"/ |
152 | 149 | |
153 | | chmod +x $SCRIPTS/spkg-install |
154 | | tar -jcf $SCRIPTS.spkg $SCRIPTS |
155 | | mv $SCRIPTS.spkg $DESTINATION/ |
156 | | rm -rf $SCRIPTS |
157 | | touch $SPKG_INST/sage_scripts-$SAGE_VERSION |
| 150 | chmod +x "$SCRIPTS"/spkg-install |
| 151 | tar -jcf "$SCRIPTS".spkg "$SCRIPTS" |
| 152 | mv "$SCRIPTS".spkg "$DESTINATION"/ |
| 153 | rm -rf "$SCRIPTS" |
| 154 | touch "$SPKG_INST"/sage_scripts-"$SAGE_VERSION" |
158 | 155 | |
159 | | if [ ! -f $PKG/sage_scripts-$SAGE_VERSION.spkg ]; then |
| 156 | if [ ! -f "$PKG/sage_scripts-$SAGE_VERSION.spkg" ]; then |
160 | 157 | echo "The package sage_scripts-$SAGE_VERSION.spkg wasn't created." |
161 | 158 | exit 1 |
162 | 159 | fi |
| 160 | |
| 161 | ################################# |
| 162 | |
| 163 | # SAGE ROOT PACKAGE: sage-sdist already tags and commits the repo, so |
| 164 | # we just need to build the spkg file. |
| 165 | |
| 166 | ROOT_REPO=sage_root-"$SAGE_VERSION" |
| 167 | cd "$SAGE_ROOT" |
| 168 | |
| 169 | rm -rf "$ROOT_REPO" |
| 170 | mkdir "$ROOT_REPO" |
| 171 | cd "$ROOT_REPO" |
| 172 | |
| 173 | echo "Copying root repository..." |
| 174 | "$SAGE_ROOT"/sage --hg clone --pull "$SAGE_ROOT" . |
| 175 | |
| 176 | if [ $? -ne 0 ]; then |
| 177 | echo "Error copying Sage root repository." |
| 178 | exit 1 |
| 179 | fi |
| 180 | |
| 181 | rm .hg/hgrc |
| 182 | cd "$SAGE_ROOT" |
| 183 | |
| 184 | cp -p "$SAGE_ROOT"/spkg/root-spkg-install "$ROOT_REPO"/spkg-install |
| 185 | chmod +x "$ROOT_REPO"/spkg-install |
| 186 | |
| 187 | echo "Done copying root repository." |
| 188 | |
| 189 | tar -jcf "$ROOT_REPO".spkg "$ROOT_REPO" |
| 190 | mv "$ROOT_REPO".spkg "$DESTINATION"/ |
| 191 | rm -rf "$ROOT_REPO" |
| 192 | touch "$SPKG_INST/$ROOT_REPO" |
| 193 | |
| 194 | if [ ! -f "$PKG/$ROOT_REPO".spkg ]; then |
| 195 | echo "The package $ROOT_REPO.spkg wasn't created." |
| 196 | exit 1 |
| 197 | fi |
diff -r 11e9ea4d3738 -r 26bffb659098 sage-sdist
a
|
b
|
SAGE_VERSION=$1 |
16 | 16 | SAGE_ROOT=$2 |
17 | 17 | LD_LIBRARY_PATH="$SAGE_ROOT/local/lib:$LD_LIBRARY_PATH" && export LD_LIBRARY_PATH |
18 | 18 | export SAGE_ROOT SAGE_VERSION |
19 | | TARGET="sage-"$1 |
| 19 | TARGET="sage-$1" |
20 | 20 | |
21 | 21 | CUR=`pwd` |
22 | 22 | |
23 | 23 | |
24 | 24 | # UPDATE SAGE VERSION FILE: this is done here so |
25 | 25 | # the banner produced below this if block is correct. |
26 | | if [ -d $SAGE_ROOT/devel/sage/sage ]; then |
27 | | cd $SAGE_ROOT/devel/sage/sage |
| 26 | if [ -d "$SAGE_ROOT"/devel/sage/sage ]; then |
| 27 | cd "$SAGE_ROOT"/devel/sage/sage |
28 | 28 | echo '"""nodoctests"""' > version.py |
29 | 29 | echo "version='"$SAGE_VERSION"'; date='`date '+%Y-%m-%d'`'" >> version.py |
30 | | cd $SAGE_ROOT/devel/sage |
| 30 | cd "$SAGE_ROOT"/devel/sage |
31 | 31 | python setup.py install |
32 | 32 | fi |
33 | 33 | |
34 | | cd $SAGE_ROOT/local/bin/ |
| 34 | cd "$SAGE_ROOT"/local/bin/ |
35 | 35 | echo "import sage.misc.banner; sage.misc.banner.banner()" | ./python > sage-banner |
36 | 36 | |
37 | 37 | cd "$CUR" |
38 | 38 | |
39 | | cp $SAGE_ROOT/local/bin/sage-spkg $PKGDIR/base/ |
40 | | cp $SAGE_ROOT/local/bin/sage-env $PKGDIR/base/ |
41 | | cp $SAGE_ROOT/local/bin/sage-make_relative $PKGDIR/base/ |
| 39 | cp "$SAGE_ROOT"/local/bin/sage-spkg "$PKGDIR"/base/ |
| 40 | cp "$SAGE_ROOT"/local/bin/sage-env "$PKGDIR"/base/ |
| 41 | cp "$SAGE_ROOT"/local/bin/sage-make_relative "$PKGDIR"/base/ |
42 | 42 | |
43 | 43 | TMP="/tmp/$TARGET" |
44 | 44 | |
45 | | if [ -d $TMP ]; then |
46 | | rm -rf "$TMP" |
| 45 | rm -rf "$TMP" |
| 46 | mkdir "$TMP" |
| 47 | |
| 48 | # copy sage root repo over. Cloning needs to be done in an empty |
| 49 | # directory, so we do this now. The other sage repositories are dealt |
| 50 | # with later. |
| 51 | cd "$SAGE_ROOT" |
| 52 | |
| 53 | hg diff |
| 54 | hg status |
| 55 | hg tag "$SAGE_VERSION" |
| 56 | hg commit -m "$SAGE_VERSION" |
| 57 | |
| 58 | echo "Copying root repository..." |
| 59 | "$SAGE_ROOT"/sage --hg clone --pull . "$TMP" |
| 60 | |
| 61 | if [ $? -ne 0 ]; then |
| 62 | echo "Error copying Sage root repository." |
| 63 | exit 1 |
47 | 64 | fi |
48 | 65 | |
49 | | mkdir $TMP |
| 66 | rm "$TMP"/.hg/hgrc |
| 67 | echo "Done copying root repository." |
50 | 68 | |
51 | | cd $SAGE_ROOT |
52 | | cp -LRp makefile *.txt *.sage sage ipythonrc $TMP/ |
53 | 69 | STD=standard |
54 | | mkdir $TMP/$PKGDIR |
55 | | mkdir $TMP/$PKGDIR/$STD |
56 | | cp -p $PKGDIR/$STD/deps $TMP/$PKGDIR/$STD/ |
57 | | cp -p $PKGDIR/$STD/libdist_filelist $TMP/$PKGDIR/$STD/ |
58 | | cp -p $PKGDIR/$STD/newest_version $TMP/$PKGDIR/$STD/ |
59 | | cp -pr $PKGDIR/base $TMP/$PKGDIR/ |
60 | | cp -p $PKGDIR/install $TMP/$PKGDIR/ |
61 | | cp -p $PKGDIR/pipestatus $TMP/$PKGDIR/ |
62 | | cp -p $PKGDIR/update $TMP/$PKGDIR/ |
63 | | cp -p $PKGDIR/gen_html $TMP/$PKGDIR/ |
64 | | cp -p $PKGDIR/README.txt $TMP/$PKGDIR/ |
| 70 | cp -pr "$PKGDIR"/base "$TMP/$PKGDIR/" |
65 | 71 | |
66 | | $SAGE_ROOT/local/bin/sage-make_devel_packages $SAGE_VERSION $SAGE_ROOT $TMP/devel |
| 72 | "$SAGE_ROOT"/local/bin/sage-make_devel_packages "$SAGE_VERSION" "$SAGE_ROOT" "$TMP"/devel |
67 | 73 | |
68 | 74 | if [ $? -ne 0 ]; then |
69 | 75 | echo "Error building the Sage packages." |
70 | 76 | exit 1 |
71 | 77 | fi |
72 | 78 | |
73 | | cp $TMP/devel/*.spkg $SAGE_ROOT/$PKGDIR/$STD/ |
| 79 | cp "$TMP"/devel/*.spkg "$SAGE_ROOT/$PKGDIR/$STD/" |
74 | 80 | |
75 | | cp -p $PKGDIR/$STD/*.spkg $TMP/$PKGDIR/$STD/ |
76 | | cp -p $PKGDIR/$STD/*.txt $TMP/$PKGDIR/$STD/ |
| 81 | cp -p "$PKGDIR/$STD"/*.spkg "$TMP/$PKGDIR/$STD/" |
77 | 82 | |
78 | | cd $TMP/$PKGDIR/$STD |
| 83 | cd "$TMP/$PKGDIR/$STD" |
79 | 84 | rm -rf doc-* sage-* extcode-* sage_scripts-* examples-* |
80 | | mv $TMP/devel/*.spkg . |
81 | | rmdir $TMP/devel |
| 85 | mv "$TMP"/devel/*.spkg . |
| 86 | rmdir "$TMP"/devel |
82 | 87 | |
83 | 88 | cd /tmp |
84 | | tar cf $TARGET.tar $TARGET |
| 89 | tar cf "$TARGET".tar "$TARGET" |
85 | 90 | |
86 | | if [ ! -d $SAGE_ROOT/dist ]; then |
87 | | mkdir $SAGE_ROOT/dist |
88 | | fi |
| 91 | mkdir -p "$SAGE_ROOT"/dist |
89 | 92 | |
90 | | if [ -d $SAGE_ROOT/dist/$TARGET ]; then |
91 | | rm -rf "$SAGE_ROOT/dist/$TARGET" |
92 | | fi |
| 93 | rm -rf "$SAGE_ROOT/dist/$TARGET" |
93 | 94 | |
94 | | mv $TARGET $SAGE_ROOT/dist/ |
95 | | mv $TARGET.tar $SAGE_ROOT/dist/ |
| 95 | mv "$TARGET" "$SAGE_ROOT"/dist/ |
| 96 | mv "$TARGET".tar "$SAGE_ROOT"/dist/ |
diff -r 11e9ea4d3738 -r 26bffb659098 sage-spkg-install
a
|
b
|
|
2 | 2 | |
3 | 3 | CUR=`pwd` |
4 | 4 | |
5 | | TARGET="$SAGE_ROOT"/local/bin/ |
| 5 | TARGET=$SAGE_ROOT/local/bin/ |
6 | 6 | |
7 | 7 | if [ -d "$TARGET"/.hg ]; then |
8 | 8 | |
… |
… |
fi |
25 | 25 | # Finally, make sure some symbolic links exist. |
26 | 26 | cd "$CUR" |
27 | 27 | |
28 | | # These are not part of the scripts repo and are |
29 | | # not under revision control, so they get wacked (at least |
30 | | # we do save the last versions in tmp, just in case). |
31 | | TMP="$SAGE_ROOT"/tmp/ |
32 | | if [ ! -d "$TMP" ]; then |
33 | | mkdir "$TMP" |
34 | | fi |
35 | | cp "$SAGE_ROOT"/sage-python "$TMP"/ |
36 | | cp sage-python "$SAGE_ROOT"/ |
37 | | |
38 | | cp "$SAGE_ROOT"/spkg/install "$TMP"/ |
39 | | cp install "$SAGE_ROOT"/spkg/ |
40 | | |
41 | | cp "$SAGE_ROOT"/*.txt "$TMP"/ |
42 | | cp *.txt "$SAGE_ROOT"/ |
43 | | |
44 | | rm -rf "$TMP"/ipython |
45 | | cp -r "$SAGE_ROOT"/ipython "$TMP"/ |
46 | | cp -r ipython "$SAGE_ROOT/" |
47 | | |
48 | 28 | # I think these below should moved to the relevant spkg's. |
49 | 29 | # -- William Stein (2007-10-04) |
50 | 30 | cd "$TARGET" |
51 | 31 | ln -sf python sage.bin |
52 | 32 | ln -sf Singular sage_singular |
53 | 33 | ln -sf gp sage_pari |
54 | | |
diff -r 11e9ea4d3738 -r 26bffb659098 sage-update
a
|
b
|
def do_update(): |
307 | 307 | for P in to_download: |
308 | 308 | download_file("standard/%s" % P) |
309 | 309 | |
310 | | # Download these since the build system requires them to be |
311 | | # updated or we can't build correctly. |
312 | | os.chdir(SPKG_ROOT) |
313 | | download_file("install") |
314 | | os.system('chmod +x install') |
315 | | os.chdir("%s/standard/" % SPKG_ROOT) |
316 | | download_file("standard/deps") |
317 | | download_file("standard/newest_version") |
318 | | os.system('chmod +x newest_version') |
319 | | |
320 | 310 | |
321 | 311 | if __name__ == '__main__': |
322 | 312 | # Make sure the SAGE_ROOT variable is set. This should always be |
diff -r 11e9ea4d3738 -r 26bffb659098 sage-upgrade
a
|
b
|
if [ $ERR -ne 0 ]; then |
22 | 22 | fi |
23 | 23 | |
24 | 24 | # Got all new packages, and ready to go. Now actually do the install. |
25 | | cd $SAGE_ROOT/spkg/ |
| 25 | # First install the sage_root repo, then run the install script to do |
| 26 | # the others. |
| 27 | cd "$SAGE_ROOT"/spkg/ |
| 28 | newest=$SAGE_ROOT/spkg/standard/newest_version |
| 29 | ROOT_REPO=`$newest sage_root` |
| 30 | |
| 31 | echo $ROOT_REPO |
| 32 | |
| 33 | ./pipestatus "sage-spkg $ROOT_REPO 2>&1" "tee -a '$SAGE_ROOT'/spkg/logs/$ROOT_REPO.log" |
| 34 | |
| 35 | if [ $? -ne 0 ]; then |
| 36 | echo "Error installing Sage root repository." |
| 37 | exit 1 |
| 38 | fi |
26 | 39 | |
27 | 40 | ./install |
28 | 41 | |
… |
… |
if [ $? -ne 0 ]; then |
31 | 44 | echo "Error installing Sage!" |
32 | 45 | exit 1 |
33 | 46 | fi |
34 | | |