Merge remote-tracking branch 'upstream/release-6.7.8' into merge-6.7.8-GM_14.12.2015

livecodepanos · livecodepanos · commit 271505bd1835 · 2015-12-14T11:45:40.000Z
diff --git a/builder/archive_builder.livecodescript b/builder/archive_builder.livecodescript
diff --git a/builder/builder_utilities.livecodescript b/builder/builder_utilities.livecodescript
@@ -87,7 +87,7 @@ on builderBuild pWhich, pPlatforms, pEdition, pType
       case "Archive"
          local tBuildNumber
          put builderGetBuildNumber() into tBuildNumber
-         dispatch "archiveBuilderRun" to stack builderArchiveBuilderStack() with pEdition, tVersion, tBuildNumber, pType
+         dispatch "archiveBuilderRun" to stack builderArchiveBuilderStack() with tVersion, tBuildNumber, pType
          break
    end switch
    	
@@ -208,6 +208,11 @@ function builderSystemFolder
    return item 1 to -2 of the filename of me
 end builderSystemFolder
 
+-- Return the folder of the private builder system
+function builderSystemPrivateFolder
+   return builderPrivateRepoFolder() & slash & "builder" 
+end builderSystemPrivateFolder
+
 -- Returns the folder where intermediate products should be placed
 function builderWorkFolder
    if sWorkDir is not empty then
@@ -318,7 +323,7 @@ function builderNotesBuilderStack
 end builderNotesBuilderStack
 
 function builderArchiveBuilderStack
-   return builderSystemFolder() & slash & "archive_builder.livecodescript"
+   return builderSystemPrivateFolder() & slash & "archive_builder.livecodescript"
 end builderArchiveBuilderStack
 
 function builderModuleInterfaceFolder
diff --git a/docs/notes/bugfix-16495.md b/docs/notes/bugfix-16495.md
@@ -0,0 +1 @@
+# LiveCode 6.7.8 (RC4) will not test launch app in iOS Simulator 9.1
diff --git a/ide-support/revsaveasiosstandalone.livecodescript b/ide-support/revsaveasiosstandalone.livecodescript
@@ -1712,7 +1712,7 @@ private command symlinkRedirect pSource, pTarget
       put escapeSingleQuote(pSource) into tEscapedSource
       put escapeSingleQuote(pTarget) into tEscapedTarget
       
-      put get shell(merge("ln '[[tEscapedSource]]' '[[tEscapedTarget]]' || cp '[[tEscapedSource]]' '[[tEscapedTarget]]'"))
+      get shell(merge("ln '[[tEscapedSource]]' '[[tEscapedTarget]]' || cp '[[tEscapedSource]]' '[[tEscapedTarget]]'"))
       
       if the result is not empty then
          // Both 'ln' and 'cp' failedn
diff --git a/version b/version
@@ -1,6 +1,6 @@
-BUILD_REVISION = 10047
+BUILD_REVISION = 10048
 BUILD_MAJOR_VERSION = 7
 BUILD_MINOR_VERSION = 1
 BUILD_POINT_VERSION = 1
-BUILD_SHORT_VERSION = 7.1.1-rc-4
-BUILD_LONG_VERSION = 7.1.1.10047 (rc 4)
+BUILD_SHORT_VERSION = 7.1.1
+BUILD_LONG_VERSION = 7.1.1.10048

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# LiveCode 6.7.8 (RC4) will not test launch app in iOS Simulator 9.1`