Ticket #13860: p0top1_changes.patch

File p0top1_changes.patch, 1.9 KB (added by Dima Pasechnik, 10 years ago)

spkg changes - for review only

  • SPKG.txt

    diff --git a/SPKG.txt b/SPKG.txt
    a b  
    4040
    4141== Changelog ==
    4242
     43=== maxima-5.26.0.p1 (Dima Pasechnik, Dec 23rd 2012) ===
     44 * ASDF has changed in newer ECL, and so we need to reflect this in spkg-install
     45   (it will now work with both old and new ASDF)
     46 * Removed pdf figures from the source, as we don't install them
     47 * removed `pwd` from check_error calls in spkg-install, as per #13364#comment:24
     48
    4349=== maxima-5.26.0.p0 (Dima Pasechnik, February 28th 2012) ===
    4450 * upgrading to version 5.26.0 to take care of #10682.
    4551 * added patch/comm.patch to fix Maxima bug #3484414.
  • spkg-dist

    diff --git a/spkg-dist b/spkg-dist
    a b  
    77    if os.system(x):
    88        print "(Failed.)"
    99
     10cmd('rm "src/doc/info/figures/*.pdf"')
     11
    1012for X in ['de', 'de.utf8', 'es', 'es.utf8', 'pt', 'pt.utf8', 'pt_BR', 'pt_BR.utf8']:
    1113    cmd('rm -rf "src/doc/info/%s/"*'%X)
    1214    open('src/doc/info/%s/Makefile.in'%X,'w').write('all:\n\tls\n\n')
  • spkg-install

    diff --git a/spkg-install b/spkg-install
    a b  
    110110ECLLIB=`ecl -eval "(princ (SI:GET-LIBRARY-PATHNAME))" -eval "(quit)"`
    111111echo
    112112echo "Now installing the Maxima library as '$ECLLIB/maxima.fas'..."
    113 cp -f maxima.fasb "$ECLLIB/maxima.fas"
    114 check_error "Failed to install '`pwd`/maxima.fasb' as '$ECLLIB/maxima.fas'."
    115 
     113if [[ -f "maxima.system.fasb" ]]; then
     114    echo "New ASDF encountered"
     115    cp -f maxima.system.fasb "$ECLLIB/maxima.fas"
     116    check_error "Failed to install 'maxima.system.fasb' as '$ECLLIB/maxima.fas'."
     117elif [[ -f "maxima.fasb" ]]; then
     118    echo "Old ASDF encountered"
     119    cp -f maxima.fasb "$ECLLIB/maxima.fas"
     120    check_error "Failed to install 'maxima.fasb' as '$ECLLIB/maxima.fas'."
     121else
     122    echo >&2 "Error: cannot find an .fasb file to install - exiting..."
     123    exit 1
     124fi
    116125
    117126if [[ "$SAGE_SPKG_INSTALL_DOCS" = yes ]] ; then
    118127    # Install a copy of the Maxima HTML documentation locally.