diff options
| author | Ralf Gommers <ralf.gommers@googlemail.com> | 2013-09-16 23:42:56 +0200 |
|---|---|---|
| committer | Ralf Gommers <ralf.gommers@googlemail.com> | 2013-09-16 23:46:28 +0200 |
| commit | 0c857a8e9025cb426ec086a732c02742cea8e285 (patch) | |
| tree | 26cd8cdcd41ff4492f8c94043933e9312f594615 | |
| parent | 4f1f9d27abe9f978ef940d248537f54e364f422d (diff) | |
| download | numpy-0c857a8e9025cb426ec086a732c02742cea8e285.tar.gz | |
MAINT: update release scripts for building OS X binaries.
Works with Python 3.x now that bdist_mpkg is ported (thanks @matthew-brett).
| -rw-r--r-- | pavement.py | 10 | ||||
| -rw-r--r-- | release.sh | 4 | ||||
| -rwxr-xr-x | tools/numpy-macosx-installer/new-create-dmg | 2 |
3 files changed, 4 insertions, 12 deletions
diff --git a/pavement.py b/pavement.py index f6ce1380f..41a9f3b46 100644 --- a/pavement.py +++ b/pavement.py @@ -24,8 +24,7 @@ as follows:: Building a simple (no-superpack) windows installer from wine ============================================================ -It assumes that blas/lapack are in c:\local\lib inside drive_c. Build python -2.5 and python 2.6 installers. +It assumes that blas/lapack are in c:\local\lib inside drive_c. paver bdist_wininst_simple @@ -437,12 +436,9 @@ def _build_mpkg(pyver): ldflags = "-undefined dynamic_lookup -bundle -arch i386 -arch x86_64 -Wl,-search_paths_first" else: ldflags = "-undefined dynamic_lookup -bundle -arch i386 -arch ppc -Wl,-search_paths_first" - ldflags += " -L%s" % os.path.join(os.path.dirname(__file__), "build") - if pyver == "2.5": - sh("CC=gcc-4.0 LDFLAGS='%s' %s setupegg.py bdist_mpkg" % (ldflags, " ".join(MPKG_PYTHON[pyver]))) - else: - sh("LDFLAGS='%s' %s setupegg.py bdist_mpkg" % (ldflags, " ".join(MPKG_PYTHON[pyver]))) + ldflags += " -L%s" % os.path.join(os.path.dirname(__file__), "build") + sh("LDFLAGS='%s' %s setupegg.py bdist_mpkg" % (ldflags, " ".join(MPKG_PYTHON[pyver]))) @task def simple_dmg(): diff --git a/release.sh b/release.sh index b9a63c79b..e73f46443 100644 --- a/release.sh +++ b/release.sh @@ -51,7 +51,6 @@ paver bdist_superpack -p 3.2 paver bdist_superpack -p 3.1 paver bdist_superpack -p 2.7 paver bdist_superpack -p 2.6 -paver bdist_superpack -p 2.5 #-------------------------------------------- @@ -60,8 +59,6 @@ paver bdist_superpack -p 2.5 #export MACOSX_DEPLOYMENT_TARGET=10.3 #paver dmg -p 2.6 #paver dmg -p 2.7 # 32-bit version -#export CC=/usr/bin/gcc-4.0 # necessary on 10.6, not sure about 10.5 -#paver dmg -p 2.5 paver write_release_and_log @@ -70,7 +67,6 @@ paver write_release_and_log #------------------------------------------------------- # Build basic (no SSE) Windows installers to put on PyPi #------------------------------------------------------- -paver bdist_wininst_simple -p 2.5 paver bdist_wininst_simple -p 2.6 paver bdist_wininst_simple -p 2.7 paver bdist_wininst_simple -p 3.1 diff --git a/tools/numpy-macosx-installer/new-create-dmg b/tools/numpy-macosx-installer/new-create-dmg index 1535bbf58..581663a02 100755 --- a/tools/numpy-macosx-installer/new-create-dmg +++ b/tools/numpy-macosx-installer/new-create-dmg @@ -58,7 +58,7 @@ DMG_DIR="$(cd $DMG_DIRNAME > /dev/null; pwd)" DMG_NAME="$(basename "$DMG_PATH")" DMG_TEMP_NAME="$DMG_DIR/rw.${DMG_NAME}" SRC_FOLDER="$(cd "$2" > /dev/null; pwd)" -DMG_SIZE=12m +DMG_SIZE=16m test -z "$VOLUME_NAME" && VOLUME_NAME="$(basename "$DMG_PATH" .dmg)" # AUX_PATH="$(cd "$(dirname $0)"; pwd)/support" |