Merge stx-8.0.0
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 15 May 2018 15:20:33 +0000
branchstx-8.0.0
changeset 233 2aff5346b62c
parent 232 85c422506875 (current diff)
parent 231 9ba1d7cc7c61 (diff)
child 234 05943c900d5e
Merge
--- a/ci/publish.groovy	Mon Apr 02 21:51:24 2018 +0000
+++ b/ci/publish.groovy	Tue May 15 15:20:33 2018 +0000
@@ -4,7 +4,7 @@
 
 
 pipeline {
-    agent any
+    agent { label 'linux' }
 
     parameters {
         string(name: 'job', description: 'Job whose artifacts to upload',  defaultValue: 'stx_jv')
--- a/ci/steps.groovy	Mon Apr 02 21:51:24 2018 +0000
+++ b/ci/steps.groovy	Tue May 15 15:20:33 2018 +0000
@@ -116,8 +116,10 @@
      * a need to build it itself
      */
     artifacts();
-    input(message: 'Publish artifacts?')
-    publish("8.0.0-rc")
+    println "Smalltalk/X built, job status is: ${currentBuild.result}"
+    if ( currentBuild.result == 'SUCCESS' ) {
+        publish("8.0.0-rc")
+    }
 }
 
 /*
--- a/rakelib/hglib.rb	Mon Apr 02 21:51:24 2018 +0000
+++ b/rakelib/hglib.rb	Tue May 15 15:20:33 2018 +0000
@@ -109,11 +109,11 @@
       stdout, stderr, status = Open3.capture3(*cmd)
       case block.arity
       when 1
-        STDOUT.print stdout
-        STDERR.print stderr        
+        STDOUT.print stdout if defined? RakeFileUtils and RakeFileUtils.verbose
+        STDERR.print stderr if defined? RakeFileUtils and RakeFileUtils.verbose       
         yield status
       when 2                
-        STDERR.print stderr 
+        STDERR.print stderr if defined? RakeFileUtils and RakeFileUtils.verbose
         yield status, stdout
       when 3        
         yield status, stdout, stderr
@@ -334,11 +334,31 @@
       log = []
       hg('log', rev: revset, template: template) do |status, out|
         if status.success?
-          puts out
+          puts out if defined? RakeFileUtils and RakeFileUtils.verbose
           log = out.split("\n")
         end
       end
-      log
+      return log
+    end
+
+    def locate(revset = '.', pattern: '*')
+      files = []
+      hg('locate', rev: revset, include: pattern) do |status, out|
+        if status.success?          
+          files = out.split("\n")
+        end
+      end
+      return files
+    end
+
+    # Return current branch name
+    def branch()      
+      hg('branch') do | status, out |
+        if status.success?          
+          return out.strip()
+        end
+      end
+      raise Exception.new("Failed to retrieve current branch")
     end
 
     # Return changeset IDs of all head revisions. 
--- a/specs/baseline.rbspec	Mon Apr 02 21:51:24 2018 +0000
+++ b/specs/baseline.rbspec	Tue May 15 15:20:33 2018 +0000
@@ -30,6 +30,7 @@
   package "stx:goodies/refactoryBrowser/browser"
   package "stx:libtool2"
   package "stx:goodies/libdbase" if not win32?
+  package "stx:goodies/fileformats/plist"
 
   application 'stx:projects/smalltalk'