[cp-patches] FYI: [cp-tools] Build a cpgenerators.jar

Andrew John Hughes Sat, 28 Jun 2008 17:03:32 -0700

The class files for the generator programs (localegen, currencygen)
are not packaged.  This corrects that with a cpgenerators.jar.


ChangeLog:

2008-06-28  Andrew John Hughes  <[EMAIL PROTECTED]>

        * Makefile.am: Create a cpgenerators JAR file
        for localegen and currencygen.

-- 
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/cp-tools/Makefile.am,v
retrieving revision 1.11
diff -u -u -r1.11 Makefile.am
--- Makefile.am 28 Jun 2008 22:35:38 -0000      1.11
+++ Makefile.am 28 Jun 2008 23:39:02 -0000
@@ -14,17 +14,20 @@
 GCJCOMPILE = $(LIBGCJCOMPILE) -MF $(@:.o=.d)
 LTGCJCOMPILE = $(LIBGCJCOMPILE) -MF $(@:.lo=.d)
 
+data_JARS = cpgenerators-$(VERSION).jar
 if USE_GNUBYTECODE
-data_JARS = cptools-$(VERSION).jar
+data_JARS += cptools-$(VERSION).jar
 endif
 
 BUILT_SOURCES = $(data_JARS)
 
+lib_LTLIBRARIES = libcpgenerators.la 
+
 if ENABLE_GCJ_BINARY
 bin_PROGRAMS = localegen currencygen
 if USE_GNUBYTECODE
 bin_PROGRAMS += javap javah
-lib_LTLIBRARIES = libcptools.la libbytecode.la 
+lib_LTLIBRARIES += libcptools.la libbytecode.la 
 libbytecode_la_LINK = $(GCJLINK) 
 nodist_libbytecode_la_SOURCES = $(BYTECODE_JAR)
 endif
@@ -52,29 +55,15 @@
        -Dgnu.gcj.runtime.VMClassLoader.library_control=never
 endif
 
-localegen_SOURCES = \
-       src/gnu/ldml/AliasElement.java \
-       src/gnu/ldml/Analyzer.java \
-       src/gnu/ldml/Constants.java \
-       src/gnu/ldml/DataElement.java \
-       src/gnu/ldml/DetailedListElement.java \
-       src/gnu/ldml/Element.java \
-       src/gnu/ldml/ExpansionElement.java \
-       src/gnu/ldml/ListDataElement.java \
-       src/gnu/ldml/OrderedListBaseElement.java \
-       src/gnu/ldml/OrderedListElement.java \
-       src/gnu/ldml/ParseException.java \
-       src/gnu/ldml/Parser.java \
-       src/gnu/ldml/ResetElement.java \
-        src/gnu/localegen/PropertiesGenerator.java \
-       src/gnu/localegen/CollationInterpreter.java \
-       src/gnu/localegen/JavaGenerator.java \
-       src/gnu/localegen/Main.java
+localegen_SOURCES =
+localegen_LINK = $(GCJLINK)
+localegen_LDADD = libcpgenerators.la 
 localegen_LDFLAGS = --main=gnu.localegen.Main \
        -Dgnu.gcj.runtime.VMClassLoader.library_control=never
 
-currencygen_SOURCES = \
-       src/gnu/currencygen/Main.java
+currencygen_SOURCES =
+currencygen_LINK = $(GCJLINK)
+currencygen_LDADD = libcpgenerators.la 
 currencygen_LDFLAGS = --main=gnu.currencygen.Main
 
 else
@@ -116,7 +105,7 @@
 cptools_jar_CLASSES = $(patsubst 
src/%.java,classes/%.class,$(cptools_jar_SOURCES))
 
 cptools-$(VERSION).jar: createdirectories $(cptools_jar_CLASSES)
-       $(JAR) cf $@ -C classes gnu
+       $(JAR) cf $@ -C classes gnu/classpath
 
 #gjdoc.mf:
 #      echo 'Main-Class: gnu.classpath.tools.gjdoc.Main' > gjdoc.mf
@@ -132,6 +121,44 @@
        $(JAVAC) $(MY_JAVAC_FLAGS) -d classes $<
 endif
 
+localegen_java_files = \
+       src/gnu/ldml/AliasElement.java \
+       src/gnu/ldml/Analyzer.java \
+       src/gnu/ldml/Constants.java \
+       src/gnu/ldml/DataElement.java \
+       src/gnu/ldml/DetailedListElement.java \
+       src/gnu/ldml/Element.java \
+       src/gnu/ldml/ExpansionElement.java \
+       src/gnu/ldml/ListDataElement.java \
+       src/gnu/ldml/OrderedListBaseElement.java \
+       src/gnu/ldml/OrderedListElement.java \
+       src/gnu/ldml/ParseException.java \
+       src/gnu/ldml/Parser.java \
+       src/gnu/ldml/ResetElement.java \
+        src/gnu/localegen/PropertiesGenerator.java \
+       src/gnu/localegen/CollationInterpreter.java \
+       src/gnu/localegen/JavaGenerator.java \
+       src/gnu/localegen/Main.java
+
+currencygen_java_files = \
+       src/gnu/currencygen/Main.java
+
+cpgenerators_jar_SOURCES = $(localegen_java_files) $(currencygen_java_files)
+
+if ENABLE_GCJ_BINARY
+libcpgenerators_la_SOURCES = $(cpgenerators_jar_SOURCES)
+endif
+
+cpgenerators_jar_CLASSES = $(patsubst 
src/%.java,classes/%.class,$(cpgenerators_jar_SOURCES))
+
+cpgenerators-$(VERSION).jar: createdirectories $(cpgenerators_jar_CLASSES)
+       (cd classes; \
+       $(JAR) cf ../$@ gnu/ldml gnu/localegen gnu/currencygen; \
+       cd ..)
+
+$(cpgenerators_jar_CLASSES): classes/gnu/%.class: $(srcdir)/src/gnu/%.java
+       $(JAVAC) $(MY_JAVAC_FLAGS) -d classes $<
+
 createdirectories:
        mkdir -p classes
 
@@ -147,12 +174,13 @@
        cp $(srcdir)/bin/native2ascii $(distdir)/bin/
 
 
-if USE_GNUBYTECODE
 install-data-hook:
        $(INSTALL) -d $(datadir)/java
        $(INSTALL) --mode 644 $(data_JARS) $(datadir)/java
-       $(LN_S) -f $(datadir)/java/cptools-$(VERSION).jar 
$(datadir)/java/cptools.jar
-endif
+       $(LN_S) -f $(datadir)/java/cpgenerators-$(VERSION).jar 
$(datadir)/java/cpgenerators.jar
+       if [ -e cptools-$(VERSION).jar ]; then \
+         $(LN_S) -f $(datadir)/java/cptools-$(VERSION).jar 
$(datadir)/java/cptools.jar; \
+       fi
 
 test: tests/%.class $(srcdir)/src/test/%.java
        $(JAVAC) -g -d tests $<

[cp-patches] FYI: [cp-tools] Build a cpgenerators.jar

Reply via email to