diff options
| author | Guilhem Lavaux <guilhem@kaffe.org> | 2005-10-23 16:59:05 +0000 |
|---|---|---|
| committer | Guilhem Lavaux <guilhem@kaffe.org> | 2005-10-23 16:59:05 +0000 |
| commit | 9a7837a68f134a863077d65ccc697b576c564040 (patch) | |
| tree | 30288b56eb4ce1ab8a4556f5fa368bb197a48cc1 /lib | |
| parent | d29dd0e7d03136b3c2d2e8d0df67b65845182ee6 (diff) | |
| download | classpath-9a7837a68f134a863077d65ccc697b576c564040.tar.gz | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 6 | ||||
| -rw-r--r-- | lib/copy-vmresources.sh.in | 40 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 2 |
3 files changed, 45 insertions, 3 deletions
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 |