[kaffe] CVS kaffe (robilad): Merge script for classpath and FAQlet

[Kaffe CVS]

PatchSet 5580 
Date: 2005/02/20 12:03:08
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Merge script for classpath and FAQlet

2005-02-20  Dalibor Topic  <robilad at kaffe.org>

        * developers/resync-classpath.sh: Added new
        script to simplyfy resyncing with GNU Classpath.

        * FAQ/FAQ.gnu-classpath: Small faq on GU Classpath
        merge.

        * Makefile.am (EXTRA_DIST) Added
        developers/resync-classpath.sh and FAQ/FAQ.gnu-classpath.

Members: 
	ChangeLog:1.3624->1.3625 
	Makefile.am:1.89->1.90 
	Makefile.in:1.204->1.205 
	FAQ/FAQ.gnu-classpath:INITIAL->1.1 
	developers/resync-classpath.sh:INITIAL->1.1 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3624 kaffe/ChangeLog:1.3625
--- kaffe/ChangeLog:1.3624	Sun Feb 20 01:18:06 2005
+++ kaffe/ChangeLog	Sun Feb 20 12:03:08 2005
@@ -1,4 +1,15 @@
-2005-02-19  Dalibor Topic  <robilad at kaffe.org>
+2005-02-20  Dalibor Topic  <robilad at kaffe.org>
+
+	* developers/resync-classpath.sh: Added new
+	script to simplyfy resyncing with GNU Classpath.
+
+	* FAQ/FAQ.gnu-classpath: Small faq on GU Classpath
+	merge.
+
+	* Makefile.am (EXTRA_DIST) Added 
+	developers/resync-classpath.sh and FAQ/FAQ.gnu-classpath.
+
+2005-02-20  Dalibor Topic  <robilad at kaffe.org>
 
 	Resynced with GNU Classpath.
 	
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.89 kaffe/Makefile.am:1.90
--- kaffe/Makefile.am:1.89	Sun Feb 13 16:20:41 2005
+++ kaffe/Makefile.am	Sun Feb 20 12:03:10 2005
@@ -75,6 +75,7 @@
 	FAQ/FAQ.gcblock \
 	FAQ/FAQ.gcj \
 	FAQ/FAQ.gcstrategy \
+	FAQ/FAQ.gnu-classpath \
 	FAQ/FAQ.hpux \
 	FAQ/FAQ.hotjava \
 	FAQ/FAQ.install-root \
@@ -134,6 +135,7 @@
 	developers/mauve-results.sh \
 	developers/mnemonicizer.awk \
 	developers/patch-libtool-quote-sys_search_path.diff \
+	developers/resync-classpath.sh \
 	developers/rpm-kaffe.spec \
 	developers/sp_offset.c \
 	developers/unicode.pl \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.204 kaffe/Makefile.in:1.205
--- kaffe/Makefile.in:1.204	Sun Feb 13 21:55:01 2005
+++ kaffe/Makefile.in	Sun Feb 20 12:03:10 2005
@@ -451,6 +451,7 @@
 	FAQ/FAQ.gcblock \
 	FAQ/FAQ.gcj \
 	FAQ/FAQ.gcstrategy \
+	FAQ/FAQ.gnu-classpath \
 	FAQ/FAQ.hpux \
 	FAQ/FAQ.hotjava \
 	FAQ/FAQ.install-root \
@@ -510,6 +511,7 @@
 	developers/mauve-results.sh \
 	developers/mnemonicizer.awk \
 	developers/patch-libtool-quote-sys_search_path.diff \
+	developers/resync-classpath.sh \
 	developers/rpm-kaffe.spec \
 	developers/sp_offset.c \
 	developers/unicode.pl \
===================================================================
Checking out kaffe/FAQ/FAQ.gnu-classpath
RCS:  /home/cvs/kaffe/kaffe/FAQ/FAQ.gnu-classpath,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/FAQ/FAQ.gnu-classpath	Sun Feb 20 12:07:42 2005
@@ -0,0 +1,19 @@
+FAQ.gnu-classpath
+=================
+
+Author: Dalibor Topic
+
+Kaffe uses the excellent GNU Classpath[1] project for its core class library.
+
+It is mostly merged with GNU Classpath, except for two-dozen remaining classes.
+These last unmerged classes (mostly in java.lang, java.lang.reflect and 
+java.util.zip) are getting gradually replaced with their counterparts from 
+GNU Classpath. Eventually, Kaffe will be able to use GNU Classpath out of
+the box, with its own specific and additional classes overlayed.
+
+Meanwhile, synchronisaton with GNU Classpath still happens manually. There 
+is a script in the developers directory called resync-classpath.sh that 
+allows to semi-automatically apply patches to the class library from GNU 
+Classpath's commit list.
+
+[1] http://www.classpath.org
===================================================================
Checking out kaffe/developers/resync-classpath.sh
RCS:  /home/cvs/kaffe/kaffe/developers/resync-classpath.sh,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/developers/resync-classpath.sh	Sun Feb 20 12:07:42 2005
@@ -0,0 +1,25 @@
+## Script to automatically download and apply a patch
+## from GNU Classpath's CVS tree.
+
+## Invoke as resync-classpath.sh month patch
+## for example: resync-classpath.sh 2005-02 168
+
+## Invoke from a directory at same level as
+## Kaffe's top source directory.
+
+PATCH_ARCHIVE=http://lists.gnu.org/archive/html/commit-classpath/${1}/msg00
+
+for i in ${1+"$@"} ; do  \
+  lynx -dump -width=1024 $PATCH_ARCHIVE$i.html \
+  | grep diff \
+  | grep http \
+  | grep -v "\[" \
+  | grep -v ChangeLog \
+  | sed 's/r2=text/r2=text\&diff_format=u/g' \
+  | xargs wget ; thisdir=`pwd`; \
+  cd ../kaffe/libraries/javalib/ ; \
+  for p in $thisdir/*diff* ; do \
+    patch -p 2 -i $p && rm $p ; \
+  done ; 
+  cd $thisdir ; 
+done