Merge branch 'unstable' of github.com:openscad/openscad into unstable

scripts/builder.sh

@@ -50,7 +50,6 @@ init_variables()
 	BRANCH_TO_BUILD=unstable
 	#BRANCH_TO_BUILD=master
 	STARTPATH=$PWD
-	export STARTPATH
 	# kilobit (not kilobyte!) per second for scp upload
 	RATELIMIT=420
 	DOBUILD=1
@@ -84,6 +83,7 @@ init_variables()
 	if [ "`echo $* | grep dry`" ]; then
 		DRYRUN=1
 	fi
+	export STARTPATH
 	export BRANCH_TO_BUILD
 	export DOBUILD
 	export DOUPLOAD
@@ -97,6 +97,7 @@ init_variables()
 
 check_starting_path()
 {
+	cd $STARTPATH
 	if [ -e openscad.pro ]; then
 		echo 'please start from a clean directory outside of openscad'
 		exit
@@ -385,6 +386,7 @@ update_win_www_download_links()
 	else
 		echo dry run, not updating www links
 	fi
+	cd $STARTPATH
 }
 
 # FIXME: We might be running this locally and not need an ssh agent.

scripts/release-common.sh

@@ -34,7 +34,8 @@ lf2crlf()
 		unix2dos $fname
 		return
 	fi
-	if [ "`command -v awk`"]; then
+	if [ "`command -v awk`" ]; then
+		echo using awk to convert end of line markers in $fname
 		awk 'sub("$", "\r")' $fname > $fname".temp"
 		mv $fname".temp" $fname
 	fi

tests/mingw_convert_ctest.py

@@ -165,11 +165,11 @@ def processfile(infilename):
 		line=line.replace(linexamples,winexamples)
 
 		line=line.replace(linbase,winbase)
-		line=line.replace('\\','/')
 
-		# Fixme - how do we escape spaces in cmake?
-		#line=line.replace('Program Files','Progra~1')
-	
+		line=line.replace('\\"','__ESCAPE_WIN_QUOTE_MECHANISM__')
+		line=line.replace('\\','/')
+		line=line.replace('__ESCAPE_WIN_QUOTE_MECHANISM__','\\"')
+
 		debug('output:',line)
 
 		fout.write(line)