Fetch the Win32 prebuilts via the Bash script and cygwin

livecodefraser · livecodefraser · commit 364b06591bf9 · 2015-05-28T13:39:36.000+01:00
diff --git a/prebuilt/fetch-libraries.sh b/prebuilt/fetch-libraries.sh
@@ -21,8 +21,9 @@ LIBS_linux=( OpenSSL Curl ICU )
 SUBPLATFORMS_ios=( iPhoneSimulator5.1 iPhoneSimulator6.1 iPhoneSimulator7.1 iPhoneSimulator8.2 iPhoneSimulator8.3 iPhoneOS8.2 iPhoneOS8.3 )
 
 # Fetch settings
-FETCH_DIR=`pwd`/fetched
-EXTRACT_DIR=`pwd`
+SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+FETCH_DIR="${SCRIPT_DIR}/fetched"
+EXTRACT_DIR="${SCRIPT_DIR}"
 URL="http://downloads.livecode.com/prebuilts"
 
 mkdir -p "${FETCH_DIR}"
@@ -44,11 +45,18 @@ function fetchLibrary {
 
 	if [ ! -f "${FETCH_DIR}/${NAME}.tar.bz2" ] ; then
 		echo "Fetching library: ${NAME}"
-		curl --silent "${URL}/${NAME}.tar.bz2" -o "${FETCH_DIR}/${NAME}.tar.bz2"
-		#cp "`pwd`/packaged/${NAME}.tar.bz2" "${FETCH_DIR}/${NAME}.tar.bz2"
+		
+		# Download using an HTTP client of some variety
+		if $(which curl 2>/dev/null) ; then
+			curl --silent "${URL}/${NAME}.tar.bz2" -o "${FETCH_DIR}/${NAME}.tar.bz2"
+		else
+			# Perl as a last resort (useful for Cygwin)
+			perl -MLWP::Simple -e "getstore('${URL}/${NAME}.tar.bz2', '${FETCH_DIR}/${NAME}.tar.bz2') == 200 or exit 1"
+		fi
+
 		if [ $? -ne 0 ] ; then
 			echo "    failed"
-			exit
+			exit 1
 		fi
 
 		echo "Extracting library: ${NAME}"
@@ -59,7 +67,7 @@ function fetchLibrary {
 		cd "${DIR}"
 		if [ "${RESULT}" -ne 0 ] ; then
 			echo "    failed"
-			exit
+			exit 1
 		fi
 	else
 		echo "Already fetched: ${NAME}"
@@ -72,9 +80,10 @@ else
     SELECTED_PLATFORMS="$@"
 fi
 
-echo "$SELECTED_PLATFORMS"
+for PLATFORM in ${SELECTED_PLATFORMS} ; do
+	# Work around an issue where Gyp is too enthusiastic in path-ifying arguments
+	PLATFORM=$(basename "$PLATFORM")
 
-for PLATFORM in "${SELECTED_PLATFORMS}" ; do
 	eval "ARCHS=( \${ARCHS_${PLATFORM}[@]} )"
 	eval "LIBS=( \${LIBS_${PLATFORM}[@]} )"
 	eval "SUBPLATFORMS=( \${SUBPLATFORMS_${PLATFORM}[@]} )"
@@ -93,7 +102,11 @@ for PLATFORM in "${SELECTED_PLATFORMS}" ; do
 	
 	# Re-name the "i386" output folder to "x86"
 	if [ -d "${EXTRACT_DIR}/lib/${PLATFORM}/i386" ] ; then
-		mv "${EXTRACT_DIR}/lib/${PLATFORM}/i386" "${EXTRACT_DIR}/lib/${PLATFORM}/x86"
+		if [ ! -d "${EXTRACT_DIR}/lib/${PLATFORM}/x86" ] ; then
+			mkdir "${EXTRACT_DIR}/lib/${PLATFORM}/x86"
+		fi
+		mv "${EXTRACT_DIR}/lib/${PLATFORM}/i386"/* "${EXTRACT_DIR}/lib/${PLATFORM}/x86/"
+		rmdir "${EXTRACT_DIR}/lib/${PLATFORM}/i386"
 	fi
 done
 
diff --git a/prebuilt/fetch.gyp b/prebuilt/fetch.gyp
@@ -178,7 +178,9 @@
 					
 					'action':
 					[
-						'../util/invoke-unix.bat',
+						'cmd',
+						'/V',
+						'/K', '../util/invoke-unix.bat',
 						'./fetch-libraries.sh',
 						'win32',
 					],
diff --git a/util/invoke-unix.bat b/util/invoke-unix.bat
@@ -1,11 +1,20 @@
 @echo off
 
 REM This batch file forwards commands to a Unix-like shell
+REM
+REM We need to work around what looks to be a MCVS bug: the final parameter is
+REM missing the terminating '"' when quoted
+
+@echo Invoking Unix command '%*"'
 
 IF EXIST C:\Cygwin\bin (
-  C:\Cygwin\bin\bash.exe -c '%*'
+  REM Obscure way to get the cmd.exe equivalent to `...` substitution
+  FOR /F "usebackq tokens=*" %%x IN (`C:\Cygwin\bin\cygpath.exe %CD%`) DO SET cygwin_cd=%%x
+  FOR /F "usebackq tokens=*" %%x IN (`C:\Cygwin\bin\cygpath.exe %*"`)  DO SET cygwin_cmd=!cygwin_cmd! %%x
+
+  C:\Cygwin\bin\bash.exe -c 'cd !cygwin_cd! ^&^& !cygwin_cmd!'
 ) ELSE (
-  invoke-unix-wine.exe %*
+  invoke-unix-wine.exe %*"
 )
 
 EXIT %ERRORLEVEL%
