--- a/rakelib/compile.rake	Sat Dec 10 20:44:26 2016 +0000
+++ b/rakelib/compile.rake	Mon Dec 12 22:43:48 2016 +0000
@@ -384,44 +384,6 @@
       end
     end
   end
-  
-  if win32? and TOOLCHAIN == 'bcc'
-    libbc = STX_TOP_DIR / 'lib' / 'bc'
-
-    task :'libraries' => [  libbc / 'cs32i.lib' ,
-            libbc / 'stxc32i.lib' ,
-            libbc / 'X11omf.lib' ,
-            libbc / 'Xextomf.lib' ,
-            STX_TOP_DIR / 'support' / 'zlib-1.2.3' / 'objbc' / 'zlib.lib'
-         ]
-
-    file libbc / 'cs32i.lib' => libbc do | t |
-      cp STX_TOP_DIR / 'support' / 'win32' /  'borland' / (File.basename(t.name)), libbc
-    end
-
-    file libbc / 'stxc32i.lib' => libbc do | t |
-    cp STX_TOP_DIR / 'support' / 'win32' /  'borland' / (File.basename(t.name)), libbc
-    end
-
-    file libbc / 'X11omf.lib' => libbc do | t |
-    cp STX_TOP_DIR / 'support' / 'win32' /  'borland' / (File.basename(t.name)), libbc
-    end
-
-
-    file libbc / 'Xextomf.lib' => libbc do | t |
-    cp STX_TOP_DIR / 'support' / 'win32' /  'borland' / (File.basename(t.name)), libbc
-    end
-
-    directory libbc
-
-    file STX_TOP_DIR / 'support' / 'zlib-1.2.3' / 'objbc' / 'zlib.lib' do
-      chdir STX_TOP_DIR / 'support' / 'zlib-1.2.3' do
-        make
-      end
-    end
-
-  end
-
 end
 
 

--- a/rakelib/hglib.rb	Sat Dec 10 20:44:26 2016 +0000
+++ b/rakelib/hglib.rb	Mon Dec 12 22:43:48 2016 +0000
@@ -269,7 +269,7 @@
     # If `noupdate` is true, working copy is not updated, i.e., will be
     # empty. Use this when you're going to issue `update(rev)` shortly after.
     #
-    def self.clone(uri, directory, noupdate: false)
+    def self.clone(uri, directory, noupdate: false, publishing: false)
       uri_obj = URI(uri)
       host = uri_obj.host
       scheme = uri_obj.scheme
@@ -278,11 +278,8 @@
       # these days) amd saves some CPU cycles.
       local = HG::Repository::host_on_lan?(URI(uri).host)
       ssh = HG::Repository::sshconf(uri)      
-      if noupdate then
-        HG::hg("clone", uri, directory, ssh: ssh, uncompressed: local, noupdate: true)
-      else
-        HG::hg("clone", uri, directory, ssh: ssh, uncompressed: local)
-      end
+      
+      HG::hg("clone", uri, directory, ssh: ssh, uncompressed: local, noupdate: noupdate, config: "phases.publish=#{publishing}")
       return HG::Repository.new(directory)
     end
 

--- a/rakelib/setup.rake	Sat Dec 10 20:44:26 2016 +0000
+++ b/rakelib/setup.rake	Mon Dec 12 22:43:48 2016 +0000
@@ -5,10 +5,6 @@
 defined? TMP_DIR or TMP_DIR = 'tmp'
 defined? DEBUG or DEBUG = nil
 
-if win32?
-  ENV['BCB'] = 'C:\\Borland\\BCC55' if not ENV['BCB']
-end
-
 if File.exist? 'config.rb'
   load 'config.rb'
 end

--- a/specs/stx-jv.rbspec	Sat Dec 10 20:44:26 2016 +0000
+++ b/specs/stx-jv.rbspec	Mon Dec 12 22:43:48 2016 +0000
@@ -114,57 +114,40 @@
       end
     end
         
-  if win32_wine?
-
-    task :'stx:projects/smalltalk:pre' do   
-      chdir (BUILD_DIR / 'stx' / 'projects' / 'smalltalk') do   
-        make "buildDate.h"    
-      end
-    end
-
-    task :'stx:goodies/xmlsuite/xmlreaderimpl:pre' do
-      chdir (BUILD_DIR / 'stx' / 'goodies' / 'xmlsuite' / 'xmlreaderimpl') do
-        [
-          'support' / 'expat-2.0.1' / 'bcb5' / 'release' /'obj' / 'xmlwf',
-          'support' / 'expat-2.0.1' / 'bcb5' / 'release' /'obj' / 'libexpat',
-          'support' / 'expat-2.0.1' / 'bcb5' / 'release' /'obj' / 'libexpatw',
-          'support' / 'expat-2.0.1' / 'bcb5' / 'release' /'obj' / 'libexpat_static',
-          'support' / 'expat-2.0.1' / 'bcb5' / 'release' /'obj' / 'libexpatw_static',
-          'support' / 'expat-2.0.1' / 'bcb5' / 'release' /'obj' / 'examples'
-        ].each do | f |
-          if not File.exists?(f)
-            mkdir_p f
-          end
+    if win32_wine?
+      task :'stx:projects/smalltalk:pre' do   
+        chdir (BUILD_DIR / 'stx' / 'projects' / 'smalltalk') do   
+          make "buildDate.h"    
         end
       end
-    end
+
     end
 
     # Hack for badly-named files in libtool
     task :'stx:libtool:post' do
       chdir (BUILD_DIR / 'stx' / 'libtool') do
-  # Windows does not support symlinks, copy the file
-  if win32?
-    if not File.exist? 'Tools_BrowserList.STH'
-      cp 'Tools__BrowserList.STH', 'Tools_BrowserList.STH'
-    end
-    if not File.exist? 'Tools_NavigatorModel.STH'
-      cp 'Tools__NavigatorModel.STH', 'Tools_NavigatorModel.STH'
-    end
-    if not File.exist? 'Tools_NavigationState.STH'
-      cp 'Tools__NavigationState.STH', 'Tools_NavigationState.STH'
-    end
-  else
-    if not File.exist? 'Tools_BrowserList.H'
-      ln_s 'Tools__BrowserList.H', 'Tools_BrowserList.H'
-    end
-    if not File.exist? 'Tools_NavigatorModel.H'
-      ln_s 'Tools__NavigatorModel.H', 'Tools_NavigatorModel.H'
-    end
-    if not File.exist? 'Tools_NavigationState.H'
-      ln_s 'Tools__NavigationState.H', 'Tools_NavigationState.H'
-    end
-  end
+        # Windows does not support symlinks, copy the file
+        if win32?
+          if not File.exist? 'Tools_BrowserList.STH'
+            cp 'Tools__BrowserList.STH', 'Tools_BrowserList.STH'
+          end
+          if not File.exist? 'Tools_NavigatorModel.STH'
+            cp 'Tools__NavigatorModel.STH', 'Tools_NavigatorModel.STH'
+          end
+          if not File.exist? 'Tools_NavigationState.STH'
+            cp 'Tools__NavigationState.STH', 'Tools_NavigationState.STH'
+          end
+        else
+          if not File.exist? 'Tools_BrowserList.H'
+            ln_s 'Tools__BrowserList.H', 'Tools_BrowserList.H'
+          end
+          if not File.exist? 'Tools_NavigatorModel.H'
+            ln_s 'Tools__NavigatorModel.H', 'Tools_NavigatorModel.H'
+          end
+          if not File.exist? 'Tools_NavigationState.H'
+            ln_s 'Tools__NavigationState.H', 'Tools_NavigationState.H'
+          end
+        end
       end
     end
   end