--- a/vcmake.bat	Tue Jul 26 09:33:35 2016 +0100
+++ b/vcmake.bat	Tue Jul 26 10:21:31 2016 +0100
@@ -10,24 +10,43 @@
     popd
 )
 @SET DEFINES=
+@REM Kludge got Mercurial, cannot be implemented in Borland make
+@FOR /F "tokens=*" %%i in ('hg root') do SET HGROOT=%%i
+@IF "%HGROOT%" NEQ "" SET DEFINES=%DEFINES% "-DHGROOT=%HGROOT%"
 
-make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
 
 make.exe -N -f bc.mak -DUSEVC=1 %DEFINES% %*
 
 
+
+@if not exist experiments goto skip_stx_libjava_experiments
 @echo "***********************************"
-@echo "Buildung stx/libjava/experiments"
+@echo "Building stx/libjava/experiments
 @echo "***********************************"
 @pushd experiments
 @call vcmake %1 %2 || exit /b "%errorlevel%"
 @popd
+@goto done_stx_libjava_experiments
+:skip_stx_libjava_experiments
+@echo "###################################"
+@echo "FOLDER MISSING: stx/libjava/experiments
+@echo "###################################"
+exit /b 1
+:done_stx_libjava_experiments
 
+@if not exist tools goto skip_stx_libjava_tools
 @echo "***********************************"
-@echo "Buildung stx/libjava/tools"
+@echo "Building stx/libjava/tools
 @echo "***********************************"
 @pushd tools
 @call vcmake %1 %2 || exit /b "%errorlevel%"
 @popd
+@goto done_stx_libjava_tools
+:skip_stx_libjava_tools
+@echo "###################################"
+@echo "FOLDER MISSING: stx/libjava/tools
+@echo "###################################"
+exit /b 1
+:done_stx_libjava_tools