Ticket #7494: trac_7494-scripts.patch

File trac_7494-scripts.patch, 3.4 KB (added by jhpalmieri, 9 years ago)

scripts repo

  • sage-apply-ticket 

    # HG changeset patch
# User J. H. Palmieri <palmieri@math.washington.edu>
# Date 1314306997 25200
# Node ID b597d9744e95fecd188f970d968ea63e6b53e526
# Parent  f670ebf3b2956465e7fa3b2f7dd6d2da16b60178
#7494: scripts repo.  Remove all traces of the "examples" directory.

diff --git a/sage-apply-ticket b/sage-apply-ticket
    a b SAGE_TRAC = 'http://trac.sagemath.org' 
    2828TRAC_TICKET_PATH = '/sage_trac/ticket/'
    2929
    3030# TODO: load this from a file, convince make to do the same.
     31# For the documentation directories, use the file
     32# devel/sage/doc/common/build_options.py.
    3133DOCTEST_DIRS_RELATIVE = ['devel/sage/doc/common',
     34                         'devel/sage/doc/de',
    3235                         'devel/sage/doc/en',
    3336                         'devel/sage/doc/fr',
     37                         'devel/sage/doc/ru',
    3438                         'devel/sage/sage' ]
    3539DOCTEST_DIRS = [ os.path.join(SAGE_ROOT, x) for x in DOCTEST_DIRS_RELATIVE ]
    3640
    3741DOCTEST_OPTIONS = ['none', 'files', 'directory', 'long']
    3842
    39 repository_ls = [ hg.hg_sage, hg.hg_scripts, hg.hg_extcode, hg.hg_examples ]
     43repository_ls = [ hg.hg_sage, hg.hg_scripts, hg.hg_extcode, hg.hg_root ]
    4044repositories = { 'sage': hg.hg_sage,
    4145                 'main': hg.hg_sage,
    4246                 'scripts': hg.hg_scripts,
    4347                 'bin': hg.hg_scripts,
    4448                 'extcode': hg.hg_extcode,
    45                  'examples': hg.hg_examples }
     49                 'root': hg.hg_root }
    4650parser = OptionParser("""sage -merge [options] [ticket-number]
    4751
    4852Tries to automate the process of merging tickets in release management.

  • sage-bdist 

    diff --git a/sage-bdist b/sage-bdist
    a b echo "Done copying root repository." 
    5454cd "$SAGE_ROOT"
    5555
    5656echo "Copying files over to tmp directory"
    57 cp $CP_OPT examples local data "$TMP"/
     57cp $CP_OPT local data "$TMP"/
    5858
    5959if [ -d devel/sage-main ]; then
    6060   echo "Copying Sage library over"

  • sage-make_devel_packages 

    diff --git a/sage-make_devel_packages b/sage-make_devel_packages
    a b if [ ! -f "$PKG"/extcode-"$SAGE_VERSION" 
    8989    exit 1
    9090fi
    9191
    92 # NEW SAGE EXAMPLE CODE PACKAGE
    93 if [ -d "$SAGE_ROOT"/examples ]; then
    94    cd "$SAGE_ROOT"/examples
    95    hg diff
    96    hg status
    97    hg tag "$SAGE_VERSION"
    98    hg commit -m "$SAGE_VERSION"
    99    #./sage-push
    100    cd ..
    101    rm -rf examples-"$SAGE_VERSION"
    102    cp -r examples examples-"$SAGE_VERSION"
    103    "$SAGE_ROOT"/sage -pkg examples-"$SAGE_VERSION"
    104    if [ $? -ne 0 ]; then
    105        echo "Error building examples package"
    106        exit 1
    107    fi
    108    mv examples-"$SAGE_VERSION".spkg "$DESTINATION"/
    109    rm -rf examples-"$SAGE_VERSION"
    110    touch "$SPKG_INST"/examples-"$SAGE_VERSION"
    111 fi
    112 
    113 if [ ! -f "$PKG"/examples-"$SAGE_VERSION".spkg ]; then
    114     echo "The package examples-$SAGE_VERSION.spkg wasn't created."
    115     exit 1
    116 fi
    117 
    11892
    11993#################################
    12094

  • sage-maketest 

    diff --git a/sage-maketest b/sage-maketest
    a b cd "$SAGE_TESTDIR" 
    1010cat "$SAGE_ROOT/local/bin/sage-banner" > "$SAGE_TEST_LOG"
    1111echo `date` >> "$SAGE_TEST_LOG"
    1212
    13 if [ -d $SAGE_ROOT/examples ]; then
    14    
    15    "$SAGE_ROOT"/examples/test_all | tee -a "$SAGE_TEST_LOG"
    16 fi
    17 
    1813# Run doctests on documentation and library, which end with a summary report.
    1914# (We do this all in a single run of "sage -t" so we get a single summary.)
    2015# We test three subdirectories of doc/, rather than testing the