Merge remote-tracking branch 'origin/release-6.7.7' into merge-6.7.7-rc-3

livecodesebastien · livecodesebastien · commit eb84e73c6a6e · 2015-08-20T09:08:06.000+01:00
Conflicts:
	util/build_libinfo.pl
diff --git a/docs/notes/bugfix-15685.md b/docs/notes/bugfix-15685.md
@@ -0,0 +1,2 @@
+# Fix the path to the OSX standalone engine on Linux
+
diff --git a/docs/notes/bugfix-15718.md b/docs/notes/bugfix-15718.md
@@ -0,0 +1 @@
+# 'SSL library not found' error thrown on iOS when using SSL & Encryption library
diff --git a/docs/notes/bugfix-15743.md b/docs/notes/bugfix-15743.md
@@ -0,0 +1 @@
+# iOS standalone engine do not build anymore in Debug mode
diff --git a/ide-support/revsaveasstandalone.livecodescript b/ide-support/revsaveasstandalone.livecodescript
@@ -576,7 +576,10 @@ private command revCreateStandalone pStack, pFolder
             case "MacOSX x86-32"
                // SN-2015-07-09: [[ StandaloneDeployment ]] Gypified Standalone-<edition>.app building does not
                //  allow to create broken applications, so that the executable file in it bears the edition.
-               put it & "/Mac OS X/x86-32/Standalone.app/Contents/MacOS/Standalone-" & the editionType into line 1 of tEngineSourceFile[tPlatform]
+               local tEdition
+               put the editionType into tEdition
+               put the upper of char 1 of tEdition into char 1 of tEdition
+               put it & "/Mac OS X/x86-32/Standalone.app/Contents/MacOS/Standalone-" & tEdition into line 1 of tEngineSourceFile[tPlatform]
                break
             case "Windows"
                put it & "/Windows/x86-32/Standalone" into tEngineSourceFile[tPlatform]
diff --git a/tools/extract-debug-symbols.sh b/tools/extract-debug-symbols.sh
@@ -52,21 +52,23 @@ for input in $@ ; do
 		real_input="${input}"
 	fi
 
-	# Extract a copy of the debugging information
-	echo Extracting debug symbols for ${input}
-	dsymutil --out "${output}" "${real_input}"
 
-	# Strip the executable
-	$STRIP -x -S "$real_input"
+	# If the OS is iOS and this is a debug build, do nothing
+	if [ "$os" == "ios" -a "$BUILDTYPE" == "Debug" ] ; then
+		echo Creating empty debug symbols file for ${input}
+		touch "${output}"
+	else
+		# Extract a copy of the debugging information
+		echo Extracting debug symbols for ${input}
+		dsymutil --out "${output}" "${real_input}"
+
+		# Strip the executable
+		$STRIP -x -S "$real_input"
+	fi
 done
 
 }
 
-# If the OS is iOS and this is a debug build, do nothing
-if [ "$os" == "ios" -a "$BUILDTYPE" == "Debug" ] ; then
-	exit 0
-fi
-
 case $os in
 	linux|android)
 		extract_linux_or_android ${inputs}
diff --git a/util/build_libinfo.pl b/util/build_libinfo.pl
@@ -95,7 +95,7 @@ sub trim
 output "    &__libexternalname,";
 output "    __libexports";
 output "};";
-output "LibInfo *__libinfoptr_$name __attribute__((__visibility__(\"default\"))) = &__libinfo;";
+output "__attribute((__visibility__(\"default\"),section(\"__DATA,__libs\"))) volatile struct LibInfo *__libinfoptr_$name = &__libinfo;";
 output "};";
 
 sub output

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Fix the path to the OSX standalone engine on Linux`
	`2`	`+`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# 'SSL library not found' error thrown on iOS when using SSL & Encryption library`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# iOS standalone engine do not build anymore in Debug mode`