[cairo-commit] cairo-java ChangeLog, 1.98, 1.99 Makefile.am, 1.28, 1.29 cairo-java-uninstalled.pc.in, NONE, 1.1 cairo-java.pc.in, 1.3, 1.4 configure.ac, 1.18, 1.19

[Andrew Frederick Cowie]

Committed by: afcowie

Update of /cvs/cairo/cairo-java
In directory kemper:/tmp/cvs-serv22083

Modified Files:
	ChangeLog Makefile.am cairo-java.pc.in configure.ac 
Added Files:
	cairo-java-uninstalled.pc.in 
Log Message:
Apply patches from John Rice <john.rice at sun.com> to address build issues on
Open Solaris.  Adds -unistalled .pc file support their build requirements. Uses
new macro variables macrobasedir and docbasedir.  Closes #361896.  Also applies
patch from #339854 to add a configure option to generate a so called src jar.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-java/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- ChangeLog	4 Aug 2006 02:37:00 -0000	1.98
+++ ChangeLog	17 Oct 2006 06:20:21 -0000	1.99
@@ -1,3 +1,15 @@
+2006-10-17  Andrew Cowie  <andrew at operationaldynamics.com>
+
+	* Makefile.am:
+	* cairo-java.pc.in:
+	* cairo-java-uninstalled.pc.in:
+	* configure.ac:
+	Apply patches from John Rice <john.rice at sun.com> to address build
+	issues on Open Solaris.  Adds -unistalled .pc file support their build
+	requirements. Uses new macro variables macrobasedir and docbasedir.
+	Closes #361896.  Also applies patch from #339854 to add a configure
+	option to generate a so called src jar.
+
 2006-08-03  Andrew Cowie  <andrew at operationaldynamics.com>
 
 	* configure.ac:

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo-java/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.am	28 Feb 2006 18:22:07 -0000	1.28
+++ Makefile.am	17 Oct 2006 06:20:21 -0000	1.29
@@ -2,6 +2,7 @@
 
 CLEANFILES =
 BUILT_SOURCES =
+ALL_LOCAL_DEPS = 
 CLASSPATH = $(JGJAR)
 
 # Force all the .class files to be built very early in the process --
@@ -97,23 +98,36 @@
 cairo$(apiversion).jar: $(cairo_jar_class_files)
 	$(JAR) cf $@ $(patsubst src/java/%.class,-C src/java %.class,$(all_cairo_jar_class_files))
 
+if BUILD_SRCJAR
+
+CLEANFILES += cairo$(apiversion)-src.jar
+ALL_LOCAL_DEPS += cairo$(apiversion)-src.jar
+
+# Config.java is generated and therefore under $(builddir) rather $(srcdir)
+# therefore it's added to the jar separately
+srcjar_files=$(shell echo "$(java_cairo_source_files)" | sed -e 's|src/java/org/freedesktop/cairo/Config.java||g')
+
+cairo$(apiversion)-src.jar:
+	$(JAR) cf $@ $(patsubst src/java/%.java,-C $(top_srcdir)/src/java %.java,$(srcjar_files))
+	$(JAR) uf $@ -C src/java org/freedesktop/cairo/Config.java
+
+cairojavasrcjardir = $(srcjardir)
+cairojavasrcjar_DATA = cairo$(apiversion)-src.jar	
+
+endif
+
 # install pkg-config file
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = cairo-java.pc
 
 # install examples script
-exampledir = $(datadir)/doc/cairo-java-$(VERSION)/examples
+exampledir = $(docbasedir)/cairo-java-$(VERSION)/examples
 
 # build api docs
-apidir = $(datadir)/doc/cairo-java-$(VERSION)/api
-
-if BUILD_JAVADOC
-all-local: $(top_builddir)/doc-stamp
-else
-all-local:
-endif
+apidir = $(docbasedir)/cairo-java-$(VERSION)/api
 
 if BUILD_JAVADOC
+ALL_LOCAL_DEPS += doc-stamp
 doc-stamp: $(java_cairo_source_files)
 	$(JAVADOC) \
 		-d doc/api \
@@ -128,13 +142,15 @@
 	touch doc-stamp
 endif
 
+all-local: $(ALL_LOCAL_DEPS)
+
 # install other docs
-docdir = $(datadir)/doc/cairo-java-$(VERSION)
+docdir = $(docbasedir)/cairo-java-$(VERSION)
 doc_DATA = $(srcdir)/AUTHORS $(srcdir)/COPYING \
 	$(srcdir)/NEWS $(srcdir)/README $(srcdir)/INSTALL
 
 all_dest_cairo_javadoc_html_files = $(patsubst doc/api/%,%,$(shell find doc/api -type f))
-dest_cairo_javadoc_dirs = $(patsubst doc/api/%,%,$(shell find doc/api -mindepth 1 -type d))
+dest_cairo_javadoc_dirs = $(patsubst doc/api/%,%,$(shell cd doc/api; find . -type d))
 
 install-data-hook:
 	cd $(DESTDIR)$(jardir) && \

--- NEW FILE: cairo-java-uninstalled.pc.in ---
Name: Cairo-Java Uninstalled
Description: Cairo Java bindings, Not installed
Version: @VERSION@
Requires: cairo glib-java
api_version=@apiversion@
classpath=${pc_top_builddir}/${pcfiledir}/cairo at apiversion@.jar
jnilibs=${pc_top_builddir}/${pcfiledir}/libcairojni.la
Libs: ${pc_top_builddir}/${pcfiledir}/libcairojava.la

Index: cairo-java.pc.in
===================================================================
RCS file: /cvs/cairo/cairo-java/cairo-java.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cairo-java.pc.in	16 Feb 2006 15:45:08 -0000	1.3
+++ cairo-java.pc.in	17 Oct 2006 06:20:21 -0000	1.4
@@ -2,6 +2,7 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+jardir=@jardir@
 
 
 Name: Cairo-Java

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/cairo-java/configure.ac,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- configure.ac	4 Aug 2006 02:37:00 -0000	1.18
+++ configure.ac	17 Oct 2006 06:20:21 -0000	1.19
@@ -27,7 +27,7 @@
 
 apiversion="1.0"
 
-INSTALLED_CLASSPATH=\${prefix}/share/java/cairo${apiversion}-${VERSION}.jar 
+INSTALLED_CLASSPATH=\${jardir}/cairo${apiversion}-${VERSION}.jar 
 INSTALLED_JNI_DIR=\${prefix}/lib/
 AC_SUBST(INSTALLED_CLASSPATH)
 AC_SUBST(INSTALLED_JNI_DIR)
@@ -77,5 +77,6 @@
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([cairo-java.pc])
+AC_CONFIG_FILES([cairo-java-uninstalled.pc])
 AC_CONFIG_FILES([src/java/org/freedesktop/cairo/Config.java])
 AC_OUTPUT