[[ RefactorSyntax ]] Fixes externals creation from the 'deploy' command

livecodesebastien · livecodesebastien · commit 34ef614705d9 · 2014-03-07T12:19:41.000Z
diff --git a/engine/src/deploy.cpp b/engine/src/deploy.cpp
@@ -123,10 +123,16 @@ bool MCDeployParameters::InitWithArray(MCExecContext &ctxt, MCArrayRef p_array)
 	MCValueAssign(auxillary_stackfiles, t_temp_array);
 	MCValueRelease(t_temp_array);
 	
-	if (!ctxt.CopyOptElementAsArray(p_array, MCNAME("externals"), false, t_temp_array))
-		return false;
-	MCValueAssign(externals, t_temp_array);
-	MCValueRelease(t_temp_array);
+	if (!ctxt.CopyOptElementAsString(p_array, MCNAME("externals"), false, t_temp_string))
+		return false;    
+    if (!MCStringIsEmpty(t_temp_string))
+    {
+        MCStringSplit(t_temp_string, MCSTR("\n"), nil, kMCStringOptionCompareExact, t_temp_array);
+        MCValueAssign(externals, t_temp_array);
+        MCValueRelease(t_temp_array);
+    }
+    else
+        MCValueAssign(externals, kMCEmptyArray);
 	
 	if (!ctxt.CopyOptElementAsString(p_array, MCNAME("startup_script"), false, t_temp_string))
 		return false;
diff --git a/engine/src/deploy_capsule.cpp b/engine/src/deploy_capsule.cpp
@@ -185,11 +185,11 @@ bool MCDeployCapsuleDefine(MCDeployCapsuleRef self, MCCapsuleSectionType p_type,
 
 bool MCDeployCapsuleDefineString(MCDeployCapsuleRef self, MCCapsuleSectionType p_type, MCStringRef p_string)
 {
-    MCAutoStringRefAsNativeChars t_auto_native;
+    MCAutoStringRefAsCString t_auto_cstring;
     uindex_t t_length;
     char_t* t_native;
-    /* UNCHECKED */ t_auto_native . Lock(p_string, t_native, t_length);
-    return MCDeployCapsuleDefine(self, p_type, t_native, t_length);
+    /* UNCHECKED */ t_auto_cstring . Lock(p_string);
+    return MCDeployCapsuleDefine(self, p_type, *t_auto_cstring, strlen(*t_auto_cstring) + 1);
 }
 
 bool MCDeployCapsuleDefineFromFile(MCDeployCapsuleRef self, MCCapsuleSectionType p_type, MCDeployFileRef p_file)

Original file line number	Diff line number	Diff line change
`@@ -185,11 +185,11 @@ bool MCDeployCapsuleDefine(MCDeployCapsuleRef self, MCCapsuleSectionType p_type,`
`185`	`185`
`186`	`186`	`bool MCDeployCapsuleDefineString(MCDeployCapsuleRef self, MCCapsuleSectionType p_type, MCStringRef p_string)`
`187`	`187`	`{`
`188`		`- MCAutoStringRefAsNativeChars t_auto_native;`
	`188`	`+ MCAutoStringRefAsCString t_auto_cstring;`
`189`	`189`	`uindex_t t_length;`
`190`	`190`	`char_t* t_native;`
`191`		`- /* UNCHECKED */ t_auto_native . Lock(p_string, t_native, t_length);`
`192`		`- return MCDeployCapsuleDefine(self, p_type, t_native, t_length);`
	`191`	`+ /* UNCHECKED */ t_auto_cstring . Lock(p_string);`
	`192`	`+ return MCDeployCapsuleDefine(self, p_type, t_auto_cstring, strlen(t_auto_cstring) + 1);`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`bool MCDeployCapsuleDefineFromFile(MCDeployCapsuleRef self, MCCapsuleSectionType p_type, MCDeployFileRef p_file)`