[[ CmdLineBuilder ]] Enable command line server .zip builds

peter-b · peter-b · commit b2135995b7ab · 2015-04-27T08:56:22.000+01:00
diff --git a/builder/builder_utilities.livecodescript b/builder/builder_utilities.livecodescript
@@ -248,6 +248,10 @@ function builderBuiltDocsFolder
    return builderRepoFolder() & slash & "_build/docs"
 end builderBuiltDocsFolder
 
+function builderBuiltNotesFolder
+   return builderRepoFolder() & slash & "_build/notes"
+end builderBuiltNotesFolder
+
 function builderCommercialFolder
    set the itemDel to slash
    return item 1 to -4 of the filename of me & "/livecode-commercial"
diff --git a/builder/server_builder.livecodescript b/builder/server_builder.livecodescript
@@ -24,16 +24,16 @@ command serverBuilderRun pPlatform, pEdition
    local tEngineFolder
    builderFetchEngine tVersion, pPlatform
    put the result into tEngineFolder
-   if pPlatform is "linux" then
-      put "/i386/release" after tEngineFolder
-   else if pPlatform is "linux-x64" then
-      put "/x86_64/release" after tEngineFolder
-   else if pPlatform is "linux-armv6hf" then
-      put "/armv6-hf/release" after tEngineFolder
-   end if
-   
+
+   -- Make sure that the output directory exists
+   local tOutputDir
+   put builderWorkspaceFolder() & slash & "deploy" into tOutputDir
+   builderEnsureFolder tOutputDir
+
    local tOutputFile
-   put builderWorkspaceFolder() & "/deploy/" & getZipFilenameStub(tVersion, pPlatform, pEdition) into tOutputFile
+   put tOutputDir & slash & getZipFilenameStub(tVersion, pPlatform, pEdition) into tOutputFile
+
+   -- Clean up any existing output file
    delete file tOutputFile
    
    if pPlatform is "windows" then
@@ -146,7 +146,8 @@ command serverBuilderRun pPlatform, pEdition
       replace "-" with "_" in tVersion
       replace "." with "_" in tVersionClean
       replace "-" with "_" in tVersionClean      
-      get $HOME & "/Builds/Installers/LiveCode/" & tVersion & "/LiveCodeNotes-" & tVersionClean & "-Server.pdf"
+      get builderBuiltNotesFolder() & "/LiveCodeNotes-" & tVersionClean & ".pdf"
+
       if there is a file it then
          builderLog "message", "Adding server release notes"
          revZipAddItemWithFile tOutputFile, "LiveCodeNotes-" & tVersionClean & "-Server.pdf", it
