# HG changeset patch
# User Jan Vrany <jan.vrany@fit.cvut.cz>
# Date 1507197016 -3600
# Node ID cd1312f41a175a2563d95133f8ee3ebe2a860ec0
# Parent  db331712cd33eabccc5abc75b838bf0a45729820
8.0.0: Fixups after merging new branch "feature-94-revamp-thinlocks"

 * use 8.0.0 branch of `stx:libjava`
 * retain `thinlocks.h` and `jsupport.h` in binary distributions of
   `stc:stc` and `stx:librun`.

diff -r db331712cd33 -r cd1312f41a17 rakelib/compile.rake
--- a/rakelib/compile.rake	Tue Sep 19 15:46:15 2017 +0100
+++ b/rakelib/compile.rake	Thu Oct 05 10:50:16 2017 +0100
@@ -38,6 +38,7 @@
     'stxNames.h',
     'stxOSDefs.h',
     'stxTypeMacros.h',
+    'thinlocks.h',
     'symbols.stc.seed',
     'version.h',
     'sha1.h',
@@ -69,6 +70,7 @@
     'main.c',
     'hmm.h',
     'hmm.c',
+    'jsupport.h',
 
     # UNIX specific
     'librun.so',
diff -r db331712cd33 -r cd1312f41a17 specs/stx-jv.rbspec
--- a/specs/stx-jv.rbspec	Tue Sep 19 15:46:15 2017 +0100
+++ b/specs/stx-jv.rbspec	Thu Oct 05 10:50:16 2017 +0100
@@ -190,7 +190,7 @@
   package "stx:goodies/communication", :repository => :'exept:public'
 
   # Java support
-  package "stx:libjava", :repository => :'jv-branch:public'
+  package "stx:libjava", :repository => :'jv-branch:public', revision: 'stx-8.0.0'
   package "stx:libjava/tools"
   package "stx:libjava/experiments"
   #package "stx:libjava/examples" :link => false