Ticket #9433: trac_9433-scripts.patch

sage-make_devel_packages

@@ -142 +142 @@
 
 cp -pr sage-* .hg* ipy_profile_sage.py $SCRIPTS/
 cp -p $SAGE_ROOT/sage-python $SCRIPTS/
-cp -p $SAGE_ROOT/*.txt $SCRIPTS/
+cp -p $SAGE_ROOT/COPYING.txt $SCRIPTS/
+cp -p $SAGE_ROOT/README.txt $SCRIPTS/
 cp -pr $SAGE_ROOT/ipython $SCRIPTS/
 cp -p $SAGE_ROOT/spkg/install $SCRIPTS/
 cp -p $SAGE_ROOT/local/bin/sage-spkg-install $SCRIPTS/spkg-install
@@ -160 +161 @@
     echo "The package sage_scripts-$SAGE_VERSION.spkg wasn't created."
     exit 1
 fi
+
+# SAGE ROOT PACKAGE: don't make spkg file, just tag it with the new version.
+
+cd $SAGE_ROOT
+
+#./sage-push
+hg diff
+hg status
+hg tag "$SAGE_VERSION"
+hg commit -m "$SAGE_VERSION"
+
+if [ $? -ne 0 ]; then
+    echo "Error pushing sage root repository."
+    exit 1
+fi

sage-sdist

@@ -48 +48 @@
 
 mkdir $TMP
 
+# copy sage root repo over:
 cd $SAGE_ROOT
-cp -LRp makefile *.txt *.sage sage ipythonrc $TMP/
+
+echo "Copying root repository..."
+$SAGE_ROOT/sage --hg clone --pull . $TMP
+rm $TMP/.hg/hgrc
+echo "Done copying root repository."
+
 STD=standard
-mkdir $TMP/$PKGDIR
-mkdir $TMP/$PKGDIR/$STD
-cp -p $PKGDIR/$STD/deps $TMP/$PKGDIR/$STD/
-cp -p $PKGDIR/$STD/libdist_filelist $TMP/$PKGDIR/$STD/
-cp -p $PKGDIR/$STD/newest_version $TMP/$PKGDIR/$STD/
 cp -pr $PKGDIR/base $TMP/$PKGDIR/
-cp -p $PKGDIR/install $TMP/$PKGDIR/
-cp -p $PKGDIR/pipestatus $TMP/$PKGDIR/
-cp -p $PKGDIR/update $TMP/$PKGDIR/
-cp -p $PKGDIR/gen_html $TMP/$PKGDIR/
-cp -p $PKGDIR/README.txt $TMP/$PKGDIR/
 
 $SAGE_ROOT/local/bin/sage-make_devel_packages $SAGE_VERSION $SAGE_ROOT $TMP/devel
 
@@ -73 +69 @@
 cp $TMP/devel/*.spkg $SAGE_ROOT/$PKGDIR/$STD/
 
 cp -p $PKGDIR/$STD/*.spkg $TMP/$PKGDIR/$STD/
-cp -p $PKGDIR/$STD/*.txt $TMP/$PKGDIR/$STD/
 
 cd $TMP/$PKGDIR/$STD
 rm -rf doc-* sage-* extcode-* sage_scripts-* examples-*

sage-spkg-install

@@ -25 +25 @@
 # Finally, make sure some symbolic links exist.
 cd "$CUR"
 
-# These are not part of the scripts repo and are
-# not under revision control, so they get wacked (at least
-# we do save the last versions in tmp, just in case).
-TMP="$SAGE_ROOT"/tmp/
-if [ ! -d "$TMP" ]; then
-    mkdir "$TMP"
-fi
-cp "$SAGE_ROOT"/sage-python "$TMP"/
-cp sage-python "$SAGE_ROOT"/
-
-cp "$SAGE_ROOT"/spkg/install "$TMP"/
-cp install "$SAGE_ROOT"/spkg/
-
-cp "$SAGE_ROOT"/*.txt "$TMP"/
-cp *.txt "$SAGE_ROOT"/ 
-
-rm -rf "$TMP"/ipython
-cp -r "$SAGE_ROOT"/ipython "$TMP"/
-cp -r ipython "$SAGE_ROOT/"
-
 # I think these below should moved to the relevant spkg's.  
 # -- William Stein (2007-10-04)
 cd "$TARGET"
 ln -sf python sage.bin
 ln -sf Singular sage_singular
 ln -sf gp sage_pari
-

sage-upgrade

@@ -32 +32 @@
     exit 1
 fi
 
+# Finally check for the existence of the SAGE_ROOT mercurial
+# repository.  If it's not there, create it and also create the file
+# .hgignore.  See #9433.
+hg="$SAGE_ROOT/sage --hg"
+
+create_repo() {    
+    $hg init .
+    $hg add .hgignore COPYING.txt README.txt makefile sage sage-python
+    cd spkg
+    $hg add README.txt gen_html install pipestatus
+    cd standard
+    $hg add README.txt deps libdist_filelist newest_version
+    $hg commit --message 'created SAGE_ROOT repo during upgrade'
+}
+
+cd $SAGE_ROOT
+$hg branch &> /dev/null
+if [ $? -ne 0 ]; then
+    # repo does not exist, so create it, along with the file .hgignore.
+    echo "Creating top-level Mercurial repository"
+
+    cat > .hgignore <<EOF 
+.BUILDSTART
+sage-README-osx.txt
+~$
+.hgignore~
+data
+devel
+dist
+examples
+.*\.log
+ipython
+local
+tmp
+spkg/base
+spkg/build
+spkg/installed
+spkg/logs
+spkg/standard/.*\.spkg
+spkg/optional
+EOF
+
+    create_repo
+    if [ $? -ne 0 ]; then
+        echo "Error creating top-level Mercurial repository"
+        exit 1
+    fi
+fi