Merge pull request livecode#3884 from livecodefraser/mergext-bundled

peter-b · peter-b · commit 705f04954018 · 2016-04-11T16:19:30.000+01:00
Include MergExt into the installed IDE application
diff --git a/Installer/package.txt b/Installer/package.txt
@@ -33,6 +33,7 @@ installer LiveCode
 	include Documentation
 	include Toolchain.[[TargetPlatform]]
 	include Extensions
+	include MergExt
 	codesign
 		include Engine.[[TargetPlatform]]
 		with TargetFolder as [[ToolsFolder]] do
@@ -105,6 +106,10 @@ component Externals
 	emit externals to "[[TargetFolder]]/Externals/Externals.txt"
 	emit dbdrivers to "[[TargetFolder]]/Externals/Database Drivers/Database Drivers.txt"
 
+component MergExt
+	into [[ToolsFolder]] place
+		rfolder "mergext:MergExt"
+
 component Uninstaller
 	if TargetPlatform is "Windows" then
 		place uninstaller at "[[TargetFolder]]/.setup.exe"
diff --git a/builder/builder_utilities.livecodescript b/builder/builder_utilities.livecodescript
@@ -1,4 +1,6 @@
 ﻿script "BuilderUtilities"
+constant kMergExtVersion = "2016-4-1"
+
 local sEngineDir
 local sWorkDir
 local sOutputDir
@@ -315,6 +317,14 @@ function builderBuiltNotesFolder
    return builderRepoFolder()
 end builderBuiltNotesFolder
 
+function builderMergExtVersion
+   return kMergExtVersion
+end builderMergExtVersion
+
+function builderMergExtFolder
+   return builderRepoFolder() & slash & "MergExt-Unpacked"
+end builderMergExtFolder
+
 -- Folder for storing guide Markdown files that are generated as part
 -- of the build process.
 function builderBuiltGuidesFolder
@@ -534,3 +544,53 @@ end windowsManifest
 function macPList
    return url ("file:" & builderSystemFolder() & slash & "mac_info.plist")
 end macPList
+
+////////////////////////////////////////////////////////////////////////////////
+
+private function builderMergExtUrl pMergExtVersion, pEdition
+   return "https://downloads.livecode.com/mergext/mergExt_" & pEdition & "_" & pMergExtVersion & ".zip"
+end builderMergExtUrl
+
+private function builderMergExtDownloadedFilePath pMergExtVersion, pEdition
+   return builderRepoFolder() & slash & "MergExt-" & pEdition & "-" & pMergExtVersion & ".zip"
+end builderMergExtDownloadedFilePath
+
+command builderMergExtEnsureZip pMergExtVersion, pEdition
+   local tZipPath
+   put builderMergExtDownloadedFilePath(pMergExtVersion, pEdition) into tZipPath
+   if there is not a file tZipPath then
+      local tUrl
+      put builderMergExtUrl(pMergExtVersion, pEdition) into tUrl
+      builderLog "message", "Downloading MergExt to" && tZipPath
+      get shell(merge("curl -o '[[tZipPath]]' '[[tUrl]]'"))
+      if the result is not zero then
+         builderLog "error", "Failed to download MergExt zip:" && it
+         throw "failure"
+      end if
+   end if
+end builderMergExtEnsureZip
+
+command builderMergExtUnpack pMergExtVersion, pEdition
+   builderMergExtEnsureZip pMergExtVersion, pEdition
+   
+   local tMergExtFolder
+   local tMergExtZip
+   put builderMergExtFolder() into tMergExtFolder
+   put builderMergExtDownloadedFilePath(pMergExtVersion, pEdition) into tMergExtZip
+   
+   if there is a folder tMergExtFolder then
+      get shell(merge("rm -r '[[tMergExtFolder]]'"))
+   end if
+   
+   get shell(merge("mkdir -p '[[tMergExtFolder]]/MergExt'"))
+   if the result is not zero then
+      builderLog "error", "Failed to create MergExt folder:" && it
+      throw "failure"
+   end if
+   
+   get shell(merge("cd '[[tMergExtFolder]]/MergExt' && unzip '[[tMergExtZip]]'"))
+   if the result is not zero then
+      builderLog "error", "Failed to unzip MergExt bundle:" && it
+      throw "failure"
+   end if
+end builderMergExtUnpack
diff --git a/builder/tools_builder.livecodescript b/builder/tools_builder.livecodescript
@@ -76,6 +76,41 @@ end toolsBuilderRunBundle
 
 ////////////////////////////////////////////////////////////////////////////////
 
+private command toolsBuilderPrepareMergExt pMergExtVersion, pEdition, pPlatform
+   -- Ensure that the MergExt bundle is downloaded and unpacked
+   builderMergExtUnpack pMergExtVersion, (toUpper(char 1 of pEdition) & toLower(char 2 to -1 of pEdition))
+   
+   -- Remove un-needed files from the unpacked MergExt collection
+   local tOldFolder
+   local tCollectionFolder
+   put builderMergExtFolder() & "/" & "MergExt" into tCollectionFolder
+   put the defaultFolder into tOldFolder
+   set the defaultFolder to tCollectionFolder
+   repeat for each line tExtension in the folders
+      -- Skip special names
+      if tExtension is empty or tExtension is "." or tExtension is ".." then next repeat
+      
+      -- Enter the extension directory
+      set the defaultFolder to tCollectionFolder & "/" & tExtension
+      
+      -- Remove any iOS code if we're not building the OSX installer
+      if pPlatform is not "macosx" then
+         get shell("rm -rf *.lcext")
+      end if
+      
+      -- If the directory contains no code any more, remove it
+      local tFiles
+      put the files & return & the folders into tFiles
+      filter lines of tFiles with regex pattern "^.*\.(so|dylib|bundle|dll|lcext)$"
+      if tFiles is empty then
+         set the defaultFolder to tCollectionFolder
+         get shell(merge("rm -rf '[[tExtension]]'"))
+      end if
+   end repeat
+end toolsBuilderPrepareMergExt
+
+////////////////////////////////////////////////////////////////////////////////
+
 private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFolders, pIdeFolder, pDocsFolder
    local tPackageFile
    
@@ -106,6 +141,9 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
    put builderWorkFolder() & slash & "tools-" & pPlatform & "-" & pVersion & ".zip" into tPackageFile
    builderEnsureFolderForFile tPackageFile
    
+   -- Ensure that MergExt is available for inclusion
+   toolsBuilderPrepareMergExt builderMergExtVersion(), pEdition, pPlatform
+   
    --return tPackageFile
    
    -- Configure the package compiler appropriately
@@ -131,6 +169,7 @@ private command toolsBuilderMakePackage pVersion, pEdition, pPlatform, pEngineFo
    packageCompilerConfigureSOurce tPackager, "emscripten", pEngineFolders["emscripten"]
    packageCompilerConfigureSource tPackager, "prebuilt", builderRepoFolder() & slash & "prebuilt"
    packageCompilerConfigureSource tPackager, "repo", builderRepoFolder()
+   packageCompilerConfigureSource tPackager, "mergext", builderMergExtFolder()
    if tEditionType is among the items of "indy,business" then
       packageCompilerConfigureSource tPackager, "private", builderPrivateRepoFolder()
    end if
@@ -238,6 +277,7 @@ on toolsBuilderPackageReport pType, pMessage, pLine
    builderLog pType, pMessage
 end toolsBuilderPackageReport
 
+
 ////////////////////////////////////////////////////////////////////////////////
 
 private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFolder, pPrivateFolder, pPackageFile
diff --git a/docs/notes/feature-mergext.md b/docs/notes/feature-mergext.md
@@ -0,0 +1,3 @@
+# MergExt included in the IDE
+
+The MergExt externals are now included as part of the IDE by default and are loaded at startup (where the external supports the platform).

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# MergExt included in the IDE`
	`2`	`+`
	`3`	`+The MergExt externals are now included as part of the IDE by default and are loaded at startup (where the external supports the platform).`