Merge pull request #1773 from livecode/script-extensions

[[ ScriptExtensions ]] Support script library extension loading

Author: livecodeali

Documentation/dictionary/datagrid.lcdoc

@@ -1,9 +1,7 @@
-Name: Datagrid
+Library: Datagrid
 
 Type: object
 
-Syntax: Datagrid
-
 Summary: An object for forms or tables
 
 Description:

Toolset/home.livecodescript

@@ -525,16 +525,6 @@ function revInternal__StackFiles
          if tFolder begins with "." then next repeat
          put return & tComponentFolder & slash & tFolder after tFolders
       end repeat
-      
-      -- script libraries
-      repeat for each item tRepo in (revEnvironmentCommercialRepositoryPath() & comma & revEnvironmentRepositoryPath())
-         local tScriptLibrariesFolder
-         put tRepo & "/extensions/script-libraries" into tScriptLibrariesFolder
-         repeat for each line tFolder in folders(tScriptLibrariesFolder)
-            if tFolder begins with "." then next repeat
-            put return & tScriptLibrariesFolder & slash & tFolder after tFolders
-         end repeat
-      end repeat
    end if	
 
    local tStackFiles, tStackName
@@ -1183,32 +1173,24 @@ command revInternal__InitialiseLibraries
    revInternal_SetJAVA_HOME
 
    local tLoadList
-   put "revDatabaseLibrary" into tLoadList 
+   put "revCommonLibrary" into tLoadList 
+   put return & "revDatabaseLibrary" after tLoadList 
    put return & "revIDEDocumentationLibrary" after tLoadList
+   put return & "revMetadataLibrary" after tLoadList   
+   put return & "revSBLibrary" after tLoadList
    put return & "revideextensionlibrary" after tLoadList
    put return & "revIDELibrary" after tLoadList
    put return & "revidemessagehandlerlibrary" after tLoadList
    put return & "revBackScriptLibrary" after tLoadList 
-   put return & "revSBLibrary" after tLoadList
    put return & "revDeployLibrary" after tLoadList
    put return & "revDebuggerLibrary" after tLoadList 
-   put return & "revMetadataLibrary" after tLoadList
    put return & "revLibUrl" after tLoadList 
-   put return & "revCommonLibrary" after tLoadList 
    put return & "revPrintLibrary" after tLoadList 
    put return & "revAnimationLibrary" after tLoadList 
    put return & "revGeometryLibrary" after tLoadList 
    put return & "revXMLRPCLibrary" after tLoadList 
    put return & "revProfilesLibrary" after tLoadList 
    put return & "revTableLibrary" after tLoadList 
-   put return & "oauth2" after tLoadList
-   put return & "getopt" after tLoadList
-   put return & "mime" after tLoadList
-   put return & "diff" after tLoadList
-   put return & "messageauthentication" after tLoadList
-   put return & "dropbox" after tLoadList
-   put return & "httpd" after tLoadList
-   put return & "qr" after tLoadList
    put return & "revhtml5urllibrary" after tLoadList
 
    if revEnvironmentEditionProperty("autocomplete_pro") then
@@ -1218,14 +1200,6 @@ command revInternal__InitialiseLibraries
    if revEnvironmentEditionProperty("autocomplete") then
       put return & "autocomplete" after tLoadList
    end if
-
-   switch the editionType
-      case "professional"
-         put return & "remotedebugger" after tLoadList 
-         put return & "scriptprofiler" after tLoadList 
-      case "commercial"
-         put return & "aws" after tLoadList
-   end switch
 
    local tBackList
    put "revidedeveloperextensionlibrary" into tBackList
@@ -1240,7 +1214,8 @@ command revInternal__InitialiseLibraries
    put return & "revIDEProjectBrowserLibrary" after tBackList
 
    local tLib
-   repeat for each line tLib in tLoadList	 	
+   repeat for each line tLib in tLoadList	 
+      revInternal__Log "Message", "Loading library" && tLib	
       revInternal__LoadLibrary tLib
 	  if the result is not empty then
 	     revInternal__Log "Error", the result 
@@ -2062,12 +2037,21 @@ function revEnvironmentExternalsPath
 end revEnvironmentExternalsPath
 
 function revEnvironmentExtensionsPath
+   return line 1 of revEnvironmentExtensionsPaths()
+end revEnvironmentExtensionsPath
+
+function revEnvironmentExtensionsPaths
    if revEnvironmentIsInstalled() then
       return hookToolsPath("extensions", sToolsPath & "/Extensions")
    else
-      return revEnvironmentBinariesPath() & slash & "packaged_extensions"
+      -- 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
    end if
-end revEnvironmentExtensionsPath
+end revEnvironmentExtensionsPaths
 
 function revEnvironmentRuntimePath
   return hookToolsPath("runtime", sToolsPath & "/Runtime")

Toolset/libraries/revanimationlibrary.livecodescript

@@ -1,16 +1,16 @@
 script "revanimationlibrary"
 
-on revLoadLibrary
+on extensionInitialize
    if the target is me then
       insert the script of me into back
    end if
-end revLoadLibrary
+end extensionInitialize
 
-on revUnloadLibrary
+on extensionFinalize
    if the target is me then
       remove the script of me from back
    end if
-end revUnloadLibrary
+end extensionFinalize
 
 --------Animation Library--------
 local lOverRide

Toolset/libraries/revbackscriptlibrary.livecodescript

@@ -1,18 +1,18 @@
 script "revbackscriptlibrary"
 
-on revLoadLibrary
+on extensionInitialize
    if the target is me then
       insert the script of me into back
       revIDESubscribe "ideMouseMove"
    end if
-end revLoadLibrary
+end extensionInitialize
 
-on revUnloadLibrary
+on extensionFinalize
    if the target is me then
       remove the script of me from back
       revIDEUnsubscribeAll
    end if
-end revUnloadLibrary
+end extensionFinalize
 
 global gREVSuppressMessages
 
@@ -2972,46 +2972,6 @@ on revShutDown
 
 end revShutDown
 
-function revCombineFilePaths pPaths, pPaths2
-   -- combines file paths based on last item, where duplicates keeps list 1
-   set the itemDel to slash
-   
-   local tPaths
-   repeat for each line l in pPaths2
-      if the number of words in l is 0 then next repeat
-      put l into tPaths[item -1 of l]
-   end repeat
-   repeat for each line l in pPaths
-      if the number of words in l is 0 then next repeat
-      put l into tPaths[item -1 of l]
-   end repeat
-   
-   local tReturn
-   repeat for each element e in tPaths
-      put e & cr after tReturn
-   end repeat
-   delete last char of tReturn
-   return tReturn
-end revCombineFilePaths
-
-function revAbsoluteFolderListing pDirectory
-   local tReturn
-   if there is no directory pDirectory then return empty
-   put the directory into tReturn
-   set the directory to pDirectory
-   
-   local tFiles
-   put the files into tFiles
-   
-   local tOutput
-   repeat for each line l in tFiles
-      put the directory & slash & l & cr after tOutput
-   end repeat
-   delete last char of tOutput
-   set the directory to tReturn
-   return tOutput
-end revAbsoluteFolderListing
-
 function revCalculateRelativePath pRoot, pFile
   local tResult, tCount
   set the itemDel to "/"

Toolset/libraries/revcommonlibrary.livecodescript

@@ -1,16 +1,16 @@
 script "revcommonlibrary"
 
-on revLoadLibrary
+on extensionInitialize
    if the target is me then
       insert the script of me into back
    end if
-end revLoadLibrary
+end extensionInitialize
 
-on revUnloadLibrary
+on extensionFinalize
    if the target is me then
       remove the script of me from back
    end if
-end revUnloadLibrary
+end extensionFinalize
 
 function revTargetStack pWhich
    local tParse
@@ -1573,3 +1573,40 @@ function revRuggedId pObject
 
    return tId
 end revRuggedId
+
+function revAbsoluteFolderListing pDirectory
+   if there is no directory pDirectory then return empty
+
+   local tFiles
+   put files(pDirectory) into tFiles
+   
+   local tOutput
+   repeat for each line tFile in tFiles
+      put the directory & slash & tFile & return after tOutput
+   end repeat
+   delete last char of tOutput
+
+   return tOutput
+end revAbsoluteFolderListing
+
+function revCombineFilePaths pPaths, pPaths2
+   -- combines file paths based on last item, where duplicates keeps list 1
+   set the itemDel to slash
+   
+   local tPaths
+   repeat for each line l in pPaths2
+      if the number of words in l is 0 then next repeat
+      put l into tPaths[item -1 of l]
+   end repeat
+   repeat for each line l in pPaths
+      if the number of words in l is 0 then next repeat
+      put l into tPaths[item -1 of l]
+   end repeat
+   
+   local tReturn
+   repeat for each element e in tPaths
+      put e & cr after tReturn
+   end repeat
+   delete last char of tReturn
+   return tReturn
+end revCombineFilePaths

Toolset/libraries/revdatabaselibrary.livecodescript

@@ -1,8 +1,8 @@
 script "revdatabaselibrary"
 
-on revLoadLibrary
+on extensionInitialize
    if the target is not me then
-      pass "revLoadLibrary"
+      pass "extensionInitialize"
    end if	
    insert the script of me into front
 
@@ -14,14 +14,14 @@ on revLoadLibrary
          revSetDatabaseDriverPath revEnvironmentBinariesPath()
       end if
    end if
-end revLoadLibrary
+end extensionInitialize
 
-on revUnloadLibrary
+on extensionFinalize
    if the target is not me then
-      pass "revUnloadLibrary"
+      pass "extensionFinalize"
    end if	
    remove the script of me from front
-end revUnloadLibrary
+end extensionFinalize
 
 ####################################################################################################
 # Original comment by J.S

Toolset/libraries/revdebuggerlibrary.livecodescript

@@ -1,8 +1,8 @@
 script "revdebuggerlibrary"
 
-on revLoadLibrary
+on extensionInitialize
    if the target is not me then
-      pass "revLoadLibrary"
+      pass "extensionInitialize"
    end if
    insert the script of me into front
 
@@ -11,14 +11,14 @@ on revLoadLibrary
    end if
 
    __Initialize
-end revLoadLibrary
+end extensionInitialize
 
-on revUnloadLibrary
+on extensionFinalize
    if the target is not me then
-      pass "revUnloadLibrary"
+      pass "extensionFinalize"
    end if
    remove the script of me from front
-end revUnloadLibrary
+end extensionFinalize
 
 
 
@@ -203,7 +203,7 @@ function revDebuggerContexts
          #  debugger itself and anything that was called by the debugger, i.e. appears after a debugger
          #  call in the call stack.
 
-         if tStack is "revDebuggerLibrary" or tStack is "com.livecode.script-library.remotedebugger" then
+         if tStack is "revDebuggerLibrary" or tStack is "com.livecode.library.remotedebugger" then
             # No debugger stack contexts are placed onto the call stack, however we also need to remove
             # *any* contexts that appear after a trace, traceError or traceBreak (or traceDone although less important).
             --if item -2 of tContext is among the words of "trace traceError traceBreak traceDone" then
@@ -1992,7 +1992,7 @@ private function __StackAllowed pStack
    global gREVDevelopment
    if "development" is not in the environment or gREVDEvelopment then
       # With gREVDevelopment allow all stacks to be debugged except the debugger, as doing this will probably not work anyway.
-      if the short name of pStack is among the items of "revDebuggerLibrary,com.livecode.script-library.remotedebugger" then
+      if the short name of pStack is among the items of "revDebuggerLibrary,com.livecode.library.remotedebugger" then
          return false
       else
          return true

Toolset/libraries/revdeploylibrary.livecodescript

@@ -1,16 +1,16 @@
 script "revDeployLibrary"
 
-on revLoadLibrary
+on extensionInitialize
    if the target is me then
       insert the script of me into back
    end if
-end revLoadLibrary
+end extensionInitialize
 
-on revUnloadLibrary
+on extensionFinalize
    if the target is me then
       remove the script of me from back
    end if
-end revUnloadLibrary
+end extensionFinalize
 
 ////////////////////////////////////////////////////////////////////////////////
 

Toolset/libraries/revfrontscriptlibrary.livecodescript

@@ -1,18 +1,18 @@
 script "revfrontscriptlibrary"
 
-on revLoadLibrary
+on extensionInitialize
    if the target is not me then
-      pass "revLoadLibrary"
+      pass "extensionInitialize"
    end if	
    insert the script of me into front
-end revLoadLibrary
+end extensionInitialize
 
-on revUnloadLibrary
+on extensionFinalize
 	if the target is not me then
-		pass "revUnloadLibrary"
+		pass "extensionFinalize"
 	end if
    remove the script of me from front
-end revUnloadLibrary
+end extensionFinalize
 
 global gREVSuppressMessages
 local lRefreshAOTimerID