summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog26
-rw-r--r--configure.ac31
-rw-r--r--lib/Makefile.am6
-rw-r--r--lib/copy-vmresources.sh.in40
-rwxr-xr-xlib/gen-classlist.sh.in2
-rw-r--r--native/jawt/Makefile.am2
-rw-r--r--native/jni/gtk-peer/Makefile.am2
-rw-r--r--native/jni/java-io/Makefile.am2
-rw-r--r--native/jni/java-lang/Makefile.am2
-rw-r--r--native/jni/java-net/Makefile.am2
-rw-r--r--native/jni/java-nio/Makefile.am2
-rw-r--r--native/jni/java-util/Makefile.am2
-rw-r--r--native/jni/midi-alsa/Makefile.am2
-rw-r--r--native/jni/midi-dssi/Makefile.am2
-rw-r--r--native/jni/qt-peer/Makefile.am2
-rw-r--r--native/jni/xmlj/Makefile.am2
16 files changed, 113 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 9cb8dd9dc..2d9007209 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2005-10-23 Guilhem Lavaux <guilhem@kaffe.org>
+
+ * configure.ac: Added support for "--with-native-libdir" and
+ "--with-glibj-dir". Generate copy-vmresources.sh
+
+ * lib/Makefile.am: Call copy-vmresources.sh to fetch possible vm
+ resources from the vmdirs.
+
+ * lib/copy-vmresources.sh.in: New script file.
+
+ * lib/gen-classlist.sh.in: Include com/ as base package for the
+ vm directories.
+
+ * native/jawt/Makefile.am,
+ native/jni/gtk-peer/Makefile.am,
+ native/jni/java-io/Makefile.am,
+ native/jni/java-lang/Makefile.am,
+ native/jni/java-net/Makefile.am,
+ native/jni/java-nio/Makefile.am,
+ native/jni/java-util/Makefile.am,
+ native/jni/midi-alsa/Makefile.am,
+ native/jni/midi-dssi/Makefile.am,
+ native/jni/qt-peer/Makefile.am,
+ native/jni/xmlj/Makefile.am: Install libraries in nativelibdir
+ and not pkglib.
+
2005-10-23 Audrius Meskauskas <AudriusA@Bioinformatics.org>
* org/omg/IOP/RMICustomMaxStreamFormat.java,
diff --git a/configure.ac b/configure.ac
index be7317c95..013633ac0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,6 +176,35 @@ AC_ARG_ENABLE([qt-peer],
[COMPILE_QT_PEER=no])
AM_CONDITIONAL(CREATE_QT_PEER_LIBRARIES, test "x${COMPILE_QT_PEER}" = xyes)
+
+dnl -----------------------------------------------------------
+dnl Sets the native libraries installation dir
+dnl -----------------------------------------------------------
+AC_ARG_WITH([native-libdir],
+ [AS_HELP_STRING(--with-native-libdir,sets the installation directore for native libraries [default='${libdir}/${PACKAGE}'])],
+ [
+ nativelibdir=${withval}
+ ],
+ [
+ nativelibdir='${libdir}/${PACKAGE}'
+ ])
+
+AC_SUBST(nativelibdir)
+
+dnl -----------------------------------------------------------
+dnl Sets the Java library installation dir.
+dnl -----------------------------------------------------------
+AC_ARG_WITH([glibj-dir],
+ [AS_HELP_STRING(--with-glibj-dir,sets the installation directory for glibj.zip [default='${libdir}/${PACKAGE}'])],
+ [
+ glibjdir=${withval}
+ ],
+ [
+ glibjdir='${datadir}/${PACKAGE}'
+ ])
+
+AC_SUBST(glibjdir)
+
dnl -----------------------------------------------------------
dnl Regenerate headers at build time (disabled by default)
dnl -----------------------------------------------------------
@@ -562,7 +591,9 @@ scripts/Makefile
scripts/classpath.spec
lib/Makefile
lib/gen-classlist.sh
+lib/copy-vmresources.sh
examples/Makefile
examples/Makefile.jawt])
AC_CONFIG_COMMANDS([gen-classlist],[chmod 755 lib/gen-classlist.sh])
+AC_CONFIG_COMMANDS([copy-vmresources],[chmod 755 lib/copy-vmresources.sh])
AC_OUTPUT
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f695c1f0c..9a6be98e4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -40,7 +40,7 @@ JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
if INSTALL_GLIBJ_ZIP
-pkgdata_DATA = glibj.zip
+glibj_DATA = glibj.zip
endif # INSTALL_GLIBJ_ZIP
@@ -73,7 +73,7 @@ endif # INSTALL_CLASS_FILES
glibj.zip: classes compile-classes resources
if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF > /dev/null; fi
-resources:
+resources: copy-vmresources.sh
if ! [ -e gnu ]; then mkdir gnu; fi
if ! [ -e gnu/java ]; then mkdir gnu/java; fi
if ! [ -e gnu/java/locale ]; then mkdir gnu/java/locale; fi
@@ -87,6 +87,7 @@ resources:
@list='$(metafiles)'; for p in $$list; do \
cp $(top_srcdir)/resource/$$p $$p; \
done
+ @$(SHELL) ./copy-vmresources.sh
@list='$(iconfiles)'; for p in $$list; do \
cp $(top_srcdir)/$$p $$p; \
done
@@ -145,6 +146,7 @@ clean-local:
-rm -rf java
-rm -rf javax
-rm -rf org
+ -rm -rf com
-rm -rf META-INF
-rm -rf lists
-rm -f Makefile.deps
diff --git a/lib/copy-vmresources.sh.in b/lib/copy-vmresources.sh.in
new file mode 100644
index 000000000..f51247693
--- /dev/null
+++ b/lib/copy-vmresources.sh.in
@@ -0,0 +1,40 @@
+#! @SHELL@
+# @configure_input@
+
+vmdirs=`echo "@vm_classes@" | sed 's%:% %g'`
+destMetaDir=`pwd`/META-INF
+destResDir=`pwd`
+
+for p in ${vmdirs}; do
+ if test -d $p/META-INF; then
+ (cd $p/META-INF;
+ dirs=`find -name "CVS" -prune -o -type d -print`;
+ for u in ${dirs}; do
+ mkdir -p ${destMetaDir}/${u};
+ done;
+ files=`find -name "CVS" -prune -o -type f -print`;
+ for u in ${files}; do
+ cp ${u} ${destMetaDir}/${u};
+ done
+ );
+ fi;
+
+ (cd ${p};
+ resfiles=`find ${p} -name "*.properties"`
+ resdirs=
+ for i in ${resfiles}; do
+ a=`basename ${i}`;
+ b=`echo ${i} | sed "s%${a}%%g"`;
+ resdirs="${resdirs} ${b}";
+ done;
+ resnewdirs=`echo ${resdirs} | uniq`;
+
+ for u in ${resnewdirs}; do
+ mkdir -p ${destResDir}/${u};
+ done
+
+ for f in ${resfiles}; do
+ echo ${f} ${destResDir}/${f};
+ done
+ )
+done
diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in
index b22deced4..2f2dfc8a8 100755
--- a/lib/gen-classlist.sh.in
+++ b/lib/gen-classlist.sh.in
@@ -24,7 +24,7 @@ vm_dirlist=`echo "@vm_classes@" | sed -e 's/:/ /g'`
echo "Adding java source files from VM directory $vm_dirlist"
for dir in $vm_dirlist; do
(cd $dir
- for subdir in java javax gnu org; do
+ for subdir in java javax gnu org com; do
if test -d $subdir; then
@FIND@ $subdir -name '*.java' -print
fi
diff --git a/native/jawt/Makefile.am b/native/jawt/Makefile.am
index 9caa03d47..6c5c871b8 100644
--- a/native/jawt/Makefile.am
+++ b/native/jawt/Makefile.am
@@ -1,4 +1,4 @@
-pkglib_LTLIBRARIES = libjawtgnu.la
+nativelib_LTLIBRARIES = libjawtgnu.la
libjawtgnu_la_SOURCES = jawt.c
libjawtgnu_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la
diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am
index b32162fc9..bb947424c 100644
--- a/native/jni/gtk-peer/Makefile.am
+++ b/native/jni/gtk-peer/Makefile.am
@@ -1,4 +1,4 @@
-pkglib_LTLIBRARIES = libgtkpeer.la
+nativelib_LTLIBRARIES = libgtkpeer.la
# Gtk/Cairo JNI sources.
if GTK_CAIRO
diff --git a/native/jni/java-io/Makefile.am b/native/jni/java-io/Makefile.am
index 5ed8a1baf..efa7d5688 100644
--- a/native/jni/java-io/Makefile.am
+++ b/native/jni/java-io/Makefile.am
@@ -1,4 +1,4 @@
-pkglib_LTLIBRARIES = libjavaio.la
+nativelib_LTLIBRARIES = libjavaio.la
libjavaio_la_SOURCES = javaio.h \
javaio.c \
diff --git a/native/jni/java-lang/Makefile.am b/native/jni/java-lang/Makefile.am
index 34ffe00fb..fb8390f08 100644
--- a/native/jni/java-lang/Makefile.am
+++ b/native/jni/java-lang/Makefile.am
@@ -1,4 +1,4 @@
-pkglib_LTLIBRARIES = libjavalang.la libjavalangreflect.la
+nativelib_LTLIBRARIES = libjavalang.la libjavalangreflect.la
libjavalang_la_SOURCES = java_lang_VMSystem.c \
java_lang_VMFloat.c \
diff --git a/native/jni/java-net/Makefile.am b/native/jni/java-net/Makefile.am
index 3e8c863a9..bf7a92bbf 100644
--- a/native/jni/java-net/Makefile.am
+++ b/native/jni/java-net/Makefile.am
@@ -1,4 +1,4 @@
-pkglib_LTLIBRARIES = libjavanet.la
+nativelib_LTLIBRARIES = libjavanet.la
libjavanet_la_SOURCES = javanet.c \
javanet.h \
diff --git a/native/jni/java-nio/Makefile.am b/native/jni/java-nio/Makefile.am
index 9785fee6d..8fd5ba3ae 100644
--- a/native/jni/java-nio/Makefile.am
+++ b/native/jni/java-nio/Makefile.am
@@ -1,4 +1,4 @@
-pkglib_LTLIBRARIES = libjavanio.la
+nativelib_LTLIBRARIES = libjavanio.la
libjavanio_la_SOURCES = gnu_java_nio_VMPipe.c \
gnu_java_nio_VMSelector.c \
diff --git a/native/jni/java-util/Makefile.am b/native/jni/java-util/Makefile.am
index da617f6a2..148e9ccbe 100644
--- a/native/jni/java-util/Makefile.am
+++ b/native/jni/java-util/Makefile.am
@@ -1,4 +1,4 @@
-pkglib_LTLIBRARIES = libjavautil.la
+nativelib_LTLIBRARIES = libjavautil.la
libjavautil_la_SOURCES = java_util_VMTimeZone.c
diff --git a/native/jni/midi-alsa/Makefile.am b/native/jni/midi-alsa/Makefile.am
index 5206dc979..b6498df2b 100644
--- a/native/jni/midi-alsa/Makefile.am
+++ b/native/jni/midi-alsa/Makefile.am
@@ -1,4 +1,4 @@
-pkglib_LTLIBRARIES = libgjsmalsa.la
+nativelib_LTLIBRARIES = libgjsmalsa.la
libgjsmalsa_la_SOURCES = gnu_javax_sound_midi_alsa_AlsaMidiSequencerDevice.c \
gnu_javax_sound_midi_alsa_AlsaPortDevice.c \
diff --git a/native/jni/midi-dssi/Makefile.am b/native/jni/midi-dssi/Makefile.am
index edcab3041..58ee5c925 100644
--- a/native/jni/midi-dssi/Makefile.am
+++ b/native/jni/midi-dssi/Makefile.am
@@ -1,4 +1,4 @@
-pkglib_LTLIBRARIES = libgjsmdssi.la
+nativelib_LTLIBRARIES = libgjsmdssi.la
libgjsmdssi_la_SOURCES = gnu_javax_sound_midi_dssi_DSSIMidiDeviceProvider.c \
gnu_javax_sound_midi_dssi_DSSISynthesizer.c
diff --git a/native/jni/qt-peer/Makefile.am b/native/jni/qt-peer/Makefile.am
index b2dc92979..031d58fee 100644
--- a/native/jni/qt-peer/Makefile.am
+++ b/native/jni/qt-peer/Makefile.am
@@ -1,7 +1,7 @@
# Qt AWT backend for Classpath
#
-pkglib_LTLIBRARIES = libqtpeer.la
+nativelib_LTLIBRARIES = libqtpeer.la
AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
diff --git a/native/jni/xmlj/Makefile.am b/native/jni/xmlj/Makefile.am
index b0f1f9104..2cb914586 100644
--- a/native/jni/xmlj/Makefile.am
+++ b/native/jni/xmlj/Makefile.am
@@ -1,4 +1,4 @@
-pkglib_LTLIBRARIES = libxmlj.la
+nativelib_LTLIBRARIES = libxmlj.la
libxmlj_la_SOURCES = \
xmlj_dom.c \
View Lorry Controller Status