* configure.ac (VM_ZIP_STRING): Removed.

(--with-vm-zip): Added.
(--with-classpath-glibj-zip): Added.
(--with-flat-classpath): Removed.

* contrib/setenvinstalled.in (BOOTCLASSPATH): Use hardcoded vm.zip and
@CLASSPATH_GLIBJ_ZIP@.
* contrib/setenvsource.in: Likewise.

* src/vm/global.h (CACAO_VM_ZIP_PATH): Removed.
(CLASSPATH_GLIBJ_ZIP_PATH): Likewise.
* src/vm/vm.c (CACAO_VM_ZIP_PATH): Replaced with CACAO_VM_ZIP.
(CLASSPATH_GLIBJ_ZIP_PATH): Replaced with CLASSPATH_GLIBJ_ZIP.
* src/cacaoh/cacaoh.c: Likewise.

* src/lib/Makefile.am (GLIBJ_ZIP): Removed and replaced with
CLASSPATH_GLIBJ_ZIP.
* src/native/include/Makefile.am (VM_ZIP): Removed and replaced with
flat classes in builddir.
(GLIBJ_ZIP): Removed and replaced with CLASSPATH_GLIBJ_ZIP.
* src/native/Makefile.am: Likewise.

diff --git a/configure.ac b/configure.ac
index 7328b087e50906f15ee876bdffd4278393144422..64cd5eb7b13b9635b793f85a9cb5ca0e4cbb636c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -624,12 +624,7 @@ if test x"${ENABLE_ZLIB}" = "xyes"; then
     AC_CHECK_HEADERS([zlib.h],, [AC_MSG_ERROR(cannot find zlib.h)])
     AC_CHECK_LIB(z, inflate,, [AC_MSG_ERROR(cannot find libz)])
     AC_DEFINE([ENABLE_ZLIB], 1, [use zlib])
-    VM_ZIP_STRING=vm.zip
-else
-    VM_ZIP_STRING=classes/
 fi
-AC_DEFINE_UNQUOTED(VM_ZIP_STRING, "${VM_ZIP_STRING}", [define to the string base name of the VM zip file])
-AC_SUBST(VM_ZIP_STRING)
 AM_CONDITIONAL([ENABLE_ZLIB], test x"${ENABLE_ZLIB}" = "xyes")
 
 
@@ -678,6 +673,17 @@ AM_CONDITIONAL([ENABLE_STATICVM], test x"${ENABLE_STATICVM}" = "xyes")
 AC_SUBST(ENABLE_STATICVM)
 
 
+dnl where is CACAO's vm.zip
+AC_MSG_CHECKING(where CACAO's vm.zip is installed)
+AC_ARG_WITH([vm-zip],
+            [AS_HELP_STRING(--with-vm-zip,path to CACAO's vm.zip (includes the name of the file and may be flat) [[default=/usr/local/cacao/share/cacao/vm.zip]])],
+            [CACAO_VM_ZIP=${withval}],
+            [CACAO_VM_ZIP=${CACAO_PREFIX}/share/cacao/vm.zip])
+AC_MSG_RESULT(${CACAO_VM_ZIP})
+AC_DEFINE_UNQUOTED([CACAO_VM_ZIP], "${CACAO_VM_ZIP}", [CACAO's vm.zip])
+AC_SUBST(CACAO_VM_ZIP)
+
+
 dnl is GNU classpath installed somewhere different
 AC_MSG_CHECKING(where GNU Classpath is installed)
 AC_ARG_WITH([classpath-prefix],
@@ -688,6 +694,19 @@ AC_MSG_RESULT(${CLASSPATH_PREFIX})
 AC_DEFINE_UNQUOTED([CLASSPATH_PREFIX], "${CLASSPATH_PREFIX}", [GNU Classpath installation directory])
 AC_SUBST(CLASSPATH_PREFIX)
 
+
+dnl where is GNU Classpath's glibj.zip
+AC_MSG_CHECKING(where GNU Classpath's glibj.zip is installed)
+AC_ARG_WITH([classpath-glibj-zip],
+            [AS_HELP_STRING(--with-classpath-glibj-zip,path to GNU Classpath's glibj.zip (includes the name of the file and may be flat) [[default=/usr/local/classpath/share/classpath/glibj.zip]])],
+            [CLASSPATH_GLIBJ_ZIP=${withval}],
+            [CLASSPATH_GLIBJ_ZIP=${CLASSPATH_PREFIX}/share/classpath/glibj.zip])
+AC_MSG_RESULT(${CLASSPATH_GLIBJ_ZIP})
+AC_DEFINE_UNQUOTED([CLASSPATH_GLIBJ_ZIP], "${CLASSPATH_GLIBJ_ZIP}", [GNU Classpath's glibj.zip])
+AC_SUBST(CLASSPATH_GLIBJ_ZIP)
+
+
+dnl where are the GNU Classpath libraries installed
 AC_MSG_CHECKING(where GNU Classpath libraries are installed)
 AC_ARG_WITH([classpath-libdir],
             [AS_HELP_STRING(--with-classpath-libdir=<dir>,installation directory of GNU Classpath libraries [[default=/usr/local/classpath/lib]])],
@@ -700,6 +719,8 @@ AS_AC_EXPAND([CLASSPATH_LIBDIR], ${CLASSPATH_LIBDIR})
 AC_DEFINE_UNQUOTED([CLASSPATH_LIBDIR], "${CLASSPATH_LIBDIR}", [GNU Classpath libraries installation directory])
 AC_SUBST(CLASSPATH_LIBDIR)
 
+
+dnl where are the GNU Classpath headers installed
 AC_MSG_CHECKING(where GNU Classpath headers are installed)
 AC_ARG_WITH([classpath-includedir],
             [AS_HELP_STRING(--with-classpath-includedir=<dir>,installation directory of GNU Classpath headers [[default=/usr/local/classpath/include]])],
@@ -736,19 +757,6 @@ AM_CONDITIONAL([WITH_STATIC_CLASSPATH], test x"${WITH_STATIC_CLASSPATH}" = "xyes
 AC_SUBST(WITH_STATIC_CLASSPATH)
 
 
-dnl Maybe the user has Classpath installed 'flat'.
-AC_ARG_WITH([flat-classpath],
-            [AS_HELP_STRING(--with-flat-classpath, GNU Classpath is not zipped in the install directory)])
-
-if test x"$with_flat_classpath" = "x"; then
-    GLIBJ_ZIP_STRING=glibj.zip
-else
-    GLIBJ_ZIP_STRING=
-fi
-AC_SUBST(GLIBJ_ZIP_STRING)
-AC_DEFINE_UNQUOTED(GLIBJ_ZIP_STRING, "$GLIBJ_ZIP_STRING", [define to the string base name of the classpath zip file])
-
-
 dnl check for some programs we need
 AC_PROG_JAVAC
 AC_PROG_JAR

diff --git a/contrib/setenvinstalled.in b/contrib/setenvinstalled.in
index bf14d6941ae9b6f8883bb9aeb7d7ebe801507e04..2af0c76505a0b2512cd224d2e128e8fa4ae320ee 100644 (file)
--- a/contrib/setenvinstalled.in
+++ b/contrib/setenvinstalled.in
@@ -1,5 +1,5 @@
 # sets the environment variables when GNU classpath is installed, but
 # CACAO not
 
-export BOOTCLASSPATH=$PWD/src/lib/@VM_ZIP_STRING@:@CLASSPATH_PREFIX@/share/classpath/@GLIBJ_ZIP_STRING@
+export BOOTCLASSPATH=$PWD/src/lib/vm.zip:@CLASSPATH_GLIBJ_ZIP@
 export PATH=$PWD/src/cacao:$PATH

diff --git a/contrib/setenvsource.in b/contrib/setenvsource.in
index 09e6abf36c68ce781fa59e6d8a105a9fc5a7a37b..72adf6e339a0d8f97507fdfbd4cc0b8a46402694 100644 (file)
--- a/contrib/setenvsource.in
+++ b/contrib/setenvsource.in
@@ -11,5 +11,5 @@ export LD_LIBRARY_PATH=\
 @CLASSPATH_PREFIX@/native/jni/java-util/.libs:\
 $LD_LIBRARY_PATH
 
-export BOOTCLASSPATH=$PWD/src/lib/@VM_ZIP_STRING@:@CLASSPATH_PREFIX@/lib/@GLIBJ_ZIP_STRING@
+export BOOTCLASSPATH=$PWD/src/lib/vm.zip:@CLASSPATH_GLIBJ_ZIP@
 export PATH=$PWD/src/cacao:$PATH

diff --git a/src/cacaoh/cacaoh.c b/src/cacaoh/cacaoh.c
index 1b04689fb9eacae76b575796b34a1809417ac3ef..9a3e24240c16471bc126db854ece2189a9aefead 100644 (file)
--- a/src/cacaoh/cacaoh.c
+++ b/src/cacaoh/cacaoh.c
@@ -30,7 +30,7 @@
             Philipp Tomsich
             Christian Thalinger
 
-   $Id: cacaoh.c 4921 2006-05-15 14:24:36Z twisti $
+   $Id: cacaoh.c 5013 2006-06-06 11:22:56Z twisti $
 
 */
 
@@ -187,15 +187,15 @@ int main(int argc, char **argv)
                strcpy(bootclasspath, cp);
 
        } else {
-               cplen = strlen(CACAO_VM_ZIP_PATH) +
+               cplen = strlen(CACAO_VM_ZIP) +
                        strlen(":") +
-                       strlen(CLASSPATH_GLIBJ_ZIP_PATH) +
+                       strlen(CLASSPATH_GLIBJ_ZIP) +
                        strlen("0");
 
                bootclasspath = MNEW(char, cplen);
-               strcat(bootclasspath, CACAO_VM_ZIP_PATH);
+               strcat(bootclasspath, CACAO_VM_ZIP);
                strcat(bootclasspath, ":");
-               strcat(bootclasspath, CLASSPATH_GLIBJ_ZIP_PATH);
+               strcat(bootclasspath, CLASSPATH_GLIBJ_ZIP);
        }
 
 

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 3f331fcda6a3833bcbaa8850383d1e9a0f32a45c..73f8a7879f349a53c02d48939bc8d3363d506c58 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4845 2006-04-26 08:57:01Z twisti $
+## $Id: Makefile.am 5013 2006-06-06 11:22:56Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -53,8 +53,6 @@ VM_CLASS_FILES = \
        classes/java/lang/VMThrowable.class \
        classes/java/security/VMAccessController.class
 
-GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING)
-
 if ENABLE_ZLIB
 pkgdata_DATA = vm.zip
 
@@ -63,9 +61,9 @@ VM_ZIP = ../vm.zip
 vm.zip: $(VM_JAVA_FILES)
        $(mkdir_p) classes
        @if test "$(JAVAC)" = "ecj"; then \
-           $(JAVAC) -bootclasspath $(GLIBJ_ZIP) -d classes -1.5 $(VM_JAVA_FILES); \
+           $(JAVAC) -bootclasspath $(CLASSPATH_GLIBJ_ZIP) -d classes -1.5 $(VM_JAVA_FILES); \
        else \
-           $(JAVAC) -bootclasspath $(GLIBJ_ZIP) -d classes $(VM_JAVA_FILES); \
+           $(JAVAC) -bootclasspath $(CLASSPATH_GLIBJ_ZIP) -d classes $(VM_JAVA_FILES); \
        fi
        @if test "$(JAR)" = "zip"; then \
            cd classes && $(JAR) -r -D $(VM_ZIP) .; \

diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index 7d84945918d00bbcc46627c65034bed006761169..9cc6c595a90a4cf0066ef900327a6432bac69027 100644 (file)
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4627 2006-03-16 12:53:32Z twisti $
+## $Id: Makefile.am 5013 2006-06-06 11:22:56Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -51,14 +51,11 @@ endif
 if WITH_STATIC_CLASSPATH
 SUBDIRS += tools
 
-VM_ZIP = $(top_builddir)/src/lib/$(VM_ZIP_STRING)
-GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING)
-
-CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)
+CLASSPATH = $(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
 
 $(srcdir)/native.c: nativetable.inc
 
-nativetable.inc: $(VM_ZIP) $(GLIBJ_ZIP) $(top_builddir)/src/native/tools/gennativetable
+nativetable.inc: $(VM_ZIP) $(CLASSPATH_GLIBJ_ZIP) $(top_builddir)/src/native/tools/gennativetable
        $(top_builddir)/src/native/tools/gennativetable -bootclasspath $(CLASSPATH) > $(top_builddir)/src/native/nativetable.inc
 endif
 

diff --git a/src/native/include/Makefile.am b/src/native/include/Makefile.am
index 7376c13d07e56d88f344f98c374cb3ea7dd2835f..241f65232dc9adb33ca1129580e2d89a527238bb 100644 (file)
--- a/src/native/include/Makefile.am
+++ b/src/native/include/Makefile.am
@@ -28,7 +28,7 @@
 ##
 ## Changes:
 ##
-## $Id: Makefile.am 4996 2006-05-31 13:53:16Z motse $
+## $Id: Makefile.am 5013 2006-06-06 11:22:56Z twisti $
 
 ## Process this file with automake to produce Makefile.in
 
@@ -131,10 +131,7 @@ endif
 
 CACAOH = $(top_builddir)/src/cacaoh/cacaoh
 
-VM_ZIP = $(top_builddir)/src/lib/$(VM_ZIP_STRING)
-GLIBJ_ZIP = $(CLASSPATH_PREFIX)/share/classpath/$(GLIBJ_ZIP_STRING)
-
-CLASSPATH = $(VM_ZIP):$(GLIBJ_ZIP)
+CLASSPATH = $(top_builddir)/src/lib/classes/:$(CLASSPATH_GLIBJ_ZIP)
 
 noinst_DATA = $(DO_HEADER_FILES)
 
@@ -145,7 +142,7 @@ $(NO_GEN_HEADER_FILES):
        echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
        $(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class
 
-$(DO_HEADER_FILES): $(VM_ZIP) $(GLIBJ_ZIP)
+$(DO_HEADER_FILES): $(VM_ZIP) $(CLASSPATH_GLIBJ_ZIP)
        @class=`echo $@ | sed -e 's/\.h$$//' -e 's/_/\./g'`; \
        echo "$(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class"; \
        $(CACAOH) -bootclasspath $(CLASSPATH) -d . $$class

diff --git a/src/vm/global.h b/src/vm/global.h
index 01aa3c625e2bbc77232b7f654c9b7f33258d1db9..e8c8fb377e641964d9c332d3140a032b02d2d471 100644 (file)
--- a/src/vm/global.h
+++ b/src/vm/global.h
@@ -33,7 +33,7 @@
             Joseph Wenninger
             Christian Thalinger
 
-   $Id: global.h 4937 2006-05-18 14:33:32Z edwin $
+   $Id: global.h 5013 2006-06-06 11:22:56Z twisti $
 
 */
 
@@ -78,13 +78,6 @@ typedef struct java_objectarray java_objectarray;
 
 /* define some CACAO paths ****************************************************/
 
-#if defined(ENABLE_ZLIB)
-# define CACAO_VM_ZIP_PATH          CACAO_PREFIX "/share/cacao/" VM_ZIP_STRING
-#else
-# define CACAO_VM_ZIP_PATH          CACAO_PREFIX "/share/cacao/"
-#endif
-
-#define CLASSPATH_GLIBJ_ZIP_PATH    CLASSPATH_PREFIX "/share/classpath/" GLIBJ_ZIP_STRING
 #define CLASSPATH_LIBRARY_PATH      CLASSPATH_LIBDIR "/classpath"
 
 

diff --git a/src/vm/vm.c b/src/vm/vm.c
index b54dadceeb9ad0699b659095aa31ca20731b2d6a..5f7bc36c001a7f88963b94c793ae6fcae5b55719 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -486,7 +486,7 @@ static void version(bool opt_exit)
        printf("  maximum heap size   : %d\n", HEAP_MAXSIZE);
        printf("  initial heap size   : %d\n", HEAP_STARTSIZE);
        printf("  stack size          : %d\n", STACK_SIZE);
-       puts("  java.boot.class.path: "CACAO_VM_ZIP_PATH":"CLASSPATH_GLIBJ_ZIP_PATH"");
+       puts("  java.boot.class.path: "CACAO_VM_ZIP":"CLASSPATH_GLIBJ_ZIP"");
        puts("  java.library.path   : "CLASSPATH_LIBRARY_PATH"\n");
 
        puts("Runtime variables:\n");
@@ -573,15 +573,15 @@ bool vm_create(JavaVMInitArgs *vm_args)
                strcpy(bootclasspath, cp);
 
        } else {
-               cplen = strlen(CACAO_VM_ZIP_PATH) +
+               cplen = strlen(CACAO_VM_ZIP) +
                        strlen(":") +
-                       strlen(CLASSPATH_GLIBJ_ZIP_PATH) +
+                       strlen(CLASSPATH_GLIBJ_ZIP) +
                        strlen("0");
 
                bootclasspath = MNEW(char, cplen);
-               strcat(bootclasspath, CACAO_VM_ZIP_PATH);
+               strcat(bootclasspath, CACAO_VM_ZIP);
                strcat(bootclasspath, ":");
-               strcat(bootclasspath, CLASSPATH_GLIBJ_ZIP_PATH);
+               strcat(bootclasspath, CLASSPATH_GLIBJ_ZIP);
        }
 
        /* set the classpath */
@@ -722,14 +722,14 @@ bool vm_create(JavaVMInitArgs *vm_args)
 
                        MFREE(bootclasspath, char, strlen(bootclasspath));
 
-                       cplen = strlen(CACAO_VM_ZIP_PATH) +
+                       cplen = strlen(CACAO_VM_ZIP) +
                                strlen(":") +
                                strlen(opt_arg) +
                                strlen("0");
 
                        bootclasspath = MNEW(char, cplen);
 
-                       strcpy(bootclasspath, CACAO_VM_ZIP_PATH);
+                       strcpy(bootclasspath, CACAO_VM_ZIP);
                        strcat(bootclasspath, ":");
                        strcat(bootclasspath, opt_arg);
                        break;