From a56721af475311b2442e9d5d937455be6f135c93 Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sun, 5 Aug 2012 00:18:36 +0200
Subject: use mxe's nsis if we dont have it. detect MCAD better.


diff --git a/scripts/mingw-x-build-dependencies.sh b/scripts/mingw-x-build-dependencies.sh
index 1ea7d14..76bb7d4 100755
--- a/scripts/mingw-x-build-dependencies.sh
+++ b/scripts/mingw-x-build-dependencies.sh
@@ -40,17 +40,16 @@ if [ ! -e $BASEDIR ]; then
 	mkdir -p $BASEDIR
 fi
 
-cd $BASEDIR
-
-if [ ! -e mxe ]; then
+if [ ! -e $MXEDIR ]; then
 	echo "Downloading MXE into " $MXEDIR
+	cd $MXEDIR/..
 	git clone git://github.com/mxe/mxe.git
 fi
 
 echo "entering" $MXEDIR
 cd $MXEDIR
 echo "make mpfr eigen opencsg cgal qt -j $NUMCPU JOBS=$NUMJOBS"
-make mpfr eigen opencsg cgal qt -j $NUMCPU JOBS=$NUMJOBS
+make mpfr eigen opencsg cgal qt nsis -j $NUMCPU JOBS=$NUMJOBS
 #make mpfr -j $NUMCPU JOBS=$NUMJOBS # for testing
 
 echo "leaving" $MXEDIR
diff --git a/scripts/mingw-x-build-installer.sh b/scripts/mingw-x-build-installer.sh
index 4ac9f4e..e740182 100755
--- a/scripts/mingw-x-build-installer.sh
+++ b/scripts/mingw-x-build-installer.sh
@@ -27,12 +27,12 @@
 OPENSCADDIR=$PWD
 if [ ! -f $OPENSCADDIR/openscad.pro ]; then
 	echo "Must be run from the OpenSCAD source root directory"
-	exit 0
+	exit 1
 fi
 
 . ./scripts/setenv-mingw-xbuild.sh
 
-if [ ! -e $OPENSCADDIR/libraries/MCAD ]; then
+if [ ! -e $OPENSCADDIR/libraries/MCAD/__init__.py ]; then
 	echo "Downloading MCAD"
 	git submodule init
 	git submodule update
@@ -40,19 +40,29 @@ fi
 
 if [ ! -e $DEPLOYDIR ]; then
 	echo $DEPLOYDIR "empty. Please build OpenSCAD for mingw32 first."
-	exit 0
+	exit 1
 fi
 
 OPENSCAD_EXE=$DEPLOYDIR/release/openscad.exe
 
 if [ ! -e $OPESCAD_EXE ]; then
 	echo "Can't find" $OPENSCAD_EXE "Please build OpenSCAD for mingw32 first."
-	exit 0
+	exit 1
 fi
 
+MAKENSIS=
+
 if [ ! "`command -v makensis`" ]; then
+	MAKENSIS=makensis
+fi
+
+if [ ! "`command -v i686-pc-mingw32-makensis`" ]; then
+	MAKENSIS=i686-pc-mingw32-makensis
+fi
+
+if [ ! $MAKENSIS ]; then
 	echo "makensis not found. please install nsis"
-	exit 0
+	exit 1
 fi
 
 
diff --git a/scripts/release-common.sh b/scripts/release-common.sh
index ad1ccaa..84874bf 100755
--- a/scripts/release-common.sh
+++ b/scripts/release-common.sh
@@ -27,7 +27,7 @@ printUsage()
 OPENSCADDIR=$PWD
 if [ ! -f $OPENSCADDIR/openscad.pro ]; then
   echo "Must be run from the OpenSCAD source root directory"
-  exit 0
+  exit 1
 fi
 
 if [[ "$OSTYPE" =~ "darwin" ]]; then
-- 
cgit v0.10.1