projects
/
cacao.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3b0ae8f
)
* m4/jre-layout.m4 (AC_CHECK_WITH_JRE_LAYOUT): Renamed to
author
Christian Thalinger
<twisti@complang.tuwien.ac.at>
Mon, 28 Apr 2008 19:49:31 +0000
(21:49 +0200)
committer
Christian Thalinger
<twisti@complang.tuwien.ac.at>
Mon, 28 Apr 2008 19:49:31 +0000
(21:49 +0200)
AC_CHECK_ENABLE_JRE_LAYOUT.
* configure.ac: Likewise.
* src/cacao/cacao.c: Renamed WITH_JRE_LAYOUT to ENABLE_JRE_LAYOUT.
* src/native/vm/gnu/gnu_classpath_VMSystemProperties.c: Likewise.
* src/vm/properties.c: Likewise.
* src/vm/vm.c: Likewise.
* src/vmcore/system.h: Likewise.
configure.ac
patch
|
blob
|
history
m4/jre-layout.m4
patch
|
blob
|
history
src/cacao/cacao.c
patch
|
blob
|
history
src/native/vm/gnu/gnu_classpath_VMSystemProperties.c
patch
|
blob
|
history
src/vm/properties.c
patch
|
blob
|
history
src/vm/vm.c
patch
|
blob
|
history
src/vmcore/system.h
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index cda10971d102ebcfdb2cd2da598b5f21ea4a9f54..9f2c1251cb47eadad6928d76990a367c1e13cacc 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-768,12
+768,12
@@
AC_CHECK_WITH_CLASSPATH
dnl Now we check for jre-layout so we can skip some checks that are
dnl not required.
dnl Now we check for jre-layout so we can skip some checks that are
dnl not required.
-AC_CHECK_
WITH
_JRE_LAYOUT
+AC_CHECK_
ENABLE
_JRE_LAYOUT
AC_CHECK_WITH_CLASSPATH_PREFIX
AC_CHECK_WITH_CLASSPATH_CLASSES
AC_CHECK_WITH_CLASSPATH_PREFIX
AC_CHECK_WITH_CLASSPATH_CLASSES
-if test x"${
WITH
_JRE_LAYOUT}" = "xno"; then
+if test x"${
ENABLE
_JRE_LAYOUT}" = "xno"; then
AC_CHECK_WITH_CLASSPATH_LIBDIR
fi
AC_CHECK_WITH_CLASSPATH_LIBDIR
fi
diff --git
a/m4/jre-layout.m4
b/m4/jre-layout.m4
index 25c08b5b70e0ed858507ec0075156e69ae73de9e..29184d56140d06cbc2f939e2005dbc9291860cb7 100644
(file)
--- a/
m4/jre-layout.m4
+++ b/
m4/jre-layout.m4
@@
-23,19
+23,19
@@
dnl 02110-1301, USA.
dnl if we compile for a JRE-style directory layout
dnl if we compile for a JRE-style directory layout
-AC_DEFUN([AC_CHECK_
WITH
_JRE_LAYOUT],[
+AC_DEFUN([AC_CHECK_
ENABLE
_JRE_LAYOUT],[
AC_MSG_CHECKING(if we compile for a JRE-style directory layout)
AC_MSG_CHECKING(if we compile for a JRE-style directory layout)
-AC_ARG_
WITH
([jre-layout],
-
[AS_HELP_STRING(--with-jre-layout,compile for JRE-style directory layout [[default=no
]])],
-
[case "${with
val}" in
- yes)
-
WITH
_JRE_LAYOUT=yes
-
AC_DEFINE([WITH_JRE_LAYOUT], 1, [with
JRE layout])
- ;;
- *)
-
WITH
_JRE_LAYOUT=no
- ;;
- esac],
-
[WITH
_JRE_LAYOUT=no])
-AC_MSG_RESULT(${
WITH
_JRE_LAYOUT})
+AC_ARG_
ENABLE
([jre-layout],
+
[AS_HELP_STRING(--enable-jre-layout,compile for JRE-style directory layout [[default=disabled
]])],
+
[case "${enable
val}" in
+
yes)
+
ENABLE
_JRE_LAYOUT=yes
+
AC_DEFINE([ENABLE_JRE_LAYOUT], 1, [enable
JRE layout])
+
;;
+
*)
+
ENABLE
_JRE_LAYOUT=no
+
;;
+
esac],
+
[ENABLE
_JRE_LAYOUT=no])
+AC_MSG_RESULT(${
ENABLE
_JRE_LAYOUT})
])
])
diff --git
a/src/cacao/cacao.c
b/src/cacao/cacao.c
index 2e0de464189fd8e6e784c3733d922f6fd8df7b87..1f19362584b7ec0df5c8f1f8a09ec52562828e5c 100644
(file)
--- a/
src/cacao/cacao.c
+++ b/
src/cacao/cacao.c
@@
-1,9
+1,7
@@
/* src/cacao/cacao.c - contains main() of cacao
/* src/cacao/cacao.c - contains main() of cacao
- Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
- C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
- E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
- J. Wenninger, J. Wenninger, Institut f. Computersprachen - TU Wien
+ Copyright (C) 1996-2005, 2006, 2007, 2008
+ CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
This file is part of CACAO.
@@
-33,7
+31,7
@@
# include <ltdl.h>
#endif
# include <ltdl.h>
#endif
-#if defined(
WITH
_JRE_LAYOUT)
+#if defined(
ENABLE
_JRE_LAYOUT)
# include <errno.h>
# include <libgen.h>
# include <unistd.h>
# include <errno.h>
# include <libgen.h>
# include <unistd.h>
@@
-94,7
+92,7
@@
int main(int argc, char **argv)
/* load and initialize a Java VM, return a JNI interface pointer in env */
#if defined(ENABLE_LIBJVM)
/* load and initialize a Java VM, return a JNI interface pointer in env */
#if defined(ENABLE_LIBJVM)
-# if defined(
WITH
_JRE_LAYOUT)
+# if defined(
ENABLE
_JRE_LAYOUT)
/* SUN also uses a buffer of 4096-bytes (strace is your friend). */
path = malloc(sizeof(char) * 4096);
/* SUN also uses a buffer of 4096-bytes (strace is your friend). */
path = malloc(sizeof(char) * 4096);
diff --git
a/src/native/vm/gnu/gnu_classpath_VMSystemProperties.c
b/src/native/vm/gnu/gnu_classpath_VMSystemProperties.c
index 2763e9e43fda78c7521a70016749b0d4866c27da..5517c6c1a03bb1b80bdcb72843110e06150603da 100644
(file)
--- a/
src/native/vm/gnu/gnu_classpath_VMSystemProperties.c
+++ b/
src/native/vm/gnu/gnu_classpath_VMSystemProperties.c
@@
-1,9
+1,7
@@
/* src/native/vm/gnu/gnu_classpath_VMSystemProperties.c
/* src/native/vm/gnu/gnu_classpath_VMSystemProperties.c
- Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
- C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
- E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
- J. Wenninger, Institut f. Computersprachen - TU Wien
+ Copyright (C) 1996-2005, 2006, 2007, 2008
+ CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
This file is part of CACAO.
This file is part of CACAO.
@@
-100,7
+98,7
@@
JNIEXPORT void JNICALL Java_gnu_classpath_VMSystemProperties_preInit(JNIEnv *env
JNIEXPORT void JNICALL Java_gnu_classpath_VMSystemProperties_postInit(JNIEnv *env, jclass clazz, java_util_Properties *properties)
{
java_handle_t *p;
JNIEXPORT void JNICALL Java_gnu_classpath_VMSystemProperties_postInit(JNIEnv *env, jclass clazz, java_util_Properties *properties)
{
java_handle_t *p;
-#if defined(
WITH
_JRE_LAYOUT)
+#if defined(
ENABLE
_JRE_LAYOUT)
char *java_home;
char *path;
s4 len;
char *java_home;
char *path;
s4 len;
@@
-115,7
+113,7
@@
JNIEXPORT void JNICALL Java_gnu_classpath_VMSystemProperties_postInit(JNIEnv *en
/* post-set some properties */
/* post-set some properties */
-#if defined(
WITH
_JRE_LAYOUT)
+#if defined(
ENABLE
_JRE_LAYOUT)
/* XXX when we do it that way, we can't set these properties on
commandline */
/* XXX when we do it that way, we can't set these properties on
commandline */
diff --git
a/src/vm/properties.c
b/src/vm/properties.c
index f50460d9beb43c178ee9c4df4d620b5bea5fbd68..9f763f6f3ef5a6a3ca2863c915af768a3a7dc16d 100644
(file)
--- a/
src/vm/properties.c
+++ b/
src/vm/properties.c
@@
-121,7
+121,7
@@
void properties_set(void)
# endif
#endif
# endif
#endif
-#if defined(
WITH
_JRE_LAYOUT)
+#if defined(
ENABLE
_JRE_LAYOUT)
/* SUN also uses a buffer of 4096-bytes (strace is your friend). */
p = MNEW(char, 4096);
/* SUN also uses a buffer of 4096-bytes (strace is your friend). */
p = MNEW(char, 4096);
@@
-237,7
+237,7
@@
void properties_set(void)
strcpy(boot_class_path, p);
}
else {
strcpy(boot_class_path, p);
}
else {
-#if defined(
WITH
_JRE_LAYOUT)
+#if defined(
ENABLE
_JRE_LAYOUT)
# if defined(WITH_CLASSPATH_GNU)
len =
# if defined(WITH_CLASSPATH_GNU)
len =
diff --git
a/src/vm/vm.c
b/src/vm/vm.c
index 30134fcb11eb31a270201d08b74e8a4c1253b56b..ea79bcc71946caef7fadd6fa1f59dd49e9eb0432 100644
(file)
--- a/
src/vm/vm.c
+++ b/
src/vm/vm.c
@@
-635,7
+635,7
@@
static void vm_printconfig(void)
printf(" initial heap size : %d\n", HEAP_STARTSIZE);
printf(" stack size : %d\n", STACK_SIZE);
printf(" initial heap size : %d\n", HEAP_STARTSIZE);
printf(" stack size : %d\n", STACK_SIZE);
-#if defined(
WITH
_JRE_LAYOUT)
+#if defined(
ENABLE
_JRE_LAYOUT)
/* When we're building with JRE-layout, the default paths are the
same as the runtime paths. */
#else
/* When we're building with JRE-layout, the default paths are the
same as the runtime paths. */
#else
diff --git
a/src/vmcore/system.h
b/src/vmcore/system.h
index b41e1c9109d2e25235d076380b04564874dffdbf..2f416d162ea27f2edad0d06a3eca7e5a8e671290 100644
(file)
--- a/
src/vmcore/system.h
+++ b/
src/vmcore/system.h
@@
-39,7
+39,7
@@
# include <fcntl.h>
#endif
# include <fcntl.h>
#endif
-#if defined(
WITH
_JRE_LAYOUT)
+#if defined(
ENABLE
_JRE_LAYOUT)
# if defined(HAVE_LIBGEN_H)
# include <libgen.h>
# endif
# if defined(HAVE_LIBGEN_H)
# include <libgen.h>
# endif
@@
-147,7
+147,7
@@
inline static int system_connect(int sockfd, const struct sockaddr *serv_addr, s
#endif
}
#endif
}
-#if defined(
WITH
_JRE_LAYOUT)
+#if defined(
ENABLE
_JRE_LAYOUT)
inline static char *system_dirname(char *path)
{
#if defined(HAVE_DIRNAME)
inline static char *system_dirname(char *path)
{
#if defined(HAVE_DIRNAME)