[m-rev.] diff: make stage 1 compilation work in java grade

[Julien Fischer]

Branches: main, 11.07

Make compilation of stage 1 work in the java grade.

deep_profiler/DEEP_FLAGS.in:
profiler/PROF_FLAGS.in:
slice/SLICE_FLAGS.in:
 	Set the classpath to point towards the relevant supporting libraries.

browser/.cvsignore:
library/.cvsignore:
mdbcomp/.cvsignore:
ssdb/.cvsignore:
 	Ignore generated files.

Julien.

Index: browser/.cvsignore
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/browser/.cvsignore,v
retrieving revision 1.26
diff -u -r1.26 .cvsignore
--- browser/.cvsignore	30 Jul 2010 13:30:25 -0000	1.26
+++ browser/.cvsignore	1 Dec 2011 15:10:35 -0000
@@ -26,6 +26,7 @@
  mer_browser.dv
  mer_browser.mh
  mer_browser
+mer_browser.jar
  mer_mdbcomp.init
  mer_mdbcomp.dv
  mer_mdbcomp.mh
Index: deep_profiler/DEEP_FLAGS.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/deep_profiler/DEEP_FLAGS.in,v
retrieving revision 1.6
diff -u -r1.6 DEEP_FLAGS.in
--- deep_profiler/DEEP_FLAGS.in	5 Dec 2007 05:38:54 -0000	1.6
+++ deep_profiler/DEEP_FLAGS.in	1 Dec 2011 14:56:54 -0000
@@ -16,4 +16,9 @@
  --c-include-directory ../ssdb
  --c-include-directory ../ssdb/Mercury/mihs
  --c-include-directory ../trace
+--no-java-classpath
+--java-classpath ../library/mer_rt.jar
+--java-classpath ../library/mer_std.jar
+--java-classpath ../browser/mer_browser.jar
+--java-classpath ../mdbcomp/mer_mdbcomp.jar
  --config-file ../scripts/Mercury.config.bootstrap
Index: library/.cvsignore
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/.cvsignore,v
retrieving revision 1.32
diff -u -r1.32 .cvsignore
--- library/.cvsignore	8 Dec 2009 01:09:36 -0000	1.32
+++ library/.cvsignore	1 Dec 2011 15:11:04 -0000
@@ -45,3 +45,4 @@
  LIB_FLAGS
  config.log
  erlang_conf.hrl
+jmercury
Index: mdbcomp/.cvsignore
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/mdbcomp/.cvsignore,v
retrieving revision 1.7
diff -u -r1.7 .cvsignore
--- mdbcomp/.cvsignore	30 Sep 2011 06:26:27 -0000	1.7
+++ mdbcomp/.cvsignore	1 Dec 2011 15:12:52 -0000
@@ -21,6 +21,7 @@
  mer_mdbcomp.mh
  mer_mdbcomp
  mer_mdbcomp.dep
+mer_mdbcomp.jar
  Mercury
  Mercury.modules
  MDBCOMP_FLAGS
Index: profiler/PROF_FLAGS.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/profiler/PROF_FLAGS.in,v
retrieving revision 1.4
diff -u -r1.4 PROF_FLAGS.in
--- profiler/PROF_FLAGS.in	19 Jan 2011 07:01:49 -0000	1.4
+++ profiler/PROF_FLAGS.in	1 Dec 2011 15:08:45 -0000
@@ -19,5 +19,8 @@
  --c-include-directory ../ssdb
  --c-include-directory ../ssdb/Mercury/mihs
  --c-include-directory ../trace
+--no-java-classpath
+--java-classpath ../library/mer_rt.jar
+--java-classpath ../library/mer_std.jar
  --erlang-include-directory ../library/Mercury/hrls
  --config-file ../scripts/Mercury.config.bootstrap
Index: slice/SLICE_FLAGS.in
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/slice/SLICE_FLAGS.in,v
retrieving revision 1.7
diff -u -r1.7 SLICE_FLAGS.in
--- slice/SLICE_FLAGS.in	24 Oct 2007 09:21:18 -0000	1.7
+++ slice/SLICE_FLAGS.in	1 Dec 2011 14:55:40 -0000
@@ -16,5 +16,9 @@
  --c-include-directory ../ssdb
  --c-include-directory ../ssdb/Mercury/mihs
  --c-include-directory ../trace
+--no-java-classpath
+--java-classpath ../library/mer_rt.jar
+--java-classpath ../library/mer_std.jar
+--java-classpath ../mdbcomp/mer_mdbcomp.jar
  --config-file ../scripts/Mercury.config.bootstrap
  --force-disable-tracing
Index: ssdb/.cvsignore
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/ssdb/.cvsignore,v
retrieving revision 1.3
diff -u -r1.3 .cvsignore
--- ssdb/.cvsignore	22 Sep 2011 14:34:00 -0000	1.3
+++ ssdb/.cvsignore	1 Dec 2011 15:11:55 -0000
@@ -22,3 +22,5 @@
  *.prof
  mer_ssdb.init
  *.module_dep
+Mercury
+mer_ssdb.jar

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------