[pkg-java] r5204 - trunk/gjdoc/debian

mkoch at alioth.debian.org mkoch at alioth.debian.org
Sat Dec 29 13:13:35 UTC 2007


Author: mkoch
Date: 2007-12-29 13:13:35 +0000 (Sat, 29 Dec 2007)
New Revision: 5204

Modified:
   trunk/gjdoc/debian/aotcompile.py
   trunk/gjdoc/debian/changelog
   trunk/gjdoc/debian/control
   trunk/gjdoc/debian/rules
Log:
gjdoc (0.7.8-6) unstable; urgency=low

  * Build-depend on sharutils for configure test.

 -- Matthias Klose <doko at debian.org>  Wed, 05 Sep 2007 00:26:52 +0200

gjdoc (0.7.8-5) unstable; urgency=low

  * Tighten build-dependency on libgcj-bc.

 -- Matthias Klose <doko at debian.org>  Sat, 25 Aug 2007 20:21:07 +0200

gjdoc (0.7.8-4) unstable; urgency=medium

  * Build using gcj-4.1 on alpha.

 -- Matthias Klose <doko at debian.org>  Sat, 25 Aug 2007 13:53:47 +0200

gjdoc (0.7.8-3) unstable; urgency=low

  * Build using gcj-4.2 on all architectures except m68k.

 -- Matthias Klose <doko at debian.org>  Sat, 25 Aug 2007 11:58:47 +0200

gjdoc (0.7.8-2) unstable; urgency=medium

  * Build using gcj-4.2 on arm, armel, hppa.
  * BC-compile gjdoc.

 -- Matthias Klose <doko at debian.org>  Sat, 04 Aug 2007 22:05:19 +0200

gjdoc (0.7.8-1ubuntu1) gutsy; urgency=low

  * Build using gcj-4.2.
  * Set Ubuntu maintainer address.

 -- Matthias Klose <doko at ubuntu.com>  Sun, 22 Jul 2007 16:24:28 +0200



Modified: trunk/gjdoc/debian/aotcompile.py
===================================================================
--- trunk/gjdoc/debian/aotcompile.py	2007-12-29 12:48:56 UTC (rev 5203)
+++ trunk/gjdoc/debian/aotcompile.py	2007-12-29 13:13:35 UTC (rev 5204)
@@ -24,8 +24,8 @@
 import zipfile
 
 PATHS = {"make":   "/usr/bin/make",
-         "gcj":    "/usr/bin/gcj-4.1",
-         "dbtool": "/usr/bin/gcj-dbtool-4.1"}
+         "gcj":    "/usr/bin/gcj-4.2",
+         "dbtool": "/usr/bin/gcj-dbtool-4.2"}
 
 MAKEFLAGS = []
 GCJFLAGS = ["-g", "-O2", "-fPIC", "-findirect-dispatch", "-fjni"]
@@ -59,10 +59,18 @@
 	$(GCJ) -c $(GCJFLAGS) $< -o $@
 
 TARGETS = \\
-%(targets)s
+%(targets)s \\
+gjdoc
 
-all: $(TARGETS)'''
+all: $(TARGETS)
 
+gjdoc_objects = $(com_sun_javadoc_0_7_8_jar_so_OBJECTS) $(com_sun_tools_doclets_Taglet_0_7_8_jar_so_OBJECTS) $(gnu_classpath_tools_gjdoc_0_7_8_jar_so_OBJECTS) resources.o
+gjdoc: $(gjdoc_objects)
+	$(GCJ) $(GCJFLAGS) $(RPATH) -Wl,-O1 \\
+	    --main=gnu.classpath.tools.gjdoc.Main \\
+	    -Dgnu.gcj.runtime.VMClassLoader.library_control=never $(gjdoc_objects) -o $@
+'''
+
 MAKEFILE_JOB = '''
 %(base)s_SOURCES = \\
 %(jars)s

Modified: trunk/gjdoc/debian/changelog
===================================================================
--- trunk/gjdoc/debian/changelog	2007-12-29 12:48:56 UTC (rev 5203)
+++ trunk/gjdoc/debian/changelog	2007-12-29 13:13:35 UTC (rev 5204)
@@ -1,3 +1,41 @@
+gjdoc (0.7.8-6) unstable; urgency=low
+
+  * Build-depend on sharutils for configure test.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 05 Sep 2007 00:26:52 +0200
+
+gjdoc (0.7.8-5) unstable; urgency=low
+
+  * Tighten build-dependency on libgcj-bc.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 25 Aug 2007 20:21:07 +0200
+
+gjdoc (0.7.8-4) unstable; urgency=medium
+
+  * Build using gcj-4.1 on alpha.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 25 Aug 2007 13:53:47 +0200
+
+gjdoc (0.7.8-3) unstable; urgency=low
+
+  * Build using gcj-4.2 on all architectures except m68k.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 25 Aug 2007 11:58:47 +0200
+
+gjdoc (0.7.8-2) unstable; urgency=medium
+
+  * Build using gcj-4.2 on arm, armel, hppa.
+  * BC-compile gjdoc.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 04 Aug 2007 22:05:19 +0200
+
+gjdoc (0.7.8-1ubuntu1) gutsy; urgency=low
+
+  * Build using gcj-4.2.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko at ubuntu.com>  Sun, 22 Jul 2007 16:24:28 +0200
+
 gjdoc (0.7.8-1) unstable; urgency=low
 
   * New upstream version, runs sucessfully against the backported
@@ -2,2 +40,3 @@
     libjava in gcj-4.1.
+    - Fixes PR gjdoc/24723, resolving links. Closes: #379088.
   * Set java to gij-4.1 instead of gij-4.1-wrapper.

Modified: trunk/gjdoc/debian/control
===================================================================
--- trunk/gjdoc/debian/control	2007-12-29 12:48:56 UTC (rev 5203)
+++ trunk/gjdoc/debian/control	2007-12-29 13:13:35 UTC (rev 5204)
@@ -3,12 +3,15 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Mark Howard <mh at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>
-Build-Depends: debhelper (>> 5), cdbs, gcj-4.1 (>= 4.1.2-2), libgcj-bc (>= 4.1.2-1), fastjar, antlr (>= 2.7.1), tetex-bin, perl, python, time
+Build-Depends: debhelper (>> 5), cdbs,
+ gcj-4.2 (>= 4.2.1-3) [!alpha !m68k], gcj-4.1 (>= 4.1.2) [alpha m68k],
+ libgcj-bc (>= 4.2.1-2) [!alpha !m68k], libgcj-bc (>= 4.1.2) [alpha m68k],
+ fastjar, antlr (>= 2.7.1), texlive-latex-base, perl, python, time, sharutils
 Standards-Version: 3.7.2
 
 Package: gjdoc
 Architecture: any
-Depends: debhelper (>> 5), gij | java-gcj-compat | java1-runtime, antlr, ${shlibs:Depends}
+Depends: debhelper (>> 5), gij | java-gcj-compat | java1-runtime | java2-runtime, antlr, ${shlibs:Depends}
 Conflicts: gjdoc-native
 Replaces: gjdoc-native
 Description: documentation generation framework for java source files

Modified: trunk/gjdoc/debian/rules
===================================================================
--- trunk/gjdoc/debian/rules	2007-12-29 12:48:56 UTC (rev 5203)
+++ trunk/gjdoc/debian/rules	2007-12-29 13:13:35 UTC (rev 5204)
@@ -7,39 +7,71 @@
 VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
 DH_JAVADOC_VER = "0.1"
 
-GCJ = /usr/bin/gcj-4.1
+ifeq (,$(filter $(DEB_HOST_ARCH), alpha m68k))
+  GCC_VERSION   = 4.2
+  LIBGCJ_EXT    = 8
+  LIBGCJ_SOVER  = 81
+  REQ_VERSION   = 4.2.1
+else
+  GCC_VERSION   = 4.1
+  LIBGCJ_EXT    = 7
+  LIBGCJ_SOVER  = 71
+  REQ_VERSION   = 4.1.2-3
+endif
+
+GCJ = gcj-$(GCC_VERSION)
+GCJSUBDIR = /usr/lib/gcj-$(GCC_VERSION)-$(LIBGCJ_SOVER)
 ANTLR_JAR = /usr/share/java/antlr.jar
 
 include /usr/share/gcj/debian_defaults
-ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs) arm hppa m68k))
+#ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs) arm armel hppa m68k))
   with_gcj_native := yes
-endif
+#endif
 
 DEB_CONFIGURE_SCRIPT_ENV = \
-	JAVAC=/usr/bin/gcj-wrapper-4.1 \
-	JAR=/usr/bin/fastjar \
+	JAVA=gij-$(GCC_VERSION) \
+	JAVAC=gcj-wrapper-$(GCC_VERSION) \
+	JAR=fastjar \
 	GCJ=$(GCJ) \
 	ANTLR_JAR=$(ANTLR_JAR)
 
-DEB_CONFIGURE_SCRIPT_ENV += JAVA=/usr/bin/gij-4.1
-GCJ_DBTOOL = /usr/bin/gcj-dbtool-4.1
+GCJ_DBTOOL = gcj-dbtool-$(GCC_VERSION)
 
 DEB_CONFIGURE_USER_FLAGS = --disable-native --enable-xmldoclet
 
 build-native-stamp:
+	rm -rf build-native
 	mkdir -p build-native
 ifeq ($(with_gcj_native),yes)
-	rm -f build-native/*.jar*
+	rm -rf build-native/*.jar*
 	cp -p *.jar build-native/
-	time python debian/aot-compile \
-	        --dbtool='$(GCJ_DBTOOL)' \
+
+	rm -rf build-resources
+	mkdir -p build-resources
+	cd build-resources; \
+	for i in ../*.jar; do \
+	  fastjar -xf $$i; \
+	done
+	find build-resources -name '*.class' -type f | xargs -r rm -f
+	rm -rf build-resources/META-INF build-resources/*.txt
+	find build-resources -depth -type d -empty -delete
+	cd build-resources && find -type f \
+	    | fastjar -c -@ -f $(CURDIR)/build-native/resources.jar
+
+	PYTHONPATH=$(CURDIR)/debian \
+	RPATH=-Wl,-rpath,$(GCJSUBDIR) \
+	    time python debian/aot-compile \
+	        --gcj=$(GCJ) --dbtool='$(GCJ_DBTOOL)' \
 		-L /usr/lib/gcj build-native build-native
 endif
-	time $(GCJ) -g -O2 -o build-native/gjdoc \
+	time $(GCJ) -g -O1 -o build-native/gjdoc \
+	  -Wl,-rpath,$(GCJSUBDIR) \
 	  --main=gnu.classpath.tools.gjdoc.Main \
 	  -Dgnu.gcj.runtime.VMClassLoader.library_control=never \
 	  $(ANTLR_JAR) *.jar
 
+	-build-native/gjdoc --help
+
 	touch build-native-stamp
 
 install/gjdoc:: build-native-stamp
@@ -56,6 +88,7 @@
 	  debian/gjdoc/usr/share/java/gnu-classpath-tools-gjdoc.jar
 
 	install -m755 build-native/gjdoc debian/gjdoc/usr/bin/
+	-cd debian/gjdoc/usr/bin && ./gjdoc --help
 
 ifeq ($(with_gcj_native),yes)
 	mkdir -p debian/gjdoc/usr/lib/gcj
@@ -64,6 +97,9 @@
 	install -m644 build-native/*.db debian/gjdoc/usr/share/gcj/classmap.d/
 endif
 
+#binary-predeb/gjdoc::
+#	sed -i 's/libgcj[1-9][^,]*//;s/,,/,/' debian/gjdoc.substvars
+
 clean::
 	rm -f debian/*.pyc
-	rm -rf build-native*
+	rm -rf build-native* build-resources




More information about the pkg-java-commits mailing list