Merge remote-tracking branch 'monte/coderesources' into develop

Author: livecodeali

Toolset/home.livecodescript

@@ -525,6 +525,21 @@ function revInternal__StackFiles
          if tFolder begins with "." then next repeat
          put return & tComponentFolder & slash & tFolder after tFolders
       end repeat
+      
+      -- commercial extensions (ensure they are loaded from the repo)
+      local tExtensionFolder
+      put revEnvironmentCommercialRepositoryPath() & "/extensions/script-libraries" into tExtensionFolder
+      repeat for each line tFolder in folders(tExtensionFolder)
+         if tFolder begins with "." then next repeat
+         put return & tExtensionFolder & slash & tFolder after tFolders
+      end repeat
+      
+      -- extensions (ensure they are loaded from the repo)
+      put revEnvironmentRepositoryPath() & "/extensions/script-libraries" into tExtensionFolder
+      repeat for each line tFolder in folders(tExtensionFolder)
+         if tFolder begins with "." then next repeat
+         put return & tExtensionFolder & slash & tFolder after tFolders
+      end repeat
    end if	
 
    local tStackFiles, tStackName
@@ -2052,12 +2067,7 @@ function revEnvironmentExtensionsPaths
    if revEnvironmentIsInstalled() then
       return hookToolsPath("extensions", sToolsPath & "/Extensions")
    else
-      -- Load the real extensions rather than the packaged versions
-      local tPaths
-      put revEnvironmentRepositoryPath() & slash & "extensions" into tPaths
-      put return & revEnvironmentCommercialRepositoryPath() \
-            & slash & "extensions" after tPaths
-      return tPaths
+      return sBinariesPath & slash & "packaged_extensions"
    end if
 end revEnvironmentExtensionsPaths
 
@@ -2168,50 +2178,53 @@ end revEnvironmentBinariesPath
 
 // SN-2015-05-15: [[ DeployAllPlatforms ]] Allow the deployment to happen for any
 //  platform, from any repository platform
-function revEnvironmentNonNativeBinariesPath pPlatform
-   local tNonNativeBinariesPath, tReleaseFolder, tDebugFolder
-   put sBinariesPath into tNonNativeBinariesPath
-   
-   set the itemDelimiter to slash
-   
-   // If the platform is Linux, there will be archs
-   if the platform is "linux" then
-      delete item -3 to -1 of tNonNativeBinariesPath
-   else
-      delete item -2 to -1 of tNonNativeBinariesPath
-   end if
-   
-   // Init to lower-case, will change if Mac platform
-   put "release" into tReleaseFolder
-   put "debug" into tDebugFolder
+function revEnvironmentNonNativeBinariesPath pPlatform, pSDK
+   local tNonNativeBinariesPath
+   put sRepositoryPath into tNonNativeBinariesPath
 
    switch pPlatform
       case "Windows"
-         put slash & "windows" after tNonNativeBinariesPath
+         put slash & "win-x86-bin" after tNonNativeBinariesPath
+         break
+      case "Windows x86-64"
+      case "Windows x64"
+      case "Windows x86_64"
+         put slash & "win-x86_64-bin" after tNonNativeBinariesPath
          break
       case "Linux"
-         put slash & "linux/i386" after tNonNativeBinariesPath
+         put slash & "linux-x86-bin" after tNonNativeBinariesPath
          break
+      case "Linux x86-64"
       case "Linux x64"
-         put slash & "linux/x86_64" after tNonNativeBinariesPath
+      case "Linux x86_64"
+         put slash & "linux-x86_64-bin" after tNonNativeBinariesPath
+         break
+      case "Linux armv6_hf"
+         put slash & "linux-armv6_hf-bin" after tNonNativeBinariesPath
          break
       case "MacOS"
-      case "MacOSX PowerPC-32"
       case "MacOSX x86-32"
-         put slash & "mac" after tNonNativeBinariesPath
-         put "Release" into tReleaseFolder
-         put "Debug" into tDebugFolder
+      case "MacOSX x86_32"
+      case "MacOSX x86-64"
+      case "MacOSX x64"
+      case "MacOSX x86_64"
+         put slash & "mac-bin" after tNonNativeBinariesPath
+         break
+      case "Android"
+      case "Android armv6"
+         put slash & "android-armv6-bin" after tNonNativeBinariesPath
+         break
+      case "Emscripten"
+      case "HTML5"
+         put slash & "emscripten-bin" after tNonNativeBinariesPath
+         break
+      case "iOS"
+         put slash & "ios-bin" & slash & pSDK after tNonNativeBinariesPath
          break
       default 
          return empty
    end switch
 
-   if the last item of sBinariesPath is "release" then
-      put slash & tReleaseFolder after tNonNativeBinariesPath
-   else
-      put slash & tDebugFolder after tNonNativeBinariesPath
-   end if
-   
    return tNonNativeBinariesPath
 end revEnvironmentNonNativeBinariesPath
 

Toolset/libraries/revideextensionlibrary.livecodescript

@@ -1047,12 +1047,94 @@ private command __extensionLoad pID, pExtensionDataA
          tError, tIDEExtension, tSourceFile, tToLoadA, true
 end __extensionLoad
 
+private command __MapCodeLibraryForIDE pFolder
+   local tLibraries
+   if revEnvironmentIsInstalled() and \
+         pFolder begins with revEnvironmentToolsPath() and \
+         the platform is "MacOS" then
+      -- special case bundled extensions must load code from within MacOS dir
+      -- the libs to load should be in Contents/MacOS/<extension>/
+      local tExtension
+      set the itemDelimiter to slash
+      put item -2 of pFolder into tExtension
+      
+      put files(specialFolderPath("engine") & "/" & tExtension) & return & \
+            folders(specialFolderPath("engine") & "/" & tExtension) into tLibraries
+      filter tLibraries without ".*"
+      
+      if tLibraries is not empty then
+         set the itemDelimiter to "."
+         repeat for each line tLibrary in tLibraries
+            -- remove extension
+            delete the last item of tLibrary
+            if tLibrary is not empty then
+               set the revLibraryMapping[tLibrary] to "./" & tExtension & "/" & tLibrary
+            end if
+         end repeat
+      end if
+   else
+      -- code folders should be platform ID triples however for the
+      -- time being as we have no way to access the data required to 
+      -- determine the options section of the platform ID so we filter only
+      -- arch and platform and hope for the best. Ideally we would have
+      -- access to a build options string and give a complete match precedence.
+      local tCodeFolders
+      put folders(pFolder) into tCodeFolders
+      switch the platform
+         case "MacOS"
+            filter tCodeFolders with "*-mac*"
+            break
+         case "Win32"
+            filter tCodeFolders with "*-win*"
+            break
+         default
+            filter tCodeFolders with "*-"& toLower(the platform) & "*"
+            break
+      end switch
+      
+      local tFilteredCodeFolders
+      filter tCodeFolders with the processor & "-*" into tFilteredCodeFolders
+      split tFilteredCodeFolders by return as set
+      if the platform is "MacOS" then
+         -- explicit processor should take precedence over universal builds but
+         -- in the event multiple libraries are included and some are universal
+         -- we must merge
+         local tUniveralFilteredCodeFolders
+         filter tCodeFolders with "universal-*" into tUniveralFilteredCodeFolders
+         split tUniveralFilteredCodeFolders by return as set
+         union tFilteredCodeFolders with tUniveralFilteredCodeFolders
+      end if
+      
+      repeat for each key tFolder in tFilteredCodeFolders
+         put files(pFolder & "/" & tFolder) & return & \
+               folders(pFolder & "/" & tFolder) into tLibraries
+         filter tLibraries without ".*"
+         
+         if tLibraries is not empty then
+            set the itemDelimiter to "."
+            repeat for each line tLibrary in tLibraries
+               -- remove extension
+               delete the last item of tLibrary
+               if tLibrary is not empty then
+                  set the revLibraryMapping[tLibrary] to pFolder & "/" & tFolder & "/" & tLibrary
+               end if
+            end repeat
+         end if
+      end repeat
+   end if
+end __MapCodeLibraryForIDE
+
 private command __LoadExtension pCacheIndex, pSourceType, pSourceFile, pFolder, pStatus, @xError
    if xError is empty then
       if pSourceType is "lcb" then
-         local tResources, tModule
+         local tResources, tModule, tCode
          put pFolder & slash & "resources" into tResources
          put pFolder & slash & "module.lcm" into tModule
+         put pFolder & slash & "code" into tCode
+         # map code before loading extension
+         if there is a folder tCode then
+            __MapCodeLibraryForIDE tCode
+         end if
          # If we have a resources folder then load with resource path
          if there is a folder tResources then
             load extension from file tModule with resource path tResources

Toolset/libraries/revinitialisationlibrary.livecodescript

@@ -24,7 +24,7 @@ command revInternal__LoadLibrary pLibrary, pFullPath
       put kLCLibraryPrefix & "." & pLibrary into tStackName
    else if the environment begins with "development" and \
          there is a stack pFullPath then
-      put the name of stack pFullPath into tStackName
+      put the short name of stack pFullPath into tStackName
    else
       return "no stack for library" && pLibrary
    end if