Merge branch 'release-6.7.2' into release-7.0.2

livecodesebastien · livecodesebastien · commit 1f7bfb2cdfb2 · 2015-02-04T15:37:10.000Z
Conflicts:
	engine/src/deploy.cpp
	ide
	version
diff --git a/docs/notes/bugfix-14422.md b/docs/notes/bugfix-14422.md
@@ -0,0 +1 @@
+# Binary submitted to App Store rejected due to minimum version mismatch
diff --git a/engine/rsrc/mobile-device-template.plist b/engine/rsrc/mobile-device-template.plist
@@ -57,7 +57,7 @@
 	<key>CFBundleDisplayName</key>
 		${BUNDLE_DISPLAY_NAME_SUPPORT}
 	<key>MinimumOSVersion</key>
-		${MINIMUM_OS_SUPPORT}
+	<string>${MINIMUM_OS_SUPPORT}</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		${DEVICE_SUPPORT}
diff --git a/engine/src/deploy.cpp b/engine/src/deploy.cpp
@@ -90,6 +90,88 @@ extern Boolean InitSSLCrypt(void);
 
 ////////////////////////////////////////////////////////////////////////////////
 
+static const char *kMCDeployArchitectureStrings[] =
+{
+    "",
+    "i386",
+    "x86-64",
+    "armv6",
+    "armv7",
+    "armv7s",
+    "arm64",
+    "ppc",
+    "ppc64",
+    nil,
+};
+
+typedef struct
+{
+    MCDeployParameters* params;
+    MCExecContext* ctxt;
+}
+MCDeployArrayApplyCallbackContext;
+
+static bool MCDeployMapArchitectureString(MCStringRef p_string, MCDeployArchitecture& r_architecture)
+{
+    for(uindex_t i = 0; kMCDeployArchitectureStrings[i] != nil; i++)
+    {
+        // As 'p_string' is an MCString the '==' operator does a caseless comparison.
+        if (MCStringIsEqualToCString(p_string, kMCDeployArchitectureStrings[i], kMCStringOptionCompareCaseless))
+        {
+            r_architecture = (MCDeployArchitecture)i;
+            return true;
+        }
+    }
+
+    return false;
+}
+
+static bool MCDeployPushMinOSVersion(MCDeployParameters* p_params, MCDeployArchitecture p_arch, MCStringRef p_vers_string)
+{
+    // Use sscanf to parse out the version string. We don't check the return value of
+    // sscanf as we don't care - any malformed / missing components will come out as
+    // 0.
+    int t_major, t_minor, t_inc;
+    t_major = t_minor = t_inc = 0;
+
+    MCAutoPointer<char> t_native_string;
+    MCStringConvertToCString(p_vers_string, &t_native_string);
+    sscanf(*t_native_string, "%d.%d.%d", &t_major, &t_minor, &t_inc);
+
+    if (!MCMemoryResizeArray(p_params -> min_os_version_count + 1, p_params -> min_os_versions, p_params -> min_os_version_count))
+        return false;
+
+    uint32_t t_version;
+    t_version = (t_major & 0xFFFF) << 16;
+    t_version |= (t_minor & 0xFF) << 8;
+    t_version |= (t_inc & 0xFF) << 0;
+
+    p_params -> min_os_versions[p_params -> min_os_version_count - 1] . architecture = p_arch;
+    p_params -> min_os_versions[p_params -> min_os_version_count - 1] . version = t_version;
+
+    return true;
+}
+
+static bool MCDeployGetArchitectures(void *context, MCArrayRef array, MCNameRef key, MCValueRef value)
+{
+    MCDeployArrayApplyCallbackContext *t_context;
+    t_context = (MCDeployArrayApplyCallbackContext*)context;
+
+    MCAutoStringRef t_value_as_string;
+    MCDeployArchitecture t_arch;
+
+    if (!t_context -> ctxt -> ConvertToString(value, &t_value_as_string))
+        return false;
+
+    if (!MCDeployMapArchitectureString(MCNameGetString(key), t_arch))
+        return false;
+
+    if (MCDeployPushMinOSVersion(t_context -> params, t_arch, *t_value_as_string))
+        return false;
+
+    return true;
+}
+
 bool MCDeployParameters::InitWithArray(MCExecContext &ctxt, MCArrayRef p_array)
 {
 	MCStringRef t_temp_string;
@@ -178,6 +260,42 @@ bool MCDeployParameters::InitWithArray(MCExecContext &ctxt, MCArrayRef p_array)
 		return false;
 	MCValueAssign(version_info, t_temp_array);
 	MCValueRelease(t_temp_array);
+
+    // The 'min_os_version' is either a string or an array. If it is a string then
+    // it encodes the version against the 'Unknown' architecture which is interpreted
+    // by the deploy command to mean all architectures. Otherwise, the keys in the
+    // array are assumed to be architecture names and each is pushed on the array.
+    // If multiple entries are present, then the 'unknown' mapping is used for any
+    // architecture not explicitly specified. The current architecture strings that are
+    // known are:
+    //   i386, x86-64, armv6, armv7, armv7s, arm64, ppc, ppc64
+    // The empty string is taken to be 'unknown'.
+    if (!ctxt . CopyElementAsArray(p_array, MCNAME("min_os_version"), false, t_temp_array))
+        return false;
+
+    // SN-2015-02-04: [[ Merge-6.7.2 ]] If the array is empty, try to convert to a string.
+    if (!MCArrayIsEmpty(t_temp_array))
+    {
+        MCDeployArrayApplyCallbackContext t_context;
+        t_context . ctxt = &ctxt;
+        t_context . params = this;
+
+        bool t_success;
+        t_success = MCArrayApply(t_temp_array, MCDeployGetArchitectures, (void*)&t_context);
+        MCValueRelease(t_temp_array);
+
+        if (!t_success)
+            return false;
+    }
+    else
+    {
+        MCValueRelease(t_temp_array);
+        if (!ctxt . CopyElementAsString(p_array, MCNAME("min_os_version"), false, t_temp_string))
+            return false;
+
+        MCDeployPushMinOSVersion(this, kMCDeployArchitecture_Unknown, t_temp_string);
+        MCValueRelease(t_temp_string);
+    }
 	
 	return true;
 }
@@ -446,7 +564,7 @@ void MCIdeDeploy::exec_ctxt(MCExecContext& ctxt)
     if (!ctxt . EvalExprAsArrayRef(m_params, EE_UNDEFINED, &t_array))
         return;
 
-	MCDeployParameters t_params;
+    MCDeployParameters t_params;
     t_has_error = !t_params.InitWithArray(ctxt, *t_array);
 	
 	// If platform is iOS and we are not Mac then error
@@ -505,11 +623,10 @@ void MCIdeDeploy::exec_ctxt(MCExecContext& ctxt)
             ctxt . SetTheResultToCString(MCDeployErrorToString(t_error));
 		else
             ctxt . SetTheResultToEmpty();
-	}
+    }
     
     if (t_has_error && !t_soft_error)
         ctxt . Throw();
-    
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/engine/src/deploy.h b/engine/src/deploy.h
@@ -21,6 +21,27 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 
 ////////////////////////////////////////////////////////////////////////////////
 
+enum MCDeployArchitecture
+{
+    kMCDeployArchitecture_Unknown,
+    kMCDeployArchitecture_I386,
+    kMCDeployArchitecture_X86_64,
+    kMCDeployArchitecture_ARMV6,
+    kMCDeployArchitecture_ARMV7,
+    kMCDeployArchitecture_ARMV7S,
+    kMCDeployArchitecture_ARM64,
+    kMCDeployArchitecture_PPC,
+    kMCDeployArchitecture_PPC64,
+};
+
+struct MCDeployMinOSVersion
+{
+    // The architecture this version applies to.
+    MCDeployArchitecture architecture;
+    // The version word encoded as nibbles XXXX.YY.ZZ for X.Y.Z.
+    uint32_t version;
+};
+
 struct MCDeployParameters
 {
 	// The path to the engine binaries to use. On Windows and Linux this should
@@ -34,6 +55,11 @@ struct MCDeployParameters
 	// fields.
 	MCArrayRef version_info;
 
+    // When building for Mac/iOS, you can specify a min os version per arch
+    // slice.
+    MCDeployMinOSVersion *min_os_versions;
+    uindex_t min_os_version_count;
+    
 	// The root stackfile to be included in the standalone.
 	MCStringRef stackfile;
 	
@@ -108,6 +134,7 @@ struct MCDeployParameters
 			MCValueRelease(payload);
 			MCValueRelease(spill);
 			MCValueRelease(output);
+            MCMemoryDeleteArray(min_os_versions);
 	}
 	
 	// Creates using an array of parameters
diff --git a/engine/src/deploy_macosx.cpp b/engine/src/deploy_macosx.cpp
diff --git a/ide-support/revsaveasiosstandalone.livecodescript b/ide-support/revsaveasiosstandalone.livecodescript

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Binary submitted to App Store rejected due to minimum version mismatch`