diff --git a/doc/release-checklist.txt b/doc/release-checklist.txt index 71158f6c..02ac82e2 100644 --- a/doc/release-checklist.txt +++ b/doc/release-checklist.txt @@ -1,28 +1,32 @@ OpenSCAD Release Checklist -------------------------- -o Update version +o Update VERSION in these files: scripts/release-linux.sh - scripts/publish-macosx.sh - FIXME: Windows + scripts/publish-macosx.sh + scripts/publish-mingw-x.sh + +o Update VERSION env variable + export VERSION=2012.08 o Update RELEASE_NOTES o Tag release - git tag "openscad-2011.12" + git tag "openscad-$VERSION" o build source package - scripts/git-archive-all.py --prefix=openscad-2011.12/ openscad-2011.12.src.tar.gz + scripts/git-archive-all.py --prefix=openscad-$VERSION/ openscad-$VERSION.src.tar.gz o build binaries - tar xzf openscad-2011.12.src.tar.gz - cd openscad-2011.12 + tar xzf openscad-$VERSION.src.tar.gz + cd openscad-$VERSION Mac OS X (For Qt-4.7.3: Remove /Developers/Applications/Qt/plugins/qmltooling) - ./scripts/publish-macosx.sh -> OpenSCAD-2011.12.dmg + ./scripts/publish-macosx.sh -> OpenSCAD-$VERSION.dmg Linux: FIXME 32 vs. 64 bit ./scripts/release-linux.sh - Windows: FIXME 32 vs. 64 bit + Windows mingw cross-build: FIXME 32 vs. 64 bit + ./scripts/publish-mingw-x.sh o FIXME: Run some tests diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh index 6856ba16..1ea7d14e 100755 --- a/scripts/mingw-x-build-dependencies.sh +++ b/scripts/mingw-x-build-dependencies.sh @@ -39,9 +39,6 @@ fi if [ ! -e $BASEDIR ]; then mkdir -p $BASEDIR fi -if [ ! -e $DEPLOYDIR ]; then - mkdir -p $DEPLOYDIR -fi cd $BASEDIR @@ -61,9 +58,3 @@ echo "leaving" $MXEDIR echo "entering $OPENSCADDIR" cd $OPENSCADDIR -if [ -e $DEPLOYDIR/mingw-cross-env ]; then - rm $DEPLOYDIR/mingw-cross-env -fi -echo "linking mxe to" $DEPLOYDIR/mingw-cross-env -ln -s $MXEDIR/usr/i686-pc-mingw32/ $DEPLOYDIR/mingw-cross-env - diff --git a/scripts/publish-mingw-x.sh b/scripts/publish-mingw-x.sh new file mode 100755 index 00000000..e15899ea --- /dev/null +++ b/scripts/publish-mingw-x.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +# Set this if we're doing a release build. Comment it out for development builds +#VERSION=2011.12 + +if test -z "$VERSION"; then + VERSION=`date "+%Y.%m.%d"` + COMMIT=-c +fi + +# Turn off ccache, just for safety +CCACHE_DISABLE=1 + +. ./scripts/setenv-mingw-xbuild.sh + +if [ ! -f $OPENSCADDIR/openscad.pro ]; then + echo "Must be run from the OpenSCAD source root directory" + exit 0 +fi + +OS=LINXWIN ./scripts/release-common.sh -v $VERSION $COMMIT +if [[ $? != 0 ]]; then + exit 1 +fi + +echo "Please upload these files to the appropriate location" +BINFILE=$DEPLOYDIR/OpenSCAD-$VERSION.zip +INSTALLFILE=$DEPLOYDIR/OpenSCAD-$VERSION-Installer.exe +echo $BINFILE +echo $INSTALLFILE + +echo +echo "Then copy/paste these commands into your shell:" +echo + +# Update snapshot filename on wab page +echo ./scripts/update-web.sh OpenSCAD-$VERSION.zip +echo ./scripts/update-web.sh OpenSCAD-$VERSION-Installer.exe diff --git a/scripts/release-common.sh b/scripts/release-common.sh index 7bf1c077..fb7df404 100755 --- a/scripts/release-common.sh +++ b/scripts/release-common.sh @@ -202,6 +202,7 @@ case $OS in "$ZIP" $ZIPARGS OpenSCAD-$VERSION.zip openscad-$VERSION rm -rf ./openscad-$VERSION cd $OPENSCADDIR + echo "Binary package created" echo "Creating installer" ./scripts/mingw-x-build-installer.sh diff --git a/scripts/setenv-mingw-xbuild.sh b/scripts/setenv-mingw-xbuild.sh index 987f6e40..271e5be5 100644 --- a/scripts/setenv-mingw-xbuild.sh +++ b/scripts/setenv-mingw-xbuild.sh @@ -24,3 +24,14 @@ echo MXEDIR: $MXEDIR echo DEPLOYDIR: $DEPLOYDIR echo PATH modified with $MXEDIR/usr/bin +if [ ! -e $DEPLOYDIR ]; then + mkdir -p $DEPLOYDIR +fi +if [ ! -e $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 + echo $DEPLOYDIR/mingw-cross-env is already symlinked +fi + +