Ticket #4949: trac_4949-root-delta2to3.patch

File trac_4949-root-delta2to3.patch, 1.6 KB (added by jhpalmieri, 8 years ago)

root repo: diff between v2 and v3

  • Makefile

    diff --git a/Makefile b/Makefile
    a b clean: 
    5959        @echo "Deleting spkg/archive..."
    6060        rm -rf spkg/archive
    6161        mkdir -p spkg/archive
     62        @if [ -n "$(SAGE_BUILD_TMPDIR)" ] && [ -d "$(SAGE_BUILD_TMPDIR)/build" ]; then \
     63            echo "Deleting \$$SAGE_BUILD_TMPDIR/build..."; \
     64            echo "rm -rf $(SAGE_BUILD_TMPDIR)/build"; \
     65            rm -rf "$(SAGE_BUILD_TMPDIR)/build"; \
     66            echo "mkdir -p $(SAGE_BUILD_TMPDIR)/build"; \
     67            mkdir -p "$(SAGE_BUILD_TMPDIR)/build"; \
     68        fi
    6269
    6370distclean: clean
    6471        @echo "Deleting all remaining traces of builds, tests etc. ..."
    distclean: clean 
    8289        rm -rf matplotlibrc
    8390        rm -rf tmp
    8491        rm -f .BUILDSTART
     92        @if [ -n "$(SAGE_BUILD_TMPDIR)" ]; then \
     93            echo "rm -rf $(SAGE_BUILD_TMPDIR)/build"; \
     94            rm -rf "$(SAGE_BUILD_TMPDIR)/build"; \
     95        fi
    8596
    8697micro_release:
    8798        . spkg/bin/sage-env && local/bin/sage-micro_release
  • spkg/bin/sage-spkg

    diff --git a/spkg/bin/sage-spkg b/spkg/bin/sage-spkg
    a b if [ -f "$INSTALLED/$PKG_NAME" -a $FORCE 
    193193fi
    194194
    195195if [ -n "$SAGE_BUILD_TMPDIR" ]; then
    196     if [ -d "$SAGE_BUILD_TMPDIR" ]; then
    197         echo "Building in $SAGE_BUILD_TMPDIR."
    198     else
    199         echo "The variable \$SAGE_BUILD_TMPDIR is set to \"$SAGE_BUILD_TMPDIR\","
    200         echo "which is not an existing directory. Exiting."
    201         exit 1
     196    if [ ! -d "$SAGE_BUILD_TMPDIR" ]; then
     197        echo "Creating directory \$SAGE_BUILD_TMPDIR (=$SAGE_BUILD_TMPDIR)."
     198        mkdir -p "$SAGE_BUILD_TMPDIR"
    202199    fi
     200    echo "Building in $SAGE_BUILD_TMPDIR."
    203201else
    204202    SAGE_BUILD_TMPDIR="$SAGE_PACKAGES"
    205203fi