2005-11-01 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge from HEAD --> generics for 2005/09/20 - 2005/11/01.

4 files changed, 46 insertions, 4 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 765e0e236..8326d97c8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -44,7 +44,7 @@ JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
 
 if INSTALL_GLIBJ_ZIP
 
-pkgdata_DATA = glibj.zip
+glibj_DATA = glibj.zip
 
 endif # INSTALL_GLIBJ_ZIP
 
@@ -77,7 +77,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
@@ -91,6 +91,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
@@ -149,6 +150,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/lib/split-for-gcj.sh b/lib/split-for-gcj.sh
index 0f5ffaff2..f69b79797 100755
--- a/lib/split-for-gcj.sh
+++ b/lib/split-for-gcj.sh
@@ -31,7 +31,7 @@ test -d lists || mkdir lists
 for dir in java javax gnu org; do
    fgrep /$dir/ classes | while read file; do
       pkg=`echo "$file " | sed -n -e "s,^.*/\($dir/.*\)/[^/]*$,\1,p"`
-      list=lists/`echo $pkg | sed -e 's,/,-,g'`
+      list=lists/`echo $pkg | sed -e 's,/,-,g' | cut -f1-3 -d-`
       echo "$file" >> ${list}.list.1
       f2=`echo "$file" | sed -n -e "s,^.*/\($dir/.*\)$,\1,p"`
       f2=`echo "$f2" | sed -e 's/.java$//'`.class