Merge feature-block-in-context
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 01 Feb 2017 22:20:35 +0000
branchfeature-block-in-context
changeset 160 95149f95cb5c
parent 159 cbc152f322a8 (diff)
parent 123 1929fa1590da (current diff)
child 161 cfc0b59da7a9
Merge
specs/stx-jv.rbspec
--- a/specs/stx-jv.rbspec	Wed Feb 01 10:15:12 2017 +0000
+++ b/specs/stx-jv.rbspec	Wed Feb 01 22:20:35 2017 +0000
@@ -1,7 +1,6 @@
 def build_platform_id() 
   return "#{ARCH}-#{win32? ? 'win32' : RbConfig::CONFIG['host_os']}"
 end
-
 # A helper function to download and unpack pre-built stc and librun
 # for those who are not lucky enough to have an access to sources
 def download_blob_matching(pattern, directory)
@@ -48,7 +47,7 @@
   import :'stx:baseline'
 
   # FORKED STC and librun
-  package "stx:stc", :repository => :'swing:private:hg', :branch => 'jv', 
+  package "stx:stc", :repository => :'swing:private:hg', :branch => 'jv', revision: 'feature-block-in-context',
     :checkout => (Proc.new do | pkg |
     # Download pre-compiled binary if user has no access to source code    
     if Rake::Stx::Configuration::Repository::find(pkg.repository) then
@@ -65,7 +64,7 @@
     end
   end)
 
-  package "stx:librun", :repository => :'swing:private:hg', :branch => 'jv', 
+  package "stx:librun", :repository => :'swing:private:hg', :branch => 'jv', revision: 'feature-block-in-context',
     :checkout => (Proc.new do | pkg |
     # Download pre-compiled binary if user has no access to source code
     if Rake::Stx::Configuration::Repository::find(pkg.repository) then