PatchSet 5500
Date: 2005/02/08 00:14:59
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Fixed make distcheck
2005-02-08 Dalibor Topic <[EMAIL PROTECTED]>
Fixed make distcheck. Removed remaining jar files from tarball.
N.B. We should ship kaffe-1.1.5-rt.jar separately for people that
can't build it on their boxes (ps2linux). Not shipping the
prebuilt jar files reduces the size of the tarball by about
7M, down to 9M.
* Makefile.am (dist-hook): Removed support for precompiled rt.jar.
* configure.ac: Adapted accordingly.
* libraries/javalib/awt-implementations/kaffe/Makefile.am,
libraries/javalib/gmp-math/Makefile.am (EXTRA_DIST): Don't
put the compiled JAR file into the distribution tarball.
(clean-local): Remove compiled classes and JAR files.
* test/internal/Makefile.am,
test/regression/Makefile.am,
test/regression/compiler/Makefile.am:
(CLEANFILES): Added missing files.
Members:
ChangeLog:1.3545->1.3546
Makefile.am:1.87->1.88
Makefile.in:1.200->1.201
configure:1.420->1.421
configure.ac:1.110->1.111
libraries/javalib/awt-implementations/kaffe/Makefile.am:1.3->1.4
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.20->1.21
libraries/javalib/gmp-math/Makefile.am:1.2->1.3
libraries/javalib/gmp-math/Makefile.in:1.22->1.23
test/internal/Makefile.am:1.17->1.18
test/internal/Makefile.in:1.97->1.98
test/regression/Makefile.am:1.92->1.93
test/regression/Makefile.in:1.203->1.204
test/regression/compiler/Makefile.am:1.2->1.3
test/regression/compiler/Makefile.in:1.43->1.44
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3545 kaffe/ChangeLog:1.3546
--- kaffe/ChangeLog:1.3545 Mon Feb 7 19:46:19 2005
+++ kaffe/ChangeLog Tue Feb 8 00:14:59 2005
@@ -1,3 +1,26 @@
+2005-02-08 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Fixed make distcheck. Removed remaining jar files from tarball.
+
+ N.B. We should ship kaffe-1.1.5-rt.jar separately for people that
+ can't build it on their boxes (ps2linux). Not shipping the
+ prebuilt jar files reduces the size of the tarball by about
+ 7M, down to 9M.
+
+ * Makefile.am (dist-hook): Removed support for precompiled rt.jar.
+
+ * configure.ac: Adapted accordingly.
+
+ * libraries/javalib/awt-implementations/kaffe/Makefile.am,
+ libraries/javalib/gmp-math/Makefile.am (EXTRA_DIST): Don't
+ put the compiled JAR file into the distribution tarball.
+ (clean-local): Remove compiled classes and JAR files.
+
+ * test/internal/Makefile.am,
+ test/regression/Makefile.am,
+ test/regression/compiler/Makefile.am:
+ (CLEANFILES): Added missing files.
+
2005-02-07 Dalibor Topic <[EMAIL PROTECTED]>
* test/awt/Calc/Calc.java,
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.87 kaffe/Makefile.am:1.88
--- kaffe/Makefile.am:1.87 Thu Jan 27 01:07:24 2005
+++ kaffe/Makefile.am Tue Feb 8 00:15:01 2005
@@ -178,16 +178,6 @@
done; \
fi
-# Build rt-precompiled.jar and add it to dist
-dist-hook:
- rm -rf build-dist
- mkdir build-dist
- (cd build-dist && \
- ../$(distdir)/configure
--with-extensions=comm,microsoft,pjava,servlet,sound && \
- make && \
- cp libraries/javalib/rt.jar
../$(distdir)/libraries/javalib/rt-precompiled.jar \
- )
-
# Build HTML docs (requires maven and maven-sddocbook-plugin)
docs-docbook-html:
maven sdocbook:generate-html
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.200 kaffe/Makefile.in:1.201
--- kaffe/Makefile.in:1.200 Mon Feb 7 15:46:46 2005
+++ kaffe/Makefile.in Tue Feb 8 00:15:01 2005
@@ -769,9 +769,6 @@
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -955,8 +952,8 @@
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
check-am check-local clean clean-generic clean-libtool \
clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-hdr distclean-libtool \
+ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-exec \
@@ -999,16 +996,6 @@
(cd $$f && $(MAKE) $@); \
done; \
fi
-
-# Build rt-precompiled.jar and add it to dist
-dist-hook:
- rm -rf build-dist
- mkdir build-dist
- (cd build-dist && \
- ../$(distdir)/configure
--with-extensions=comm,microsoft,pjava,servlet,sound && \
- make && \
- cp libraries/javalib/rt.jar
../$(distdir)/libraries/javalib/rt-precompiled.jar \
- )
# Build HTML docs (requires maven and maven-sddocbook-plugin)
docs-docbook-html:
Index: kaffe/configure
diff -u kaffe/configure:1.420 kaffe/configure:1.421
--- kaffe/configure:1.420 Mon Feb 7 15:46:48 2005
+++ kaffe/configure Tue Feb 8 00:15:01 2005
@@ -28649,12 +28649,7 @@
case "$with_rt_jar" in
"")
- if test -f $abssrcdir/libraries/javalib/rt-precompiled.jar; then
- use_rt_jar=true
- PATH_TO_RT_JAR=$abssrcdir/libraries/javalib/rt-precompiled.jar
- else
- use_rt_jar=false
- fi
+ use_rt_jar=false
;;
"no" )
use_rt_jar=false
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.110 kaffe/configure.ac:1.111
--- kaffe/configure.ac:1.110 Sun Feb 6 10:09:56 2005
+++ kaffe/configure.ac Tue Feb 8 00:15:11 2005
@@ -705,12 +705,7 @@
case "$with_rt_jar" in
"")
- if test -f $abssrcdir/libraries/javalib/rt-precompiled.jar; then
- use_rt_jar=true
- PATH_TO_RT_JAR=$abssrcdir/libraries/javalib/rt-precompiled.jar
- else
- use_rt_jar=false
- fi
+ use_rt_jar=false
;;
"no" )
use_rt_jar=false
Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.3
kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.4
--- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.3 Thu Feb
3 03:38:58 2005
+++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am Tue Feb
8 00:15:11 2005
@@ -410,15 +410,14 @@
## Do not delete the previous blank line; update-class-list depends on it
EXTRA_DIST = \
- $(jrelib_DATA) \
$(kaffeawt_jar_SRCS)
JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE)
$(SRCDIRS))
LIBDIR = lib
-clean-hook:
- rm -rf $(LIBDIR)
+clean-local:
+ rm -rf $(LIBDIR) $(CLASSFILE)
.PHONY: new-classes
new-classes: $(top_srcdir)/developers/update-class-list
Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.20
kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.21
--- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.20 Mon Feb
7 15:47:34 2005
+++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in Tue Feb
8 00:15:11 2005
@@ -773,7 +773,6 @@
kaffe/util/log/SimpleLogViewer.java
EXTRA_DIST = \
- $(jrelib_DATA) \
$(kaffeawt_jar_SRCS)
JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE)
$(SRCDIRS))
@@ -907,7 +906,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
distclean: distclean-am
-rm -f Makefile
@@ -952,18 +951,19 @@
uninstall-am: uninstall-info-am uninstall-jrelibDATA
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-jrelibDATA install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-info-am uninstall-jrelibDATA
+ clean-local distclean distclean-generic distclean-libtool \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am \
+ install-jrelibDATA install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am uninstall-jrelibDATA
-clean-hook:
- rm -rf $(LIBDIR)
+clean-local:
+ rm -rf $(LIBDIR) $(CLASSFILE)
.PHONY: new-classes
new-classes: $(top_srcdir)/developers/update-class-list
Index: kaffe/libraries/javalib/gmp-math/Makefile.am
diff -u kaffe/libraries/javalib/gmp-math/Makefile.am:1.2
kaffe/libraries/javalib/gmp-math/Makefile.am:1.3
--- kaffe/libraries/javalib/gmp-math/Makefile.am:1.2 Thu Feb 3 03:38:58 2005
+++ kaffe/libraries/javalib/gmp-math/Makefile.am Tue Feb 8 00:15:12 2005
@@ -21,15 +21,14 @@
## Do not delete the previous blank line; update-class-list depends on it
EXTRA_DIST = \
- $(jrelib_DATA) \
$(gmpjavamath_jar_SRCS)
JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE)
$(SRCDIRS))
LIBDIR = lib
-clean-hook:
- rm -rf $(LIBDIR)
+clean-local:
+ rm -rf $(LIBDIR) $(CLASSFILE)
.PHONY: new-classes
new-classes: $(top_srcdir)/developers/update-class-list
Index: kaffe/libraries/javalib/gmp-math/Makefile.in
diff -u kaffe/libraries/javalib/gmp-math/Makefile.in:1.22
kaffe/libraries/javalib/gmp-math/Makefile.in:1.23
--- kaffe/libraries/javalib/gmp-math/Makefile.in:1.22 Mon Feb 7 15:47:34 2005
+++ kaffe/libraries/javalib/gmp-math/Makefile.in Tue Feb 8 00:15:12 2005
@@ -368,7 +368,6 @@
java/math/BigInteger.java
EXTRA_DIST = \
- $(jrelib_DATA) \
$(gmpjavamath_jar_SRCS)
JAR_CMD1 = (dstdir=`pwd`; cd $(LIBDIR) && $(ZIP) -r $$dstdir/$(CLASSFILE)
$(SRCDIRS))
@@ -502,7 +501,7 @@
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
distclean: distclean-am
-rm -f Makefile
@@ -547,18 +546,19 @@
uninstall-am: uninstall-info-am uninstall-jrelibDATA
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-jrelibDATA install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-info-am uninstall-jrelibDATA
+ clean-local distclean distclean-generic distclean-libtool \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am \
+ install-jrelibDATA install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am uninstall-jrelibDATA
-clean-hook:
- rm -rf $(LIBDIR)
+clean-local:
+ rm -rf $(LIBDIR) $(CLASSFILE)
.PHONY: new-classes
new-classes: $(top_srcdir)/developers/update-class-list
Index: kaffe/test/internal/Makefile.am
diff -u kaffe/test/internal/Makefile.am:1.17
kaffe/test/internal/Makefile.am:1.18
--- kaffe/test/internal/Makefile.am:1.17 Mon Jan 24 15:34:20 2005
+++ kaffe/test/internal/Makefile.am Tue Feb 8 00:15:12 2005
@@ -157,4 +157,11 @@
Exceptions.java \
java/lang/System.java
-CLEANFILES = *.fail *.out core *.core *.class
+CLEANFILES = \
+ *.fail \
+ *.out \
+ core \
+ *.core \
+ *.class \
+ $(nodist_GEN_SRCS) \
+ java/lang/System.class
Index: kaffe/test/internal/Makefile.in
diff -u kaffe/test/internal/Makefile.in:1.97
kaffe/test/internal/Makefile.in:1.98
--- kaffe/test/internal/Makefile.in:1.97 Mon Feb 7 15:47:36 2005
+++ kaffe/test/internal/Makefile.in Tue Feb 8 00:15:12 2005
@@ -455,7 +455,15 @@
Exceptions.java \
java/lang/System.java
-CLEANFILES = *.fail *.out core *.core *.class
+CLEANFILES = \
+ *.fail \
+ *.out \
+ core \
+ *.core \
+ *.class \
+ $(nodist_GEN_SRCS) \
+ java/lang/System.class
+
all: all-am
.SUFFIXES:
Index: kaffe/test/regression/Makefile.am
diff -u kaffe/test/regression/Makefile.am:1.92
kaffe/test/regression/Makefile.am:1.93
--- kaffe/test/regression/Makefile.am:1.92 Sun Jan 30 12:42:47 2005
+++ kaffe/test/regression/Makefile.am Tue Feb 8 00:15:14 2005
@@ -318,7 +318,16 @@
$(BCEL_TESTS_DIST) \
TestGnuCrypto.java
-CLEANFILES = *.class *.fail *.out core *.core ExceptionTest ziptest1.zip \
- ziptest2.zip frozen_serial
+CLEANFILES = \
+ *.class \
+ *.fail \
+ *.out \
+ core \
+ *.core \
+ ExceptionTest \
+ ziptest1.zip \
+ ziptest2.zip \
+ frozen_serial \
+ serializedFoos.bin
all-am: TestScript
Index: kaffe/test/regression/Makefile.in
diff -u kaffe/test/regression/Makefile.in:1.203
kaffe/test/regression/Makefile.in:1.204
--- kaffe/test/regression/Makefile.in:1.203 Mon Feb 7 15:47:38 2005
+++ kaffe/test/regression/Makefile.in Tue Feb 8 00:15:15 2005
@@ -631,8 +631,17 @@
$(BCEL_TESTS_DIST) \
TestGnuCrypto.java
-CLEANFILES = *.class *.fail *.out core *.core ExceptionTest ziptest1.zip \
- ziptest2.zip frozen_serial
+CLEANFILES = \
+ *.class \
+ *.fail \
+ *.out \
+ core \
+ *.core \
+ ExceptionTest \
+ ziptest1.zip \
+ ziptest2.zip \
+ frozen_serial \
+ serializedFoos.bin
all: all-recursive
Index: kaffe/test/regression/compiler/Makefile.am
diff -u kaffe/test/regression/compiler/Makefile.am:1.2
kaffe/test/regression/compiler/Makefile.am:1.3
--- kaffe/test/regression/compiler/Makefile.am:1.2 Thu Aug 26 08:16:57 2004
+++ kaffe/test/regression/compiler/Makefile.am Tue Feb 8 00:15:15 2005
@@ -29,7 +29,7 @@
check-am: CompileScript $(CLASS_FILES)
-CLEANFILES=$(CLASS_FILES)
+CLEANFILES=$(CLASS_FILES) InnerTest1_*.class
EXTRA_DIST = \
VarInit.java \
Index: kaffe/test/regression/compiler/Makefile.in
diff -u kaffe/test/regression/compiler/Makefile.in:1.43
kaffe/test/regression/compiler/Makefile.in:1.44
--- kaffe/test/regression/compiler/Makefile.in:1.43 Mon Feb 7 15:47:40 2005
+++ kaffe/test/regression/compiler/Makefile.in Tue Feb 8 00:15:15 2005
@@ -357,7 +357,7 @@
InnerTest1_B$$X.class
SETUP_ENVIRONMENT = env `. $(top_builddir)/BUILD_ENVIRONMENT; sed 's/.*export
\(.*\)/echo \1=$$\1/' < $(top_builddir)/BUILD_ENVIRONMENT | sh`
-CLEANFILES = $(CLASS_FILES)
+CLEANFILES = $(CLASS_FILES) InnerTest1_*.class
EXTRA_DIST = \
VarInit.java \
VarInit2.java \
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
