Merge remote-tracking branch 'origin/bugfix-20603' into bugfix-20603_develop

livecodeali · livecodeali · commit 977f2ab8747f · 2017-10-26T20:42:13.000+01:00
diff --git a/docs/notes/bugfix-20603.md b/docs/notes/bugfix-20603.md
@@ -0,0 +1 @@
+# Ensure extensions' resource folders are available in standalones
diff --git a/docs/notes/platforms.md b/docs/notes/platforms.md
@@ -50,6 +50,7 @@ The Mac engine supports:
 * 10.10.x (Yosemite) on Intel
 * 10.11.x (El Capitan) on Intel
 * 10.12.x (Sierra) on Intel
+* 10.13.x (High Sierra) on Intel
 
 ## iOS
 iOS deployment is possible when running LiveCode IDE on a Mac, and provided Xcode is installed and has been set in LiveCode *Preferences* (in the *Mobile Support* pane).
@@ -88,6 +89,7 @@ It will run on the following versions of Android:
 * 5.0-5.1 (Lollipop)
 * 6.0 (Marshmallow)
 * 7.0 (Nougat)
+* 8.0 (Oreo)
 
 To enable deployment to Android devices, you need to download the
 [Android SDK](https://developer.android.com/sdk/index.html#Other), and
diff --git a/engine/src/deploy.cpp b/engine/src/deploy.cpp
@@ -540,6 +540,17 @@ bool MCDeployWriteCapsule(const MCDeployParameters& p_params, MCDeployFileRef p_
             /* UNCHECKED */ MCArrayFetchValueAtIndex(p_params.redirects, i + 1, t_val);
 			t_success = MCDeployCapsuleDefineString(t_capsule, kMCCapsuleSectionTypeRedirect, (MCStringRef)t_val);
 		}
+
+    ////////
+    
+    // AL-2015-02-10: [[ Standalone Inclusions ]] Add the resource mappings, if any.
+    if (t_success)
+        for(uindex_t i = 0; i < MCArrayGetCount(p_params.library) && t_success; i++)
+        {
+            MCValueRef t_val;
+            /* UNCHECKED */ MCArrayFetchValueAtIndex(p_params.library, i + 1, t_val);
+            t_success = MCDeployCapsuleDefineString(t_capsule, kMCCapsuleSectionTypeLibrary, (MCStringRef)t_val);
+        }
     
     ////////
     
@@ -589,16 +600,7 @@ bool MCDeployWriteCapsule(const MCDeployParameters& p_params, MCDeployFileRef p_
 			if (t_success)
                 t_success = MCDeployCapsuleDefineFromStackFile(t_capsule, (MCStringRef)t_val, t_aux_stackfiles[i], false);
 		}
-	
-    // AL-2015-02-10: [[ Standalone Inclusions ]] Add the resource mappings, if any.
-    if (t_success)
-        for(uindex_t i = 0; i < MCArrayGetCount(p_params.library) && t_success; i++)
-        {
-            MCValueRef t_val;
-            /* UNCHECKED */ MCArrayFetchValueAtIndex(p_params.library, i + 1, t_val);
-            t_success = MCDeployCapsuleDefineString(t_capsule, kMCCapsuleSectionTypeLibrary, (MCStringRef)t_val);
-        }
-    
+
 	// Now add the externals, if any
 	if (t_success)
 		for(uindex_t i = 0; i < MCArrayGetCount(p_params.externals) && t_success; i++)
diff --git a/engine/src/mode_standalone.cpp b/engine/src/mode_standalone.cpp
@@ -387,32 +387,59 @@ bool MCStandaloneCapsuleCallback(void *p_self, const uint8_t *p_digest, MCCapsul
             MCresult -> sets("failed to read module");
             return false;
         }
-    
-        bool t_success;
-        t_success = true;
         
-        MCStreamRef t_stream;
-        t_stream = nil;
-        if (t_success)
-            t_success = MCMemoryInputStreamCreate(t_module_data.Bytes(), p_length, t_stream);
+        MCAutoValueRefBase<MCStreamRef> t_stream;
+        bool t_success = MCMemoryInputStreamCreate(t_module_data.Bytes(),
+                                                   p_length, &t_stream);
         
-        MCScriptModuleRef t_module;
+        MCScriptModuleRef t_module = nullptr;
         if (t_success)
-            t_success = MCScriptCreateModuleFromStream(t_stream, t_module);
+            t_success = MCScriptCreateModuleFromStream(*t_stream, t_module);
         
-        if (t_stream != nil)
-            MCValueRelease(t_stream);
+        if (t_success)
+        {
+            extern bool MCEngineAddExtensionFromModule(MCScriptModuleRef module);
+            t_success = MCEngineAddExtensionFromModule(t_module);
+        }
         
-        if (!t_success)
+        MCAutoStringRef t_module_resources;
+        if (t_success)
+            t_success = MCStringFormat(&t_module_resources, "%@/resources",
+                                       MCScriptGetNameOfModule(t_module));
+
+        MCAutoStringRef t_resources_path;
+        if (t_success && MCdispatcher -> fetchlibrarymapping(*t_module_resources,
+                                                             &t_resources_path))
         {
-            MCresult -> sets("failed to load module");
-            return false;
+            // Resolve the relative path
+            MCAutoStringRef t_path;
+            if (MCStringBeginsWith(*t_resources_path, MCSTR("./"),
+                                   kMCStringOptionCompareExact) && MCcmd)
+            {
+                uindex_t t_last_slash_index;
+                // On Android, we need to substitute in the whole of MCcmd so
+                // that the apk path resolution works
+#ifndef TARGET_SUBPLATFORM_ANDROID
+                if (!MCStringLastIndexOfChar(MCcmd, '/', UINDEX_MAX, kMCStringOptionCompareExact, t_last_slash_index))
+#endif
+                    t_last_slash_index = MCStringGetLength(MCcmd);
+                
+                MCRange t_range;
+                t_range = MCRangeMake(0, t_last_slash_index);
+                t_success = MCStringFormat(&t_path, "%*@/%@", &t_range, MCcmd, *t_resources_path);
+            }
+            else
+                t_path = *t_resources_path;
+            
+            extern bool MCEngineAddResourcePathForModule(MCScriptModuleRef module, MCStringRef path);
+            if (t_success)
+                t_success = MCEngineAddResourcePathForModule(t_module, *t_path);
         }
         
-        extern bool MCEngineAddExtensionFromModule(MCScriptModuleRef module);
-        if (!MCEngineAddExtensionFromModule(t_module))
+        if (!t_success)
         {
             MCScriptReleaseModule(t_module);
+            MCresult -> sets("failed to load module");
             return false;
         }
     }
diff --git a/ide-support/revsaveasandroidstandalone.livecodescript b/ide-support/revsaveasandroidstandalone.livecodescript
@@ -122,9 +122,8 @@ private command revSaveAsMobileStandaloneMain pStack, pApkFile, pTarget, pSettin
    set the itemDelimiter to comma
    
    -- Fetch the various options we need to initially build the app-bundle
-   local tName, tFiles, tVersionName, tVersionCode, tExternals, tIcon, tSplash, tKey, tUnsigned, tStatusBarIcon
+   local tName, tVersionName, tVersionCode, tExternals, tIcon, tSplash, tKey, tUnsigned, tStatusBarIcon
    put pSettings["name"] into tName
-   put pSettings["files"] into tFiles
    put pSettings["android,icon"] into tIcon
    put pSettings["android,key"] into tKey
    
@@ -288,7 +287,8 @@ private command revSaveAsMobileStandaloneMain pStack, pApkFile, pTarget, pSettin
       set the itemDelimiter to "."
       
       local tResolvedFileData
-      revSBResolveCopyFilesList tBaseFolder, "android", tFiles, tResolvedFileData
+      revSBUpdateSettingsForExtensions "android", pSettings
+      revSBResolveCopyFilesList tBaseFolder, "android", pSettings, tResolvedFileData
       
       repeat for each element tFile in tResolvedFileData
          -- Look for manifest template
@@ -699,6 +699,13 @@ private command revSaveAsMobileStandaloneMain pStack, pApkFile, pTarget, pSettin
       ------- Compile the Standalone
       revStandaloneProgress "Building executable..."
       
+      put tExternals into pSettings["externals"]
+
+      put "revsecurity:./librevsecurity" into pSettings["android,library"]
+      repeat for each line tEntry in tExternals
+         put return & tEntry & ":" & "./lib" & tEntry after pSettings["android,library"]
+      end repeat
+
       local tDeploy
       -- Update the deploy params with script library and extension inclusions
       revSBUpdateDeployParams pStack, "android", pSettings, tDeploy
@@ -712,16 +719,6 @@ private command revSaveAsMobileStandaloneMain pStack, pApkFile, pTarget, pSettin
       -- Stackfile to use
       put the effective filename of stack pStack into tDeploy["stackfile"]
       
-      -- Externals to reference (on Android we include drivers in this list)
-      put "revsecurity:./librevsecurity" into tDeploy["library"]
-      repeat for each line tEntry in tExternals
-         if not (tEntry begins with "db") then
-            put tEntry & return after tDeploy["externals"]
-         end if
-         put return & tEntry & ":" & "./lib" & tEntry after tDeploy["library"]
-      end repeat
-      delete the last char of tDeploy["externals"]
-      
       -- Output file to create
       put tArmLibsBuildFolder & slash & "librevandroid.so" into tDeploy["output"]
       
diff --git a/ide-support/revsaveasiosstandalone.livecodescript b/ide-support/revsaveasiosstandalone.livecodescript
@@ -160,9 +160,8 @@ private command revSaveAsMobileStandaloneMain pStack, pAppBundle, pTarget, pSett
    set the itemDelimiter to comma
    
    -- Fetch the various options we need to initially build the app-bundle
-   local tName, tFiles, tExternals, tDrivers
+   local tName, tExternals, tDrivers
    put pSettings["name"] into tName
-   put pSettings["files"] into tFiles
    
    if pSettings["ios,display name"] is empty then
       put tName into pSettings["ios,display name"]
@@ -255,7 +254,8 @@ private command revSaveAsMobileStandaloneMain pStack, pAppBundle, pTarget, pSett
    end if
    
    local tPlist, tCustomEntitlements
-   revCopyMobileFiles tFiles, tBaseFolder, pAppBundle, pTarget, tSDKs, tRedirects, tCopiedExternals, tCopiedFonts, tPlist, tCustomEntitlements
+   revSBUpdateSettingsForExtensions "ios", pSettings
+   revCopyMobileFiles pSettings, tBaseFolder, pAppBundle, pTarget, tSDKs, tRedirects, tCopiedExternals, tCopiedFonts, tPlist, tCustomEntitlements
    revCopyMobileStackFiles tStackFiles, tBaseFolder, pAppBundle
    
    -- Copy in the appropriate externals and drivers
@@ -280,6 +280,23 @@ private command revSaveAsMobileStandaloneMain pStack, pAppBundle, pTarget, pSett
       end if
    end if
    
+   -- Externals to reference
+   -- MM-2012-09-18: Use the new copied externals array instead of the copy files.
+   --
+   local tDeployExternals, tLibraryMappings
+   repeat for each key tExternalName in tCopiedExternals
+      local tExternalRec
+      put tCopiedExternals[tExternalName] into tExternalRec
+      if tExternalRec["type"] is among the words of "external external-tmp" then
+         put tExternalName & return after tDeployExternals
+      end if
+      put tExternalName & ":" & "./" & tExternalRec["location"] & return after tLibraryMappings
+   end repeat
+   delete the last char of tDeployExternals
+   put tDeployExternals into pSettings["externals"]
+   delete the last char of tLibraryMappings
+   put tLibraryMappings into pSettings["ios,library"]
+   
    local tDeploy
    -- Update the deploy params with script library and extension inclusions
    revSBUpdateDeployParams pStack, "ios", pSettings, tDeploy
@@ -469,20 +486,6 @@ private command revSaveAsMobileStandaloneMain pStack, pAppBundle, pTarget, pSett
    -- Stackfile to use
    put the effective filename of stack pStack into tDeploy["stackfile"]
    
-   -- Externals to reference
-   -- MM-2012-09-18: Use the new copied externals array instead of the copy files.
-   --
-   repeat for each key tExternalName in tCopiedExternals
-      local tExternalRec
-      put tCopiedExternals[tExternalName] into tExternalRec
-      if tExternalRec["type"] is among the words of "external external-tmp" then
-         put tExternalName & return after tDeploy["externals"]
-      end if
-      put tExternalName & ":" & "./" & tExternalRec["location"] & return after tDeploy["library"]
-   end repeat
-   delete the last char of tDeploy["externals"]
-   delete the last char of tDeploy["library"]
-   
    -- Put the redirects if any
    -- MM-2014-10-06: [[ Bug 13583 ]] Due to issues with the redirects, we use symlinks with the iOS 8 sim.
    -- PM-2016-09-16: [[ Bug 18414 ]] iOS 10 - tSDKs["sim"]["suffix"] is x_y on iOS x.y
@@ -938,14 +941,15 @@ end addToManifest
 --   foobar/baz -> <base>/foobar/baz
 --   C:/foobar/baz -> <base>/baz
 --
-private command revCopyMobileFiles pFiles, pBaseFolder, pAppBundle, pAppTarget, pSDKs, @rRedirects, @rExternals, @rFonts, @rPlist, @rCustomEntitlements
+private command revCopyMobileFiles pSettings, pBaseFolder, pAppBundle, pAppTarget, pSDKs, @rRedirects, @rExternals, @rFonts, @rPlist, @rCustomEntitlements
    revStandaloneProgress "Copying files..."
    
    -- Only use redirects in simulator 4.x
    -- MM-2012-03-26: revMobileComputeTargetSuffix has changed for 5.1 support.  Added device check to make
    -- sure that we don't try and use redirects for device builds.
    -- MM-2012-09-18: Since we now no longer support sims before 4.3, we always use redirects for sim builds.
    --
+   
    local tUseRedirects
    if pAppTarget is not "Device" then
       put true into tUseRedirects
@@ -955,7 +959,7 @@ private command revCopyMobileFiles pFiles, pBaseFolder, pAppBundle, pAppTarget,
    put empty into rRedirects
    
    local tFileData
-   revSBResolveCopyFilesList pBaseFolder, "ios", pFiles, tFileData
+   revSBResolveCopyFilesList pBaseFolder, "ios", pSettings, tFileData
    
    -- Compute a list of the files we need to copy. This is in the form
    --   <target> [tab] <source>
diff --git a/ide-support/revsaveasstandalone.livecodescript b/ide-support/revsaveasstandalone.livecodescript
@@ -530,7 +530,7 @@ private command revStandaloneCopyInclusions pStack, pStackFileList, pStackSource
    
    revCopyScriptLibraries pStack, pTarget
    
-   revCopyFiles pDirectory, pStackPath
+   revCopyFiles pTarget, pDirectory, pStackPath
    
    -- copy database drivers
    revCopyDatabaseDrivers pTarget, pStackSourceFile, pStandalonePath, pEngineSourceFile
@@ -564,18 +564,6 @@ private function revStandaloneInitialDeployParams pTarget, pStackSourceFile, pSt
       put return & "if there is a stack" && quote & tLine & quote && "then library" && quote & tLine & quote after tDeployInfo["startup_script"]
    end repeat
    
-   # AL-2015-02-04: [[ Standalone Resources ]] Add (universal) external names and resource mappings to the deploy parameters
-   if sStandaloneSettingsA["externals"] is not empty then
-      put sStandaloneSettingsA["externals"] into tDeployInfo["externals"]
-   end if
-   
-   local tPlatformDetailsA, tPlatform
-   put revStandalonePlatformDetails(pTarget) into tPlatformDetailsA
-   put tPlatformDetailsA["platform"] into tPlatform
-   if sStandaloneSettingsA[tPlatform & ",library"] is not empty then
-      put sStandaloneSettingsA[tPlatform & ",library"] into tDeployInfo["library"]
-   end if
-   
    return tDeployInfo
 end revStandaloneInitialDeployParams
 
@@ -1482,44 +1470,19 @@ end revCopyIcons
 #####################################################################
 
 
-private command revCopyFiles pDirectory, pStackPath
+private command revCopyFiles pTarget, pDirectory, pStackPath
+   local tFileData
+   revSBUpdateSettingsForExtensions pTarget, sStandaloneSettingsA
+   revSBResolveCopyFilesList pStackPath, pTarget, sStandaloneSettingsA, tFileData
+   
    local tName,tDir
    revStandaloneProgress "Copying files..."
-   set the itemDel to "/"
-   repeat for each line tFile in sStandaloneSettingsA["files"]
-      if the last item of tFile is not "*" then
-         if there is not a file tFile then
-            put tFile into tName
-            put pStackPath & "/" before tFile
-         else
-            put item -1 of tFile into tName
-         end if
-      else
-         delete the last item of tFile
-         --if there is not a folder tFile then
-         if there is a folder (pStackpath & slash & tFile) then
-            put tFile into tName
-            put pStackpath & slash before tFile
-         else
-            put item -1 of tFile into tName
-         end if
-      end if
-      
-      put empty into tDir
-      repeat for each item tFolder in item 1 to -2 of tName
-         put tFolder & "/" after tDir
-         if there is not a folder (pDirectory & tDir) then
-            create folder pDirectory & tDir
-         end if
-      end repeat
-      if revResourceExists(tFile) then
-         ## EJB 2014-07-30: [[ Bug 12864 ]] Ensure a relative folder in Copy Files is converted to an absolute path
-         --revCopyFile tFile, pDirectory & item 1 to -2 of tName
-         if there is a file tFile then
-            revSBCopyFileToFolder tFile, pDirectory & item 1 to -2 of tName, "revStandaloneProgressCallback", the long id of me
-         else -- it's a folder
-            revSBCopyFolderToDestination tFile, pDirectory & item 1 to -2 of tName, "revStandaloneProgressCallback", the long id of me
-         end if
+   set the itemDelimiter to slash
+   repeat for each element tFile in tFileData
+      revSBEnsureFolder pDirectory & slash & item 1 to -2 of tFile["name"]
+      if revResourceExists(tFile["resolved"]) then
+         revSBCopyFileToFile tFile["resolved"], pDirectory & slash & tFile["name"], \
+               "revStandaloneProgressCallback", the long id of me
       else
          revStandaloneAddWarning "File to include in standalone not found:" && quote & tFile & quote
       end if
@@ -2150,15 +2113,13 @@ private command revAddExternal pExternalName
    put pExternalName after sStandaloneSettingsA["externals"]
 end revAddExternal
 
-constant kSeparator = ":"
 private command revAddMapping pPlatform, pName, pLocation
    -- The name comes in without 'db' in front of it for the existing database
    -- drivers, but it needs to be 'db*'.
    if pName is among the items of "sqlite,postgres,odbc,mysql,oracle" then
       put "db" before pName
    end if
-   if sStandaloneSettingsA[pPlatform & ",library"] is not empty then put return after sStandaloneSettingsA[pPlatform & ",library"]
-   put pName & kSeparator & "./" & pLocation after sStandaloneSettingsA[pPlatform & ",library"]
+   revSBAddLibraryMapping pPlatform, pName, pLocation, sStandaloneSettingsA
 end revAddMapping
 
 # AL-2015-01-29: [[ Scriptify IDE ]] Factor out external copy function to ensure external is included in deploy params
diff --git a/ide-support/revsblibrary.livecodescript b/ide-support/revsblibrary.livecodescript

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Ensure extensions' resource folders are available in standalones`