PatchSet 4604
Date: 2004/04/02 19:39:51
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fixed problems with rt.jar creation
2004-04-02 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/Makefile.am.in:
Fixed rt.jar creation to no longer need to copy files around.
* libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in:
Regenerated.
Members:
ChangeLog:1.2181->1.2182
libraries/javalib/Makefile.am:1.179->1.180
libraries/javalib/Makefile.am.in:1.8->1.9
libraries/javalib/Makefile.in:1.240->1.241
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2181 kaffe/ChangeLog:1.2182
--- kaffe/ChangeLog:1.2181 Thu Apr 1 16:23:48 2004
+++ kaffe/ChangeLog Fri Apr 2 19:39:51 2004
@@ -1,3 +1,12 @@
+2004-04-02 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * libraries/javalib/Makefile.am.in:
+ Fixed rt.jar creation to no longer need to copy files around.
+
+ * libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in:
+ Regenerated.
+
2004-04-01 Guilhem Lavaux <[EMAIL PROTECTED]>
* m4/gcc_attribute.m4: Really add the unused attribute.
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.179
kaffe/libraries/javalib/Makefile.am:1.180
--- kaffe/libraries/javalib/Makefile.am:1.179 Tue Mar 30 13:45:12 2004
+++ kaffe/libraries/javalib/Makefile.am Fri Apr 2 19:39:54 2004
@@ -2672,9 +2672,15 @@
if HAVE_ZIP
JAR_CMD1 = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -r $$dstdir/rt.jar META-INF)
JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -DX -r ../rt.jar $(SRCDIRS))
+JAR_CMD3 = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -DX -r $$dstdir/rt.jar
$(gnu_regexp_message_bundles))
+JAR_CMD4 = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -DX -r $$dstdir/rt.jar
$(gnu_java_locale_bundles))
+JAR_CMD5 = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -DX -r $$dstdir/rt.jar
$(serialized_converters))
else
JAR_CMD1 = $(JAR) -cvf rt.jar -C $(LIBDIR) $(SRCDIRS)
JAR_CMD2 = $(JAR) -uvf rt.jar -C $(srcdir) META-INF/
+JAR_CMD3 = $(JAR) -uvf rt.jar -C $(srcdir) $(gnu_regexp_message_bundles)
+JAR_CMD4 = $(JAR) -uvf rt.jar -C $(srcdir) $(gnu_java_locale_bundles)
+JAR_CMD5 = $(JAR) -uvf rt.jar -C $(srcdir) $(serialized_converters)
endif
.PHONY: jar-classes
@@ -2683,21 +2689,12 @@
cp $(PATH_TO_RT_JAR) rt.jar
else
jar-classes rt.jar: $(LIBDIR)/stamp $(Klasses_jar_SRCS)
- if [ ! -d $(LIBDIR)/kaffe ] ; then \
- mkdir $(LIBDIR)/kaffe ; \
- mkdir $(LIBDIR)/kaffe/io ; \
- fi
- for i in $(serialized_converters) ; do cp $(srcdir)/$$i $(LIBDIR)/$$i ; done
- if [ ! -d $(LIBDIR)/gnu ] ; then \
- mkdir $(LIBDIR)/gnu ; \
- mkdir $(LIBDIR)/gnu/regexp ; \
- mkdir $(LIBDIR)/gnu/java ; \
- mkdir $(LIBDIR)/gnu/java/locale ; \
- fi
- for i in $(gnu_regexp_message_bundles) $(gnu_java_locale_bundles) ; do cp
$(srcdir)/$$i $(LIBDIR)/$$i ; done
rm -f rt.jar
$(JAR_CMD1)
$(JAR_CMD2)
+ $(JAR_CMD3)
+ $(JAR_CMD4)
+ $(JAR_CMD5)
endif
.PHONY: build-classes Klasses
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.8
kaffe/libraries/javalib/Makefile.am.in:1.9
--- kaffe/libraries/javalib/Makefile.am.in:1.8 Sat Jan 24 22:03:07 2004
+++ kaffe/libraries/javalib/Makefile.am.in Fri Apr 2 19:39:54 2004
@@ -211,9 +211,15 @@
if HAVE_ZIP
JAR_CMD1 = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -r $$dstdir/rt.jar META-INF)
JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -DX -r ../rt.jar $(SRCDIRS))
+JAR_CMD3 = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -DX -r $$dstdir/rt.jar
$(gnu_regexp_message_bundles))
+JAR_CMD4 = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -DX -r $$dstdir/rt.jar
$(gnu_java_locale_bundles))
+JAR_CMD5 = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -DX -r $$dstdir/rt.jar
$(serialized_converters))
else
JAR_CMD1 = $(JAR) -cvf rt.jar -C $(LIBDIR) $(SRCDIRS)
JAR_CMD2 = $(JAR) -uvf rt.jar -C $(srcdir) META-INF/
+JAR_CMD3 = $(JAR) -uvf rt.jar -C $(srcdir) $(gnu_regexp_message_bundles)
+JAR_CMD4 = $(JAR) -uvf rt.jar -C $(srcdir) $(gnu_java_locale_bundles)
+JAR_CMD5 = $(JAR) -uvf rt.jar -C $(srcdir) $(serialized_converters)
endif
.PHONY: jar-classes
@@ -222,21 +228,12 @@
cp $(PATH_TO_RT_JAR) rt.jar
else
jar-classes rt.jar: $(LIBDIR)/stamp $(Klasses_jar_SRCS)
- if [ ! -d $(LIBDIR)/kaffe ] ; then \
- mkdir $(LIBDIR)/kaffe ; \
- mkdir $(LIBDIR)/kaffe/io ; \
- fi
- for i in $(serialized_converters) ; do cp $(srcdir)/$$i $(LIBDIR)/$$i ; done
- if [ ! -d $(LIBDIR)/gnu ] ; then \
- mkdir $(LIBDIR)/gnu ; \
- mkdir $(LIBDIR)/gnu/regexp ; \
- mkdir $(LIBDIR)/gnu/java ; \
- mkdir $(LIBDIR)/gnu/java/locale ; \
- fi
- for i in $(gnu_regexp_message_bundles) $(gnu_java_locale_bundles) ; do cp
$(srcdir)/$$i $(LIBDIR)/$$i ; done
rm -f rt.jar
$(JAR_CMD1)
$(JAR_CMD2)
+ $(JAR_CMD3)
+ $(JAR_CMD4)
+ $(JAR_CMD5)
endif
.PHONY: build-classes Klasses
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.240
kaffe/libraries/javalib/Makefile.in:1.241
--- kaffe/libraries/javalib/Makefile.in:1.240 Tue Mar 30 13:45:13 2004
+++ kaffe/libraries/javalib/Makefile.in Fri Apr 2 19:39:54 2004
@@ -3073,6 +3073,12 @@
@[EMAIL PROTECTED] = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -r $$dstdir/rt.jar
META-INF)
@[EMAIL PROTECTED] = $(JAR) -uvf rt.jar -C $(srcdir) META-INF/
@[EMAIL PROTECTED] = (cd $(LIBDIR) && $(ZIP) -DX -r ../rt.jar $(SRCDIRS))
[EMAIL PROTECTED]@JAR_CMD3 = $(JAR) -uvf rt.jar -C $(srcdir)
$(gnu_regexp_message_bundles)
[EMAIL PROTECTED]@JAR_CMD3 = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -DX -r
$$dstdir/rt.jar $(gnu_regexp_message_bundles))
[EMAIL PROTECTED]@JAR_CMD4 = $(JAR) -uvf rt.jar -C $(srcdir) $(gnu_java_locale_bundles)
[EMAIL PROTECTED]@JAR_CMD4 = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -DX -r
$$dstdir/rt.jar $(gnu_java_locale_bundles))
[EMAIL PROTECTED]@JAR_CMD5 = $(JAR) -uvf rt.jar -C $(srcdir) $(serialized_converters)
[EMAIL PROTECTED]@JAR_CMD5 = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -DX -r
$$dstdir/rt.jar $(serialized_converters))
all: all-am
.SUFFIXES:
@@ -3317,21 +3323,12 @@
@[EMAIL PROTECTED] rt.jar:
@USE_PRECOMPILED_RT_JAR_TRUE@ cp $(PATH_TO_RT_JAR) rt.jar
@[EMAIL PROTECTED] rt.jar: $(LIBDIR)/stamp $(Klasses_jar_SRCS)
[EMAIL PROTECTED]@ if [ ! -d $(LIBDIR)/kaffe ] ; then \
[EMAIL PROTECTED]@ mkdir $(LIBDIR)/kaffe ; \
[EMAIL PROTECTED]@ mkdir $(LIBDIR)/kaffe/io ; \
[EMAIL PROTECTED]@ fi
[EMAIL PROTECTED]@ for i in $(serialized_converters) ; do cp $(srcdir)/$$i
$(LIBDIR)/$$i ; done
[EMAIL PROTECTED]@ if [ ! -d $(LIBDIR)/gnu ] ; then \
[EMAIL PROTECTED]@ mkdir $(LIBDIR)/gnu ; \
[EMAIL PROTECTED]@ mkdir $(LIBDIR)/gnu/regexp ; \
[EMAIL PROTECTED]@ mkdir $(LIBDIR)/gnu/java ; \
[EMAIL PROTECTED]@ mkdir $(LIBDIR)/gnu/java/locale ; \
[EMAIL PROTECTED]@ fi
[EMAIL PROTECTED]@ for i in $(gnu_regexp_message_bundles)
$(gnu_java_locale_bundles) ; do cp $(srcdir)/$$i $(LIBDIR)/$$i ; done
@USE_PRECOMPILED_RT_JAR_FALSE@ rm -f rt.jar
@USE_PRECOMPILED_RT_JAR_FALSE@ $(JAR_CMD1)
@USE_PRECOMPILED_RT_JAR_FALSE@ $(JAR_CMD2)
[EMAIL PROTECTED]@ $(JAR_CMD3)
[EMAIL PROTECTED]@ $(JAR_CMD4)
[EMAIL PROTECTED]@ $(JAR_CMD5)
.PHONY: build-classes Klasses
build-classes Klasses: rt.jar
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
