--- a/bin/stmkmf.rb	Tue Jun 12 21:27:24 2018 +0000
+++ b/bin/stmkmf.rb	Fri Jun 15 23:59:15 2018 +0200
@@ -58,7 +58,7 @@
 
 include $(MAKELIB)/definitions.make
 
-include Make.spec
+#{File.exists?(File.join(cwd, 'Make.spec')) ? 'include Make.spec' : ''}
 include Make.proto
 
 include $(MAKELIB)/rules.make

--- a/ci/steps.groovy	Tue Jun 12 21:27:24 2018 +0000
+++ b/ci/steps.groovy	Fri Jun 15 23:59:15 2018 +0200
@@ -110,16 +110,6 @@
             }
         }
     }
-
-    /*
-     * Build and publish all artifacts - to allow (beta) testers to run full St/X without
-     * a need to build it itself
-     */
-    artifacts();
-    println "Smalltalk/X built, job status is: ${currentBuild.result}"
-    if ( currentBuild.result == null ) {
-        publish("8.0.0-rc")
-    }
 }
 
 /*

--- a/makelib/config-linux-gnu.make	Tue Jun 12 21:27:24 2018 +0000
+++ b/makelib/config-linux-gnu.make	Fri Jun 15 23:59:15 2018 +0200
@@ -42,8 +42,6 @@
 endif
 
 
-STC_LEXLIB=-lfl
-
 #
 # use static librt for clock_gettime().
 # dynamic librt causes libpthread to be loaded that does not

--- a/rakelib/compile.rake	Tue Jun 12 21:27:24 2018 +0000
+++ b/rakelib/compile.rake	Fri Jun 15 23:59:15 2018 +0200
@@ -73,6 +73,7 @@
     'jsupport.h',
     'debug.h',
     'debug.c',
+    'librun-gdb.py',
 
     # UNIX specific
     'librun.so',

--- a/specs/repositories.rbspec	Tue Jun 12 21:27:24 2018 +0000
+++ b/specs/repositories.rbspec	Fri Jun 15 23:59:15 2018 +0200
@@ -17,22 +17,16 @@
   #  
   origin_forest_url = HG::Repository.new(BUILD_DIR / '..').paths['default'].slice(0.. - 'stx-goodies-builder-rake'.size - 2)
   cloned_from_bitbucket = origin_forest_url =~ /bitbucket.org/
-  cloned_from_swing     = origin_forest_url =~ /swing\.fit\.cvut\.cz/
-  cloned_fron_devsrepo  = (not cloned_from_bitbucket) and (not cloned_from_swing)
-
+  cloned_from_swing     = (origin_forest_url =~ /swing\.fit\.cvut\.cz/) || (origin_forest_url =~ /192\.168\.12\.1/)
 
   repository :'jv-branch:public' do
     type :hg
     separator '-'
     canonical "https://bitbucket.org/janvrany"
-
-    case
-    when cloned_from_swing
-      staging   "ssh://hg@swing.fit.cvut.cz//var/local/hg"
-    when cloned_fron_devsrepo
+    if (not cloned_from_bitbucket) and (not cloned_from_swing)
       upstream  "ssh://hg@swing.fit.cvut.cz//var/local/hg"
-      staging   origin_forest_url
     end
+    staging   origin_forest_url
   end
 
   # Only core developer and/or Jenkins have access to
@@ -41,8 +35,7 @@
     repository :'jv-branch:private' do
       type :hg
       separator '-'
-      case
-      when cloned_fron_devsrepo
+      if ((not cloned_from_bitbucket) and (not cloned_from_swing))
         canonical origin_forest_url
       else
         canonical "ssh://192.168.12.2//hg"

--- a/specs/stx-jv.rbspec	Tue Jun 12 21:27:24 2018 +0000
+++ b/specs/stx-jv.rbspec	Fri Jun 15 23:59:15 2018 +0200
@@ -75,7 +75,7 @@
     :update => (Proc.new do | pkg |
       if (File.exists? BUILD_DIR / 'stx' / 'stc' / '.hg' / 'hgrc') then
         update pkg.repository, 'stx/stc', :branch => pkg.branch, :revision => pkg.revision
-      else
+      elsif not jenkins?
         download_binary_component('stc', BUILD_DIR / 'stx')
     end
   end)
@@ -84,7 +84,7 @@
     :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
-          checkout pkg.repository, 'stx/librun', :branch => pkg.branch, :revision => pkg.revision
+        checkout pkg.repository, 'stx/librun', :branch => pkg.branch, :revision => pkg.revision
       else
         download_binary_component('librun', BUILD_DIR / 'stx')
       end
@@ -92,7 +92,7 @@
     :update => (Proc.new do | pkg |
       if (File.exists? BUILD_DIR / 'stx' / 'librun' / '.hg' / 'hgrc') then
         update pkg.repository, 'stx/stc', :branch => pkg.branch, :revision => pkg.revision
-      else
+      elsif not jenkins?
         download_binary_component('librun', BUILD_DIR / 'stx')
     end
   end)