diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mingw-x-build-dependencies.sh | 9 | ||||
| -rwxr-xr-x | scripts/publish-mingw-x.sh | 38 | ||||
| -rwxr-xr-x | scripts/release-common.sh | 1 | ||||
| -rw-r--r-- | scripts/setenv-mingw-xbuild.sh | 11 | 
4 files changed, 50 insertions, 9 deletions
| diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh index 6856ba1..1ea7d14 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 0000000..e15899e --- /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 7bf1c07..fb7df40 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 987f6e4..271e5be 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 + + | 
