diff options
| -rw-r--r-- | doc/release-checklist.txt | 5 | ||||
| -rwxr-xr-x | scripts/release-common.sh | 10 | ||||
| -rw-r--r-- | scripts/setenv-mingw-xbuild.sh | 3 |
3 files changed, 12 insertions, 6 deletions
diff --git a/doc/release-checklist.txt b/doc/release-checklist.txt index c0b1469..b24a19d 100644 --- a/doc/release-checklist.txt +++ b/doc/release-checklist.txt @@ -7,7 +7,7 @@ o Update VERSION environment variable It will be used by the commands below, as well as these files: - scripts/release-linux.sh + scripts/release-common.sh scripts/publish-macosx.sh scripts/publish-mingw-x.sh @@ -26,7 +26,8 @@ o build binaries (For Qt-4.7.3: Remove /Developers/Applications/Qt/plugins/qmltooling) ./scripts/publish-macosx.sh -> OpenSCAD-$VERSION.dmg Linux: FIXME 32 vs. 64 bit - ./scripts/release-linux.sh + ./scripts/release-common.sh -> openscad-$VERSION.ARCH.tar.gz + (where ARCH is x86-64 or x86-32) Windows mingw cross-build: FIXME 32 vs. 64 bit ./scripts/publish-mingw-x.sh -> mingw32/Openscad-$VERSION.zip -> mingw32/Openscad-$VERSION-Installer.exe diff --git a/scripts/release-common.sh b/scripts/release-common.sh index e449e1f..2fc2250 100755 --- a/scripts/release-common.sh +++ b/scripts/release-common.sh @@ -102,7 +102,7 @@ case $OS in cd $OPENSCADDIR ;; *) - make -s clean + make -s clean ;; esac @@ -123,7 +123,7 @@ case $OS in cd $OPENSCADDIR ;; *) - make -j2 $TARGET + make -j2 $TARGET ;; esac @@ -226,6 +226,10 @@ case $OS in strip openscad-$VERSION/lib/openscad/* cp scripts/installer-linux.sh openscad-$VERSION/install.sh chmod 755 -R openscad-$VERSION/ - tar cz openscad-$VERSION > openscad-$VERSION.x86-$ARCH.tar.gz + PACKAGEFILE=openscad-$VERSION.x86-$ARCH.tar.gz + tar cz openscad-$VERSION > $PACKAGEFILE + echo + echo "Binary created:" $PACKAGEFILE + echo ;; esac diff --git a/scripts/setenv-mingw-xbuild.sh b/scripts/setenv-mingw-xbuild.sh index 271e5be..09a1900 100644 --- a/scripts/setenv-mingw-xbuild.sh +++ b/scripts/setenv-mingw-xbuild.sh @@ -27,7 +27,8 @@ echo PATH modified with $MXEDIR/usr/bin if [ ! -e $DEPLOYDIR ]; then mkdir -p $DEPLOYDIR fi -if [ ! -e $DEPLOYDIR/mingw-cross-env ]; then + +if [ ! -h $DEPLOYDIR/mingw-cross-env ]; then echo linking $MXEDIR/usr/i686-pc-mingw32/ to $DEPLOYDIR/mingw-cross-env ln -s $MXEDIR/usr/i686-pc-mingw32/ $DEPLOYDIR/mingw-cross-env else |