[cp-patches] [release] FYI: Allow native-only build #02: Add --enable/disable-tools
This enables the building of the tools to be disabled.
ChangeLog:
2008-06-01 Andrew John Hughes [EMAIL PROTECTED]
* Makefile.am: Replace tools with
$(TOOLSDIR).
* m4/acinclude.m4: Include option
to disable building the tools.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: Makefile.am
===
RCS file: /sources/classpath/classpath/Makefile.am,v
retrieving revision 1.47.2.1
diff -u -u -r1.47.2.1 Makefile.am
--- Makefile.am 1 Jun 2008 17:16:50 - 1.47.2.1
+++ Makefile.am 1 Jun 2008 18:42:53 -
@@ -1,7 +1,7 @@
## Input file for automake to generate the Makefile.in used by configure
# lib first, to compile .class files before native code, last examples
-SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
+SUBDIRS = lib doc external include native resource scripts $(TOOLSDIR)
$(EXAMPLESDIR)
DIST_SUBDIRS = lib doc external include native resource scripts tools examples
# Allow users to pass site-specific flags to autoreconf via an env var.
Index: m4/acinclude.m4
===
RCS file: /sources/classpath/classpath/m4/acinclude.m4,v
retrieving revision 1.35
diff -u -u -r1.35 acinclude.m4
--- m4/acinclude.m4 21 Feb 2008 21:07:19 - 1.35
+++ m4/acinclude.m4 1 Jun 2008 18:43:07 -
@@ -115,6 +115,19 @@
EXAMPLESDIR=
fi
AC_SUBST(EXAMPLESDIR)
+
+ AC_ARG_ENABLE([tools],
+ [AS_HELP_STRING(--enable-tools,enable build of the tools
[default=yes])],
+ [case ${enableval} in
+ yes) TOOLSDIR=tools ;;
+ no) TOOLSDIR= ;;
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-tools) ;;
+ esac],
+ [TOOLSDIR=tools])
+ if test x${use_zip} = xno test x${install_class_files} = xno; then
+TOOLSDIR=
+ fi
+ AC_SUBST(TOOLSDIR)
])
dnl ---
Re: [cp-patches] FYI: renderScanline fixlets.
Il giorno dom, 01/06/2008 alle 14.00 +0200, Mark Wielaard ha scritto: Hi Mario, +import gnu.java.awt.peer.x.XDialogPeer; import gnu.java.util.LRUCache; import java.awt.AWTError; This unncessarily pulls in one of the x peers, which won't compile unless you enable escher support. I have removed it: Thanks for catching this, it went into for some unknown reason :) Mario -- Mario Torre, Software Developer, http://www.jroller.com/neugens/ aicas Allerton Interworks Computer Automated Systems GmbH Haid-und-Neu-Straße 18 * D-76131 Karlsruhe * Germany http://www.aicas.com * Tel: +49-721-663 968-53 pgp key: http://subkeys.pgp.net/ PGP Key ID: 80F240CF Fingerprint: BA39 9666 94EC 8B73 27FA FC7C 4086 63E3 80F2 40CF USt-Id: DE216375633, Handelsregister HRB 109481, AG Mannheim Geschäftsführer: Dr. James J. Hunt Please, support open standards: http://opendocumentfellowship.org/petition/ http://www.nosoftwarepatents.com/
[cp-patches] [release] FYI: Allow native-only build #03: Do JNI check in source directory too
This patch ensures that the source directory is also checked by the check_jni_methods script, and fixes distcheck as a result. ChangeLog: 2008-06-01 Andrew John Hughes [EMAIL PROTECTED] * scripts/check_jni_methods.sh.in: Search the source directory as well for when headers are in the tarball. -- Andrew :) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 Index: scripts/check_jni_methods.sh.in === RCS file: /sources/classpath/classpath/scripts/check_jni_methods.sh.in,v retrieving revision 1.3 diff -u -u -r1.3 check_jni_methods.sh.in --- scripts/check_jni_methods.sh.in 10 Feb 2008 11:08:23 - 1.3 +++ scripts/check_jni_methods.sh.in 1 Jun 2008 20:48:01 - @@ -9,7 +9,7 @@ # Find all methods defined in the header files generated # from the java source files. -grep -h '^JNIEXPORT .* Java_' @abs_top_builddir@/include/*.h | \ +grep -h '^JNIEXPORT .* Java_' @abs_top_builddir@/include/*.h @abs_top_srcdir@/include/*.h | \ LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' | \ sort $TMPFILE
[cp-patches] [release] FYI: Allow native-only build #04: Fix use of mkinstalldirs
This fixes the use of mkinstalldirs in lib/Makefile.am to use the variable. ChangeLog: 2008-06-01 Andrew John Hughes [EMAIL PROTECTED] * lib/Makefile.am: Replace explicit mkinstalldirs with $(mkinstalldirs). -- Andrew :) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 Index: lib/Makefile.am === RCS file: /sources/classpath/classpath/lib/Makefile.am,v retrieving revision 1.142.2.1 diff -u -u -r1.142.2.1 Makefile.am --- lib/Makefile.am 1 Jun 2008 17:16:51 - 1.142.2.1 +++ lib/Makefile.am 1 Jun 2008 21:06:21 - @@ -40,7 +40,7 @@ if INSTALL_CLASS_FILES install-data-local: genclasses compile-classes - -$(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir) + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) cp -R gnu $(DESTDIR)$(pkgdatadir) cp -R java $(DESTDIR)$(pkgdatadir) cp -R javax $(DESTDIR)$(pkgdatadir)
[cp-patches] [release] FYI: Allow native-only build #05: Only check for javac if needed
This stops the check for javac/ecj if neither the class libraries,
examples or tools are being built.
ChangeLog:
2008-06-01 Andrew John Hughes [EMAIL PROTECTED]
* configure.ac: Only run javac check
if examples, tools and/or class library are
being built.
* scripts/check_jni_methods.sh.in:
Remove duplicates in the list of JNI methods
for when builddir==srcdir.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: configure.ac
===
RCS file: /sources/classpath/classpath/configure.ac,v
retrieving revision 1.225.2.2
diff -u -u -r1.225.2.2 configure.ac
--- configure.ac1 Jun 2008 17:16:50 - 1.225.2.2
+++ configure.ac1 Jun 2008 21:58:53 -
@@ -728,9 +728,6 @@
AC_CONFIG_LINKS([$ac_config_links_1])
fi
-AC_PROG_JAVAC
-CLASSPATH_JAVAC_MEM_CHECK
-
CLASSPATH_WITH_CLASSLIB
dnl ---
@@ -882,6 +879,15 @@
AM_CONDITIONAL(USE_PREBUILT_GLIBJ_ZIP, test x$use_glibj_zip = xtrue)
AC_SUBST(PATH_TO_GLIBJ_ZIP)
+# Check for javac if we need to build either the class library,
+# the examples or the tools
+if test x${use_glibj_zip} = xfalse || \
+ test x${EXAMPLESDIR} != x || \
+ test x${TOOLSDIR} != x; then
+ AC_PROG_JAVAC
+ CLASSPATH_JAVAC_MEM_CHECK
+fi
+
dnl ---
dnl Build with Escher based X peers.
dnl ---
Index: scripts/check_jni_methods.sh.in
===
RCS file: /sources/classpath/classpath/scripts/check_jni_methods.sh.in,v
retrieving revision 1.3.2.1
diff -u -u -r1.3.2.1 check_jni_methods.sh.in
--- scripts/check_jni_methods.sh.in 1 Jun 2008 20:51:12 - 1.3.2.1
+++ scripts/check_jni_methods.sh.in 1 Jun 2008 21:59:07 -
@@ -11,7 +11,7 @@
# from the java source files.
grep -h '^JNIEXPORT .* Java_' @abs_top_builddir@/include/*.h
@abs_top_srcdir@/include/*.h | \
LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' | \
- sort $TMPFILE
+ sort -u $TMPFILE
# Find all methods in the JNI C source files.
find @abs_top_srcdir@/native/jni -name \*.c | \
[cp-patches] [release] FYI: Allow native-only build #06: Regenerate headers by default only when necessary
This changes the default behaviour for a source tree
which already contains the header files. It now won't
regenerate them unless asked. Generating them by default
for a development (CVS) tree remains the default. This
moves javah to being a dev-only requirement.
ChangeLog:
2008-06-01 Andrew John Hughes [EMAIL PROTECTED]
* configure.ac: Only regenerate headers by
default if the headers aren't in the source tree.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: configure.ac
===
RCS file: /sources/classpath/classpath/configure.ac,v
retrieving revision 1.225.2.3
diff -u -u -r1.225.2.3 configure.ac
--- configure.ac1 Jun 2008 22:09:52 - 1.225.2.3
+++ configure.ac1 Jun 2008 22:42:26 -
@@ -291,13 +291,17 @@
dnl Regenerate headers at build time (disabled by default)
dnl ---
AC_ARG_ENABLE([regen-headers],
- [AS_HELP_STRING(--enable-regen-headers,automatically regenerate
JNI headers [default=yes])],
+ [AS_HELP_STRING(--enable-regen-headers,automatically regenerate
JNI headers [default=yes if headers don't exist])],
[case ${enableval} in
yes) REGENERATE_JNI_HEADERS=yes ;;
no) REGENERATE_JNI_HEADERS=no ;;
*) REGENERATE_JNI_HEADERS=yes ;;
esac],
- [REGENERATE_JNI_HEADERS=yes])
+ [if test -e include/java_lang_VMSystem.h; then
+ REGENERATE_JNI_HEADERS=no ;
+ else
+ REGENERATE_JNI_HEADERS=yes ;
+ fi])
AM_CONDITIONAL(CREATE_JNI_HEADERS, test x${REGENERATE_JNI_HEADERS} = xyes)
dnl ---
Re: [cp-patches] [release] FYI: Allow native-only build #06: Regenerate headers by default only when necessary
Hi, thank you very much for this change! Regards Robert Andrew John Hughes schrieb: This changes the default behaviour for a source tree which already contains the header files. It now won't regenerate them unless asked. Generating them by default for a development (CVS) tree remains the default. This moves javah to being a dev-only requirement. ChangeLog: 2008-06-01 Andrew John Hughes [EMAIL PROTECTED] * configure.ac: Only regenerate headers by default if the headers aren't in the source tree. signature.asc Description: OpenPGP digital signature
[cp-patches] [release] FYI: Allow native-only build #07: Don't delete headers when not generating
This prevents the headers being cleaned away when we haven't configured them to be generated. ChangeLog: 2008-06-02 Andrew John Hughes [EMAIL PROTECTED] * include/Makefile.am: Don't delete headers when not rebuilding them. -- Andrew :) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 Index: include/Makefile.am === RCS file: /sources/classpath/classpath/include/Makefile.am,v retrieving revision 1.85.2.1 diff -u -u -r1.85.2.1 Makefile.am --- include/Makefile.am 1 Jun 2008 17:16:51 - 1.85.2.1 +++ include/Makefile.am 1 Jun 2008 23:09:36 - @@ -1,6 +1,10 @@ include_HEADERS = jni.h jni_md.h jawt.h jawt_md.h +if CREATE_JNI_HEADERS DISTCLEANFILES = jni_md.h config-int.h $(H_FILES) +else +DISTCLEANFILES = jni_md.h config-int.h +endif ARG_JNI_JAVAH = -jni ARG_CLASSPATH_JAVAH = -bootclasspath
