Merge branch 'develop-8.2' into merge-develop-8.2-17-12-19

montegoulding · montegoulding · commit 3eed3bb69f28 · 2017-12-19T06:00:16.000+11:00
diff --git a/engine/rsrc/emscripten-startup-template.livecodescript b/engine/rsrc/emscripten-startup-template.livecodescript
@@ -11,7 +11,7 @@ constant kStartupFolder = "/boot/standalone"
 constant kStartupStackFile = "/boot/standalone/__boot.livecode"
 -- Directory containing auxiliary stack files
 constant kAuxStackFolder = "/boot/auxiliary_stackfiles"
--- Extension list file
+-- Auxiliary stack file list
 constant kAuxStackListFile = "/boot/auxiliary_stackfiles/auxiliary_stackfiles.txt"
 -- Directory containing extensions
 constant kExtensionFolder = "/boot/extensions"
@@ -21,7 +21,7 @@ constant kExtensionListFile = "/boot/extensions/extensions.txt"
 on startup
    local tError, tFolder, tFile, tByteString, tByte
    local tStackName, tStackData, tStackHashString
-   local tModuleList, tModuleName
+   local tModuleList, tModuleName, tAuxiliaryList
    try
       ----------------------------------------------------------------
       -- Create standard filesystem layout
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -522,16 +522,10 @@ IO_stat MCDispatch::readstartupstack(IO_handle stream, MCStack*& r_stack)
     // crash when searching substacks.
     stacks = t_stack;
     
-#ifndef _MOBILE
-	// Make sure parent script references are up to date.
-	if (s_loaded_parent_script_reference)
-		t_stack -> resolveparentscripts();
-#else
 	// Mark the stack as needed parentscript resolution. This is done after
 	// aux stacks have been loaded.
 	if (s_loaded_parent_script_reference)
 		t_stack -> setextendedstate(True, ECS_USES_PARENTSCRIPTS);
-#endif
     
     r_stack = t_stack;
 	return IO_NORMAL;
diff --git a/engine/src/mode_standalone.cpp b/engine/src/mode_standalone.cpp
@@ -972,6 +972,11 @@ IO_stat MCDispatch::startup(void)
 	
 	// Now open the main stack.
 	t_mainstack-> extraopen(false);
+    
+    // Resolve parent scripts *after* we've loaded aux stacks.
+    if (t_mainstack -> getextendedstate(ECS_USES_PARENTSCRIPTS))
+        t_mainstack -> resolveparentscripts();
+    
 	send_startup_message();
 	if (!MCquit)
 		t_mainstack -> open();
diff --git a/ide-support/revsaveasandroidstandalone.livecodescript b/ide-support/revsaveasandroidstandalone.livecodescript
@@ -111,14 +111,6 @@ private command revSaveAsMobileStandaloneMain pStack, pApkFile, pTarget, pSettin
    -- Manually remove built-in implementations from detected script library inclusions
    revSBRemoveInclusions pStack, "android", tConfirm, pSettings
    
-   -- Manually include the common library
-   revSBAddInclusion "Common", "scriptLibraries", pSettings
-   
-   -- Include profile library if needed
-   if pSettings["includeProfiles"] is not empty then 
-      revSBAddInclusion "Profiles", "scriptLibraries", pSettings
-   end if
-   
    -- Make sure old-style keys are retained, and updated with new information
    -- from inclusions pane of standalone settings GUI
    revSBConvertSettingsForPlatform pSettings, "android"
diff --git a/ide-support/revsaveasemscriptenstandalone.livecodescript b/ide-support/revsaveasemscriptenstandalone.livecodescript
@@ -67,7 +67,7 @@ command revSaveAsEmscriptenStandalone pStack, pOutputFolder, pSettings
    local tDeploy
    -- Update the deploy params with script library and extension inclusions
    revSBUpdateDeployParams pStack, "emscripten", pSettings, tDeploy
-   
+
    local tError
    try
       ---------- Check deployment entitlement
@@ -486,7 +486,8 @@ private function getPreparedStackAsData pStackFile, pBuildFolder
    local tStackData
    
    put the long id of stack pStackFile into tStack
-   
+   local tName
+   put the short name of stack pStackFile into tName
    try
       if revIDEStackNameIsIDEStack(the name of tStack) then
          -- Don't manipulate IDE stacks if for some reason someone
@@ -514,22 +515,22 @@ private function getPreparedStackAsData pStackFile, pBuildFolder
          end if
          
          -- Save the modified stack to the temporary file
-         lock messages
          lock screen
          
          save tStack as tTempFile with newest format
          put the result into tResult
          if tResult is not empty then
             throw tTempFile & ":" && tResult
          end if
-         set the filename of tStack to pStackFile
+         
+         set the filename of stack tName to pStackFile
          
          -- Revert to unmodified state
-         revert tStack
-         set the defaultStack to the short name of tStack
+         
+         revert stack tName
+         set the defaultStack to tName
          
          unlock screen
-         unlock messages
          
       end if
       
diff --git a/ide-support/revsaveasiosstandalone.livecodescript b/ide-support/revsaveasiosstandalone.livecodescript
@@ -99,14 +99,6 @@ private command revSaveAsMobileStandaloneMain pStack, pAppBundle, pTarget, pSett
       end if
    end if
    
-   -- Manually include the common library
-   revSBAddInclusion "Common", "scriptLibraries", pSettings
-   
-   -- Include profile library if needed
-   if pSettings["includeProfiles"] is not empty then 
-      revSBAddInclusion "Profiles", "scriptLibraries", pSettings
-   end if
-   
    -- Get the development root for device builds
    -- MM-2012-09-18: Rejiged the SDKs we use.  Things are now split up into sim, armv7, armv7, 
    -- since we now potentially need to use different SDKs for each.
diff --git a/ide-support/revsaveasstandalone.livecodescript b/ide-support/revsaveasstandalone.livecodescript
@@ -528,8 +528,6 @@ private command revStandaloneCopyInclusions pStack, pStackFileList, pStackSource
    -- copy resources (inclusions) to files
    revCopyResources pStack, pStackFileList, pDirectory
    
-   revCopyScriptLibraries pStack, pTarget
-   
    revCopyFiles pTarget, pDirectory, pStackPath
    
    -- copy database drivers
@@ -1152,25 +1150,6 @@ private function revPlatformCount
    return sPlatformCount
 end revPlatformCount
 
-# Adds the appropriate script libraries to the standalone settings
-private command revCopyScriptLibraries pStack, pPlatform
-   # AL-2015-02-03: [[ Scriptify IDE ]] Ensure revCommonLibrary is always included in a standalone
-   revSBAddInclusion "Common", "scriptLibraries", sStandaloneSettingsA
-   
-   -- data grid
-   // SN-2015-10-19: [[ Bug 16238 ]] DataGrid can be included on the wish of the user - in case the standalone stack
-   //  will load stacks using DataGrid, for instance.
-   if ("data grid templates" is in the subStacks of stack pStack or "DataGrid" is among the lines of sStandaloneSettingsA["scriptLibraries"]) \
-         and there is a stack "revDataGridLibrary" then
-      set the mainStack of stack "revDataGridLibrary" to pStack
-   end if
-   
-   // AL-2015-04-28: [[ Bug 15244 ]] Include profiles library if needed
-   if sStandaloneSettingsA["includeProfiles"] is not empty then 
-      revSBAddInclusion "Profiles", "scriptLibraries", sStandaloneSettingsA
-   end if
-end revCopyScriptLibraries
-
 #####################################################################
 # Copies general resources to the standalone stack and then does
 # what it needs to to substacks etc.
@@ -1605,12 +1584,6 @@ command revReset
    set the fileType to sResetA["fileType"]
    unlock messages
    try
-      # MW-2009-07-18: Media does not have a datagrid library and so this breaks if we don't
-      #   double check it exists there first.
-      if there is a stack "revDataGridLibrary" then
-         set the mainStack of stack "revDataGridLibrary" to "revDataGridLibrary"
-      end if
-      
       # TH-2008-07-08 :: Bug 6444, locking messages around this handler to prevent calling of preopencard handlers
       # in the stacks being built
       local tLineNumber
diff --git a/ide-support/revsblibrary.livecodescript b/ide-support/revsblibrary.livecodescript
@@ -2083,6 +2083,12 @@ command revSBUpdateDeployParams pStack, pTarget, pStandaloneSettings, @xDeployPa
    # AL-2015-02-04: [[ Standalone Resources ]] Add (universal) external names to the deploy parameters
    put pStandaloneSettings["externals"] into tExternals
    
+   revSBAddInclusion "Common", "scriptLibraries", pStandaloneSettings
+   
+   if pStandaloneSettings["includeProfiles"] is not empty then 
+      revSBAddInclusion "Profiles", "scriptLibraries", pStandaloneSettings
+   end if
+   
    -- auxiliary_stackfiles key might not be empty
    put pStandaloneSettings["auxiliary_stackfiles"] into tAuxiliaryStackfiles
    
@@ -2161,13 +2167,7 @@ command revSBUpdateDeployParams pStack, pTarget, pStandaloneSettings, @xDeployPa
    
    -- If the datagrid is used, then include the library as an aux stack
    if tIncludeDataGrid or "data grid templates" is in the subStacks of stack pStack and there is a stack "revDataGridLibrary" then
-      local tStackFiles
-      put the stackFiles of stack "revDataGridLibrary" into tStackFiles
-      split tStackFiles by return and comma
-      repeat for each key tStack in tStackFiles
-         appendToStringList the effective filename of  stack tStack, tAuxiliaryStackFiles
-      end repeat
-      appendToStringList the effective filename of stack "revDataGridLibrary", tAuxiliaryStackFiles
+      revSBAddDataGridToAuxiliaryStackFiles tAuxiliaryStackFiles
    end if
    
    put tAuxiliaryStackFiles into xDeployParams["auxiliary_stackfiles"]
@@ -2177,6 +2177,16 @@ command revSBUpdateDeployParams pStack, pTarget, pStandaloneSettings, @xDeployPa
    put tLibraryMapping into xDeployParams["library"]
 end revSBUpdateDeployParams
 
+command revSBAddDataGridToAuxiliaryStackFiles @xAuxiliaryStackFiles
+   local tStackFiles
+   put the stackFiles of stack "revDataGridLibrary" into tStackFiles
+   split tStackFiles by return and comma
+   repeat for each key tStack in tStackFiles
+      appendToStringList the effective filename of stack tStack, xAuxiliaryStackFiles
+   end repeat
+   appendToStringList the effective filename of stack "revDataGridLibrary", xAuxiliaryStackFiles
+end revSBAddDataGridToAuxiliaryStackFiles
+
 local sBuiltInInclusions
 
 private command __InitialiseBuiltInInclusions
