Merge remote-tracking branch 'origin/develop-6.7' into merge-6.7.7-rc-1

livecodesebastien · livecodesebastien · commit 091287f6e937 · 2015-07-10T15:06:06.000+01:00
diff --git a/buildbot.mk b/buildbot.mk
@@ -85,7 +85,15 @@ BUILDTOOL_STACK = builder/builder_tool.livecodescript
 
 WKHTMLTOPDF ?= $(shell which wkhtmltopdf 2>/dev/null)
 
-bin_dir = $(BUILD_PLATFORM)-bin
+# Those directories are given to the tool builder, and they might get passed
+# (like private-dir) to engine functions, to which a path relative to this file
+# becomes invalid).
+top_src_dir=$(pwd)
+engine_dir=${top_src_dir}
+output_dir=${top_src_dir}
+work_dir=${top_src_dir}/_cache/builder_tool
+private_dir=${top_src_dir}/..
+bin_dir = ${top_src_dir}/$(BUILD_PLATFORM)-bin
 
 ifeq ($(BUILD_PLATFORM),mac)
   LIVECODE = $(bin_dir)/LiveCode-Community.app/Contents/MacOS/LiveCode-Community
@@ -101,8 +109,8 @@ endif
 # FIXME add --warn-as-error
 buildtool_command = $(LIVECODE) -ui $(BUILDTOOL_STACK) \
 	--build $(BUILD_STABILITY) \
-	--engine-dir . --output-dir . --work-dir ./_cache/builder_tool \
-	--private-dir ..
+	--engine-dir ${engine_dir} --output-dir ${output_dir} --work-dir ${work_dir} \
+	--private-dir ${private_dir}
 
 # Settings for upload
 RSYNC ?= rsync
@@ -152,6 +160,7 @@ dist-upload-files.txt:
 	                -o -name 'LiveCode*Server-*-Linux*.zip' \
 	                -o -name 'LiveCode*Server-*-Mac.zip' \
 	                -o -name 'LiveCode*Server-*-Windows.zip' \
+	                -o -name '*-bin.tar.xz' \
 	  > $@
 
 # Perform the upload.  This is in two steps:
diff --git a/builder/server_builder.livecodescript b/builder/server_builder.livecodescript
@@ -27,7 +27,7 @@ command serverBuilderRun pPlatform, pEdition
 
    -- Make sure that the output directory exists
    local tOutputDir
-   put builderWorkspaceFolder() & slash & "deploy" into tOutputDir
+   put builderOutputFolder() into tOutputDir
    builderEnsureFolder tOutputDir
 
    local tOutputFile
diff --git a/builder/tools_builder.livecodescript b/builder/tools_builder.livecodescript
@@ -315,6 +315,9 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
          put pPackageFile into tParams["payload"]
          put tOutputFileStub & ".unsigned.exe" into tParams["output"]
          
+         // libURL is needed in the timestamp processing
+         start using stack (builderRepoFolder() & slash & "ide-support" & slash & "revliburl.livecodescript")
+         
          if pEdition is "Commercial" then
             put builderCommercialResourceFolder() & "/installer.ico" into tParams["appicon"]
          end if
@@ -327,12 +330,13 @@ private command toolsBuilderMakeInstaller pVersion, pEdition, pPlatform, pIdeFol
          end if
          
          -- Next we sign the installer using the certificate (if available)
-         if there is a folder (builderSystemFolder() & slash & "certificates") then
+         put builderPrivateRepoFolder() & slash & "certificates" into tCertificatesFolder
+         if there is a folder (tCertificatesFolder) then
             put tParams["output"] into tSignParams["input"]
             put tOutputFileStub & ".exe" into tSignParams["output"]
-            put builderSystemFolder() & slash & "certificates/runrev_bin.spc" into tSignParams["certificate"]
-            put builderSystemFolder() & slash & "certificates/runrev.pvk" into tSignParams["privatekey"]
-            put word 1 of url ("file:" & builderSystemFolder() & slash & "certificates/runrev_password.txt") into tSignParams["passphrase"]
+            put tCertificatesFolder & "/runrev_bin.spc" into tSignParams["certificate"]
+            put tCertificatesFolder & "/runrev.pvk" into tSignParams["privatekey"]
+            put word 1 of url ("file:" & tCertificatesFolder & "/runrev_password.txt") into tSignParams["passphrase"]
             put "http://timestamp.verisign.com/scripts/timstamp.dll" into tSignParams["timestamper"]
             put "http://www.runrev.com" into tSignParams["url"]
             if pEdition is "Community" then
