Skip to content

Commit 0c857a8

Browse files
author
Ralf Gommers
committed
MAINT: update release scripts for building OS X binaries.
Works with Python 3.x now that bdist_mpkg is ported (thanks @matthew-brett).
1 parent 4f1f9d2 commit 0c857a8

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

pavement.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
Building a simple (no-superpack) windows installer from wine
2525
============================================================
2626
27-
It assumes that blas/lapack are in c:\local\lib inside drive_c. Build python
28-
2.5 and python 2.6 installers.
27+
It assumes that blas/lapack are in c:\local\lib inside drive_c.
2928
3029
paver bdist_wininst_simple
3130
@@ -437,12 +436,9 @@ def _build_mpkg(pyver):
437436
ldflags = "-undefined dynamic_lookup -bundle -arch i386 -arch x86_64 -Wl,-search_paths_first"
438437
else:
439438
ldflags = "-undefined dynamic_lookup -bundle -arch i386 -arch ppc -Wl,-search_paths_first"
440-
ldflags += " -L%s" % os.path.join(os.path.dirname(__file__), "build")
441439

442-
if pyver == "2.5":
443-
sh("CC=gcc-4.0 LDFLAGS='%s' %s setupegg.py bdist_mpkg" % (ldflags, " ".join(MPKG_PYTHON[pyver])))
444-
else:
445-
sh("LDFLAGS='%s' %s setupegg.py bdist_mpkg" % (ldflags, " ".join(MPKG_PYTHON[pyver])))
440+
ldflags += " -L%s" % os.path.join(os.path.dirname(__file__), "build")
441+
sh("LDFLAGS='%s' %s setupegg.py bdist_mpkg" % (ldflags, " ".join(MPKG_PYTHON[pyver])))
446442

447443
@task
448444
def simple_dmg():

release.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ paver bdist_superpack -p 3.2
5151
paver bdist_superpack -p 3.1
5252
paver bdist_superpack -p 2.7
5353
paver bdist_superpack -p 2.6
54-
paver bdist_superpack -p 2.5
5554

5655

5756
#--------------------------------------------
@@ -60,8 +59,6 @@ paver bdist_superpack -p 2.5
6059
#export MACOSX_DEPLOYMENT_TARGET=10.3
6160
#paver dmg -p 2.6
6261
#paver dmg -p 2.7 # 32-bit version
63-
#export CC=/usr/bin/gcc-4.0 # necessary on 10.6, not sure about 10.5
64-
#paver dmg -p 2.5
6562

6663

6764
paver write_release_and_log
@@ -70,7 +67,6 @@ paver write_release_and_log
7067
#-------------------------------------------------------
7168
# Build basic (no SSE) Windows installers to put on PyPi
7269
#-------------------------------------------------------
73-
paver bdist_wininst_simple -p 2.5
7470
paver bdist_wininst_simple -p 2.6
7571
paver bdist_wininst_simple -p 2.7
7672
paver bdist_wininst_simple -p 3.1

tools/numpy-macosx-installer/new-create-dmg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ DMG_DIR="$(cd $DMG_DIRNAME > /dev/null; pwd)"
5858
DMG_NAME="$(basename "$DMG_PATH")"
5959
DMG_TEMP_NAME="$DMG_DIR/rw.${DMG_NAME}"
6060
SRC_FOLDER="$(cd "$2" > /dev/null; pwd)"
61-
DMG_SIZE=12m
61+
DMG_SIZE=16m
6262
test -z "$VOLUME_NAME" && VOLUME_NAME="$(basename "$DMG_PATH" .dmg)"
6363

6464
# AUX_PATH="$(cd "$(dirname $0)"; pwd)/support"

0 commit comments

Comments
 (0)