Re: fix for new rt.jar stuff

2002-04-03 Thread Jim Pick


Thanks!  I should have tested building outside of the source dirs.

Cheers,

 - Jim

(who's not the biggest automake fan either)

- Original Message - 
From: Patrick Tullmann [EMAIL PROTECTED]
To: Kaffe [EMAIL PROTECTED]
Sent: Tuesday, April 02, 2002 11:33 PM
Subject: fix for new rt.jar stuff


 
 Kaffe fails to build for me (and it failed to build in all the nightly
 tests last night).  It seems that the new rt.jar layout assumed Kaffe
 was being built in its source tree.
 
 The attached patch fixes the problem for me, but I so distrust
 automake et. al. that I won't claim this is correct, or be the one to
 commit this patch without an okay from someone 
 
 -Pat
 
 - -  ---  ---  --   --  - -   -
 Pat Tullmann   [EMAIL PROTECTED]
${HOME} is where the .emacs is.
 
 RCS file: /cvs/kaffe/kaffe/libraries/javalib/Makefile.am,v
 retrieving revision 1.58
 diff -u -b -c -r1.58 Makefile.am
 *** Makefile.am 2 Apr 2002 04:52:06 - 1.58
 --- Makefile.am 3 Apr 2002 07:20:45 -
 ***
 *** 933,938 
   rm -f $(srcdir)/$(CLASSFILE)
   cp $(LIBDIR)/$(CLASSFILE) $(srcdir)/$(CLASSFILE)
   
 ! rt.jar: Klasses.jar
 ! cp Klasses.jar rt.jar
   
 --- 933,938 
   rm -f $(srcdir)/$(CLASSFILE)
   cp $(LIBDIR)/$(CLASSFILE) $(srcdir)/$(CLASSFILE)
   
 ! rt.jar: $(srcdir)/Klasses.jar
 ! cp $(srcdir)/Klasses.jar rt.jar
   
 




Kaffe CVS: kaffe jim

2002-04-03 Thread Kaffe CVS



CVSROOT:/cvs/kaffe
Module name:kaffe
Changes by: jim 02/04/03 08:07:07

Modified files:
libraries/javalib: Makefile.am Makefile.in 

Log message:
Fix for rt.jar copying when building outside of source dirs, thx to Patrick Tullman




Re: patch for include/Makefile.am

2002-04-03 Thread Jim Pick


Yeah, that's obviously bad.  I committed the fix.

The makefiles go a bit overboard in generating headers - I'm pretty sure the
PocketLinux version doesn't do that.  When we get the stable release out,
I'm going to take a fresh look at the whole build system.

Cheers,

 - Jim

- Original Message -
From: Patrick Tullmann [EMAIL PROTECTED]
To: Kaffe [EMAIL PROTECTED]
Sent: Monday, April 01, 2002 4:47 PM
Subject: patch for include/Makefile.am



 The attached patch causes the Make to abort if kaffeh has a problem.
 Currently an error return from kaffeh is ignored.  (I was getting
 errors because my Klasses.jar was badly corrupted.)

 I fixed the problem by including a 'set -e' in the complex shell
 sequence that invokes kaffeh.  -e should cause the shell to bail on an
 unchecked error.  I'm not sure if this is portable, or if there is an
 alternative automake/autoconf/libtool approved way of getting this
 behavior.

 If someone applies this patch, don't forget to regen Makefile.in, too.

 -Pat

 - -  ---  ---  --   --  - -   -
 Pat Tullmann   [EMAIL PROTECTED]
   If Gates got a dime each time Windows crashed... Oh, nevermind...

 Index: Makefile.am
 ===
 RCS file: /cvs/kaffe/kaffe/include/Makefile.am,v
 retrieving revision 1.25
 diff -u -b -r1.25 Makefile.am
 --- Makefile.am 19 Aug 2001 20:32:47 -  1.25
 +++ Makefile.am 2 Apr 2002 00:38:16 -
 @@ -126,7 +126,7 @@
  stamp-h0all: stamp-kaffeh $(KLASSES_JAR)
  ## Then, generate each header file,
  ## but if it does not change, do not touch it
 -   @for f in $(DERIVED_HDRS); do \
 +   @set -e; for f in $(DERIVED_HDRS); do \
   class=`echo $$f | sed -e 's%.*/%%g' -e 's%\.h$$%%' -e
's%_%/%g'`; \
   echo $(KAFFEH) -classpath $(KLASSES_JAR) -o $$f $$class; \
   $(KAFFEH) -classpath $(KLASSES_JAR) -o stamp-h0$$f $$class; \
 @@ -148,7 +148,7 @@
  stamp-h1all: stamp-kaffeh $(KLASSES_JAR)
  ## Then, generate each header file,
  ## but if it does not change, do not touch it
 -   @for f in $(JNI_DERIVED_HDRS); do \
 +   @set -e; for f in $(JNI_DERIVED_HDRS); do \
   class=`echo $$f | sed -e 's%.*/%%g' -e 's%\.h$$%%' -e
's%_%/%g'`; \
   echo $(KAFFEH) -jni -classpath $(KLASSES_JAR) -o $$f $$class;
\
   $(KAFFEH) -jni -classpath $(KLASSES_JAR) -o stamp-h1$$f $$class;
\





Kaffe CVS: kaffe jim

2002-04-03 Thread Kaffe CVS



CVSROOT:/cvs/kaffe
Module name:kaffe
Changes by: jim 02/04/03 08:22:58

Modified files:
include: Makefile.am Makefile.in 

Log message:
Fix makefile so that it bails if kaffeh fails, thx Patrick Tullman