[[ PackageExtensions ]] Remove shell cmds from build script

livecodeali · livecodeali · commit ba4e1d86c299 · 2018-03-01T12:46:05.000Z
diff --git a/util/package_extension.livecodescript b/util/package_extension.livecodescript
@@ -5,93 +5,224 @@ send "doPackage" to me
 on doPackage
    local tArgs
    put the commandArguments into tArgs
-
+   
    if tArgs[10] is true and not (tArgs[8] ends with ".lcb") then
-       protectStack the commandName, tArgs[2], tArgs[7], tArgs[8], tArgs[3], tArgs[4]
+      protectStack the commandName, tArgs[2], tArgs[7], tArgs[8], tArgs[3], tArgs[4]
    end if
    
    extractDocs the commandName, tArgs[5], tArgs[6], tArgs[7], tArgs[8]
-
+   
+   local tPackage
    if not (tArgs[8] ends with ".lcb") then   
-       packageScriptExtension tArgs[7], tArgs[8], tArgs[9], tArgs[10]
+      packageScriptExtension tArgs[7], tArgs[8], tArgs[9], tArgs[10]
    else
-       packageBuilderExtension tArgs[7], tArgs[8], tArgs[9], tArgs[10], tArgs[11], tArgs[12]
+      packageBuilderExtension tArgs[7], tArgs[8], tArgs[9], tArgs[10], tArgs[11], tArgs[12]
    end if
+   put the result into tPackage
+   
+   extractExtension tPackage, tArgs[7], tArgs[9], tArgs[10]
    quit 0
 end doPackage
  
 function q pParam
-    return quote & pParam & quote
+   return quote & pParam & quote
 end q
  
 command protectStack pEnginePath, pProtectifyScript, pSourceFolder, pSourceFileName, pOutput, pGitHash
-    local tShell
-    put merge(q("[[pEnginePath]]") && q("[[pProtectifyScript]]") && \
-        q("[[pSourceFolder]]" & slash & "[[pSourceFileName]]") && \
-        q("[[pOutput]]") && q("[[pGitHash]]")) into tShell
-        
-    get shell(tShell)
+   local tShell
+   put merge(q("[[pEnginePath]]") && q("[[pProtectifyScript]]") && \
+         q("[[pSourceFolder]]" & slash & "[[pSourceFileName]]") && \
+         q("[[pOutput]]") && q("[[pGitHash]]")) into tShell
+   
+   get shell(tShell)
    if the result is not 0 then
-       write "subprocess error when protecting stack" && pSourceFileName & ":" && it to stderr
-       quit 1
+      write "subprocess error when protecting stack" && pSourceFileName & ":" && it to stderr
+      quit 1
    end if
 end protectStack
 
 command extractDocs pEnginePath, pExtractScript, pDocsParser, pSourceFolder, pSourceFileName
-    write the params to stdout
-    local tShell, tSource
-    put pSourceFolder & slash & pSourceFileName into tSource
-    put merge(q("[[pEnginePath]]") && q("[[pExtractScript]]") && \
-        q("[[pDocsParser]]") && q("[[pSourceFolder]]") && q("[[tSource]]")) \
-        into tShell
-
+   write the params to stdout
+   local tShell, tSource
+   put pSourceFolder & slash & pSourceFileName into tSource
+   put merge(q("[[pEnginePath]]") && q("[[pExtractScript]]") && \
+         q("[[pDocsParser]]") && q("[[pSourceFolder]]") && q("[[tSource]]")) \
+         into tShell
+   
    get shell(tShell)
    if the result is not 0 then
-       write "subprocess error when extracting docs from" && pSourceFileName & ":" && it to stderr
-       quit 2
+      write "subprocess error when extracting docs from" && pSourceFileName & ":" && it to stderr
+      quit 2
    end if
 end extractDocs
  
+private command addFolderToArchive pBaseFolder, pArchive, pRemoveSource, pSourceFileName, pSupportFiles 
+   # First add the files, then recusively add any sub folders
+   local tFiles
+   put files(pBaseFolder) into tFiles
+   filter tFiles without "."
+   filter tFiles without ".."
+   
+   repeat for each line tFile in tFiles
+      # This must be tweaked if the files to remove are ever not
+      # top-level source files
+      if pRemoveSource is "true" then
+         if tFile is pSourceFileName then
+            next repeat
+         end if
+         if tFile is among the lines of pSupportFiles then
+            next repeat
+         end if
+      end if
+      revZipAddItemWithFile pArchive, tFile, pBaseFolder & slash & tFile
+      if the result begins with "ziperr" then
+         return the result
+      end if
+   end repeat
+   
+   local tFolders
+   put folders(pBaseFolder) into tFolders
+   filter tFolders without "."
+   filter tFolders without ".."
+   
+   repeat for each line tFolder in tFolders
+      addFolderToArchiveRecursive pBaseFolder, tFolder, pArchive
+      if the result begins with "ziperr" then
+         return the result
+      end if
+   end repeat
+   return empty
+end addFolderToArchive
+
+private command addFolderToArchiveRecursive pBaseFolder, pFolder, pArchive
+   # First add the files, then recusively add any sub folders
+   local tFiles
+   put files(pBaseFolder & slash & pFolder) into tFiles
+   filter tFiles without "."
+   filter tFiles without ".."
+   
+   repeat for each line tFile in tFiles
+      revZipAddItemWithFile pArchive, pFolder & slash & tFile, (pBaseFolder & slash & pFolder & slash & tFile)
+      if the result begins with "ziperr" then
+         return the result
+      end if
+   end repeat
+   
+   local tFolders
+   put folders(pBaseFolder & slash & pFolder) into tFolders
+   filter tFolders without "."
+   filter tFolders without ".."
+   
+   repeat for each line tFolder in tFolders
+      addFolderToArchiveRecursive pBaseFolder, pFolder & slash & tFolder, pArchive
+      if the result begins with "ziperr" then
+         return the result
+      end if
+   end repeat
+   return empty
+end addFolderToArchiveRecursive
+
 private command packageExtension pExtensionName, pSourceFolder, pSourceFileName, pTargetFolder, pRemoveSource, pSupportFiles
+   write "packaging extension" && pSourceFileName & return to stdout
    local tTargetDir, tBuildTarget, tZip
    put pExtensionName into tTargetDir
    put pTargetFolder & slash & tTargetDir into tBuildTarget
    put pSourceFolder & slash & tTargetDir & ".lce" into tZip
    
-   local tShell, tCurFolder
-   put the folder into tCurFolder
-   put "cd" && q(pSourceFolder) into tShell
-   put return & "zip -q -r" && tTargetDir & ".lce *" after tShell
-   put return & "cd" && q(tCurFolder) after tShell
-   put return & "mkdir -p" && q(tBuildTarget) after tShell
-   put return & "unzip -q -o " & q(tZip) && "-d " & q(tBuildTarget) \
-      after tShell
-   put return & "rm" && q(tZip) after tShell
-   
-   if pRemoveSource is "true" then
-      put return & "rm" && q(tBuildTarget & slash & pSourceFileName) \ 	
-         after tShell
-      repeat for each line tSupport in pSupportFiles
-         put return & "rm" && q(tBuildTarget & slash & tSupport) \ 	
-         	after tShell
-      end repeat
+   local tArchive, tError
+   revZipOpenArchive tZip, "write"
+   if the result begins with "ziperr" then
+      put the result into tError
    end if
-   
-   write "packaging extension" && pSourceFileName & return to stdout    
-   get shell(tShell)
-   if the result is not 0 then
-       write "subprocess error when packaging extension" && pSourceFileName & ":" && it to stderr
-       quit 3
+   addFolderToArchive pSourceFolder, tZip, pRemoveSource, pSourceFileName, pSupportFiles
+   if the result begins with "ziperr" then
+      put the result into tError
+   end if
+   revZipCloseArchive tZip
+   if the result begins with "ziperr" then
+      put the result into tError
+   end if
+   if tError is not empty then
+      write "zip error when packaging extension" && pSourceFileName & ":" && tError to stderr
+      quit 3
    end if
+   return tZip
 end packageExtension
 
+private command __EnsurePath pPath
+   if there is a folder pPath then exit __EnsurePath
+   
+   local tPath
+   set the itemdel to "/"
+   repeat for each item tFolder in pPath
+      
+      if tFolder contains ":" then
+         put tFolder after tPath
+      else
+         put slash & tFolder after tPath
+      end if
+      
+      if tPath is empty then next repeat
+      if there is a folder (quote & tPath & quote) then next repeat
+      
+      create folder tPath
+   end repeat
+end __EnsurePath
+
+private command extractExtension pZip, pExtensionName, pSourceFolder, pTargetFolder
+   local tTargetDir, tBuildTarget, tError
+   put pExtensionName into tTargetDir
+   put pTargetFolder & slash & tTargetDir into tBuildTarget
+   
+   create folder tBuildTarget
+   # Extract the icon,docs and executable module into the folder
+   revZipOpenArchive pZip, "read"
+   if the result begins with "ziperr" then
+      put the result into tError
+   end if
+   
+   # Work out the root of the zip
+   local tZipItems, tZipRoot
+   put revZipEnumerateItems(pZip) into tZipItems
+   if the result begins with "ziperr" then
+      put the result into tError
+   end if
+   if the last char of line 1 of tZipItems is "/" then
+      put line 1 of tZipItems into tZipRoot
+   else
+      put empty into tZipRoot
+   end if
+   
+   # Extract all the files
+   local tDirectory
+   set the itemdel to slash
+   repeat for each line tFile in tZipItems
+      put tBuildTarget & slash & item 1 to -2 of tFile into tDirectory
+      __EnsurePath tDirectory
+      revZipExtractItemToFile pZip, tFile, tBuildTarget & slash & tFile
+      if the result begins with "ziperr" then
+         put the result into tError
+      end if
+   end repeat 
+   
+   revZipCloseArchive pZip
+   if the result begins with "ziperr" then
+      put the result into tError
+   end if
+   if tError is not empty then
+      write "zip error when extracting extension" && pExtensionName & ":" && tError to stderr
+      quit 3
+   end if
+end extractExtension
+
 command packageScriptExtension pSourceFolder, pSourceFileName, pTargetFolder, pRemoveSource   
    local tExtShortName
    set the itemdelimiter to "."
    put item -2 of pSourceFileName into tExtShortName
    
    packageExtension "com.livecode.library." & tExtShortName, \
-      pSourceFolder, pSourceFileName, pTargetFolder, pRemoveSource
+         pSourceFolder, pSourceFileName, pTargetFolder, pRemoveSource
+   return the result
 end packageScriptExtension
 
 private function getSupportFiles pSourceFolder, pSourceFileName, pExtension
@@ -152,7 +283,8 @@ command packageBuilderExtension pSourceFolder, pSourceFileName, pTargetFolder, p
     end if   	
     
    packageExtension tExtensionName, pSourceFolder, pSourceFileName, \
-      pTargetFolder, pRemoveSource, tSupportFiles
+         pTargetFolder, pRemoveSource, tSupportFiles
+   return the result
 end packageBuilderExtension
 
 on errorDialog tError
