[cp-patches] FYI: Remove last references to vm/current.

[Mark Wielaard]

Hi,

We haven't supported vm/current for a long time but still created a
symlink for it to vm/reference. This patches removes the last traces of
this from our build system.

2004-10-09  Mark Wielaard  <address@hidden>

        * configure.ac: Don't create a link to the VM specific files.
        * include/Makefile.am: Remove vm/current with topsrc_dir vm/reference.
        * lib/Makefile.am: Likewise.
        * lib/gen-classlist.sh.in: Likewise.
        * lib/mkdep.pl.in: Likewise.

make distcheck works nicely with this.

Committed,

Mark

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.52
diff -u -r1.52 configure.ac
--- configure.ac        9 Oct 2004 09:42:54 -0000       1.52
+++ configure.ac        9 Oct 2004 16:25:41 -0000
@@ -281,21 +281,6 @@
 AC_SUBST(INIT_LOAD_LIBRARY)
 
 dnl -----------------------------------------------------------
-dnl Create a link to the VM specific files we're compiling with
-dnl -----------------------------------------------------------
-if test "x${JVM_REFERENCE}" = x; then
-  JVM_REFERENCE=reference
-fi
-ac_sources="vm/$JVM_REFERENCE"
-ac_dests="vm/current"
-while test -n "$ac_sources"; do
-  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
-  set $ac_sources; ac_source=$1; shift; ac_sources=$*
-  ac_config_links_2="$ac_config_links_2 $ac_dest:$ac_source"
-done
-AC_CONFIG_LINKS([$ac_config_links_2])
-
-dnl -----------------------------------------------------------
 dnl avoiding automake complaints
 dnl -----------------------------------------------------------
 REMOVE=""
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.30
diff -u -r1.30 Makefile.am
--- include/Makefile.am 8 Oct 2004 21:41:41 -0000       1.30
+++ include/Makefile.am 9 Oct 2004 16:25:41 -0000
@@ -150,15 +150,15 @@
        $(JAVAH) -o $@ gnu.java.net.PlainSocketImpl
 $(top_srcdir)/include/gnu_java_nio_NIOServerSocket.h: 
$(top_srcdir)/gnu/java/nio/NIOServerSocket.java
        $(JAVAH) -o $@ gnu.java.nio.NIOServerSocket
-$(top_srcdir)/include/gnu_java_nio_VMPipe.h: 
../vm/current/gnu/java/nio/VMPipe.java
+$(top_srcdir)/include/gnu_java_nio_VMPipe.h: 
$(top_srcdir)/vm/reference/gnu/java/nio/VMPipe.java
        $(JAVAH) -o $@ gnu.java.nio.VMPipe
-$(top_srcdir)/include/gnu_java_nio_VMSelector.h: 
../vm/current/gnu/java/nio/VMSelector.java
+$(top_srcdir)/include/gnu_java_nio_VMSelector.h: 
$(top_srcdir)/vm/reference/gnu/java/nio/VMSelector.java
        $(JAVAH) -o $@ gnu.java.nio.VMSelector
 $(top_srcdir)/include/java_io_ObjectInputStream.h: 
$(top_srcdir)/java/io/ObjectInputStream.java
        $(JAVAH) -o $@ java.io.ObjectInputStream
-$(top_srcdir)/include/java_io_VMFile.h: ../vm/current/java/io/VMFile.java
+$(top_srcdir)/include/java_io_VMFile.h: 
$(top_srcdir)/vm/reference/java/io/VMFile.java
        $(JAVAH) -o $@ java.io.VMFile
-$(top_srcdir)/include/java_io_VMObjectStreamClass.h: 
../vm/current/java/io/VMObjectStreamClass.java
+$(top_srcdir)/include/java_io_VMObjectStreamClass.h: 
$(top_srcdir)/vm/reference/java/io/VMObjectStreamClass.java
        $(JAVAH) -o $@ java.io.VMObjectStreamClass
 $(top_srcdir)/include/java_lang_Double.h: $(top_srcdir)/java/lang/Double.java
        $(JAVAH) -o $@ java.lang.Double
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.67
diff -u -r1.67 Makefile.am
--- lib/Makefile.am     3 Sep 2004 16:27:49 -0000       1.67
+++ lib/Makefile.am     9 Oct 2004 16:25:45 -0000
@@ -18,10 +18,10 @@
 
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
 if FOUND_GCJ
-JAVAC = $(GCJ) --bootclasspath '' --classpath 
$(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes
+JAVAC = $(GCJ) --bootclasspath '' --classpath 
$(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) -C -d . @classes
 else
 if FOUND_JIKES
-JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' --classpath 
$(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes
+JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' --classpath 
$(top_srcdir):$(top_srcdir)/vm/reference:.:$(USER_CLASSLIB) -d . @classes
 else
 if FOUND_KJC
 JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.14
diff -u -r1.14 gen-classlist.sh.in
--- lib/gen-classlist.sh.in     3 Sep 2004 16:27:49 -0000       1.14
+++ lib/gen-classlist.sh.in     9 Oct 2004 16:25:45 -0000
@@ -1,9 +1,9 @@
 #! @SH@
 # @configure_input@
 if test "@top_srcdir@" = "${top_builddir}"; then
-  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu 
@top_srcdir@/org ${top_builddir}/vm/current -follow -type f -print | grep 
'\.java$' > ${top_builddir}/lib/classes.1
+  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu 
@top_srcdir@/org @top_srcdir@/vm/reference -follow -type f -print | grep 
'\.java$' > ${top_builddir}/lib/classes.1
 else
-  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu 
@top_srcdir@/org ${top_builddir}/gnu ${top_builddir}/vm/current -follow -type f 
-print | grep '\.java$' > ${top_builddir}/lib/classes.1
+  @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu 
@top_srcdir@/org ${top_builddir}/gnu @top_srcdir@/vm/reference -follow -type f 
-print | grep '\.java$' > ${top_builddir}/lib/classes.1
 fi
 
 for filexp in `cat @top_srcdir@/lib/$1.omit` ; do { grep -v ${filexp} < 
${top_builddir}/lib/classes.1 > ${top_builddir}/lib/classes.2 ; mv 
${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1 ; } ; done
Index: lib/mkdep.pl.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/mkdep.pl.in,v
retrieving revision 1.13
diff -u -r1.13 mkdep.pl.in
--- lib/mkdep.pl.in     25 Jun 2001 04:43:56 -0000      1.13
+++ lib/mkdep.pl.in     9 Oct 2004 16:25:45 -0000
@@ -84,7 +84,7 @@
            $j = $natives[$i];
            $j =~ s/^$top_srcdir_regex//;   # remove ../ or similar
            $j =~ s/^(\.\.\/)+//g;          # remove all preceding ../
-           $j =~ s/^vm\/current\///;   # remove vm/current/
+           $j =~ s/^vm\/reference\///;   # remove vm/reference/
            $j =~ s/\//_/g;             # replace / with _
            $j =~ s/\.java$/\.h/;       # replace .java with .h
            print MAKEDEP "          \$(top_builddir)/include/", $j, " \\", 
"\n";           
@@ -92,7 +92,7 @@
        $j = $natives[$#natives];
        $j =~ s/^$top_srcdir_regex//;   # remove ../
        $j =~ s/^(\.\.\/)+//g;          # remove all preceding ../
-       $j =~ s/^vm\/current\///;   # remove vm/current/
+       $j =~ s/^vm\/reference\///;   # remove vm/reference/
        $j =~ s/\//_/g;             # replace / with _
        $j =~ s/\.java/\.h/;        # replace .java with .h
        print MAKEDEP "          \$(top_builddir)/include/", $j, "\n\n";
@@ -112,7 +112,7 @@
            $j = $natives[$i];
            $j =~ s/^$top_srcdir_regex//;   # remove ../
            $j =~ s/^(\.\.\/)+//g;          # remove all preceding ../
-           $j =~ s/^vm\/current\///;   # remove vm/current/
+           $j =~ s/^vm\/reference\///;   # remove vm/reference/
 #          $k = $l = $j;
            $l = $j;
            $j =~ s/\//_/g;             # replace / with _
@@ -131,7 +131,7 @@
        $j = $natives[$#natives];
        $j =~ s/^$top_srcdir_regex//;          # remove ../
        $j =~ s/^(\.\.\/)+//g;          # remove all preceding ../
-       $j =~ s/^vm\/current\///; # remove vm/current/
+       $j =~ s/^vm\/reference\///; # remove vm/reference/
 #      $k = $l = $j;
        $l = $j;
        $j =~ s/\//_/g;             # replace / with _

signature.asc
Description: This is a digitally signed message part