[statsvn] 03/37: Some changes on depends and compile

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Apr 19 22:55:41 BST 2018 

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository statsvn.

commit 95ba49514dc86e814fe8df3d58a8439703b8d4e8
Author: Christian Bayle <bayle at debian.org>
Date:   Sun Sep 5 20:08:23 2004 +0000

    Some changes on depends and compile
---
 debian/README.Debian |  6 +++++-
 debian/changelog     |  8 ++++++++
 debian/control       |  4 ++--
 debian/copyright     |  1 +
 debian/rules         | 25 +++++++++++++++++++------
 statcvs              | 17 +++++++++++------
 6 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 5a00167..32504b6 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -16,6 +16,10 @@ How to use:
 	You can get all options running:
 		java -jar /usr/share/java/statcvs.jar
 
-	This probably run only with Sun Runtime library
+	This probably run only with Sun JVM
+
+	You may encounter problem with huge log so the statcvs wrapper don't work
+	I had to use as an example 
+		/usr/lib/j2sdk1.4-sun/bin/java -server -mx512m -ms128m -ss128m -jar /usr/share/java/statcvs.jar -verbose -output-dir stats -title GForge ~/local/gforge/gforge_cvs.log ~/local/gforge/
 
  -- Christian Bayle <bayle at debian.org>, Fri, 11 Jul 2003 02:20:51 +0200
diff --git a/debian/changelog b/debian/changelog
index b2f15a8..b64a745 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+statcvs (20030713-3) unstable; urgency=low
+
+  * Applied patch proposed by Gary Hennigan
+  to deal with cvs log new format (Closes: #257622)
+  * Modified stacvs wrapper to take in account more possible JVM 
+
+ -- Christian Bayle <bayle at debian.org>  Sun,  5 Sep 2004 20:21:19 +0200
+
 statcvs (20030713-2) unstable; urgency=low
 
   * Corrected dependancies (Closes: bug#201502)
diff --git a/debian/control b/debian/control
index 63b841d..e747036 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: statcvs
 Section: contrib/devel
 Priority: optional
 Maintainer: Christian Bayle <bayle at debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), j2sdk1.4, ant
+Build-Depends-Indep: debhelper (>> 4.0.0), sun-j2sdk1.4, ant
 Standards-Version: 3.6.0
 
 Package: statcvs
 Section: contrib/devel
 Architecture: all
-Depends: classpath, kaffe | j2re1.4 | java2-runtime
+Depends: classpath, kaffe | java2-runtime
 Description: CVS Repository statistic analysis tool, written in Java
  StatCvs retrieves information from a CVS repository and generates
  various tables and charts describing the project development,
diff --git a/debian/copyright b/debian/copyright
index 8325a29..6b1a8f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ This package was debianized by Christian Bayle <bayle at debian.org>, Fri, 11 Jul 2
 
 It was downloaded from http://statcvs.sf.net CVS
 This package contain code of jcommon-0.6.4 jfreechart-0.9.2 downloaded from http://sourceforge.net/projects/jfreechart
+This was build using the j2sdk1.4 package built with mpkg-j2sdk
 
 Upstream Authors: Manuel Schulze, Lukasz Pekacki, Richard Cyganiak, Anja Jentzsch
 JFreechart Author is David Gilbert and others
diff --git a/debian/rules b/debian/rules
index e5325b5..5905ead 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,17 @@
 #export DH_VERBOSE=1
 
 # Build 
-export JAVA_HOME=/usr/lib/j2se/1.4
-export JAVA=/usr/lib/j2se/1.4/bin/java
-export JAVAC=/usr/lib/j2se/1.4/bin/javac
-export CLASSPATH=/usr/lib/j2se/1.4/jre/lib/rt.jar
-export CLASSPATH=$(JAVA_HOME)/lib/tools.jar:$(JAVA_HOME)/lib/classes.zip
+#export JAVA_HOME=/usr/lib/j2se/1.4
+#export JAVA=/usr/lib/j2se/1.4/bin/java
+#export JAVAC=/usr/lib/j2se/1.4/bin/javac
+export JAVA_HOME=/usr/lib/j2sdk1.4-sun
+export JAVA=/usr/lib/j2sdk1.4-sun/bin/java
+export JAVAC=/usr/lib/j2sdk1.4-sun/bin/javac
+export JAR=/usr/lib/j2sdk1.4-sun/bin/jar
+# this only compile with sun javac and jar at the moment
+
+#export CLASSPATH=$(JAVA_HOME)/lib/tools.jar:$(JAVA_HOME)/lib/classes.zip
+#export CLASSPATH=$(JAVA_HOME)/lib/tools.jar:/usr/share/ant1.6/lib/ant.jar
 
 export LIBRARY = statcvs
 export VERSION = $(shell head -1 debian/changelog | sed 's/.*(\(.*\)-.*).*/\1/' )
@@ -31,6 +37,8 @@ configure-stamp:
 	# This part would require batik (http://xml.apache.org/batik/) to compile a demo jfreechart don't use 
 	# So I don't compile this
 	-rm -rf jfreechart-0.9.2/source/com/jrefinery/chart/demo
+	# patch to take in account new cvs log format
+	patch -p0 < cvslognewformat.patch
 	touch configure-stamp
 
 
@@ -41,8 +49,13 @@ build-stamp:
 	$(JAVAC) -classpath /usr/share/java/junit.jar -d jfree `find jcommon-0.6.4 -name "*.java"`
 	$(JAVAC) -classpath /usr/share/java/junit.jar:/usr/share/java/servlet-2.2.jar:jfree -d jfree `find jfreechart-0.9.2 -name "*.java"`
 	cp gorilla.jpg jfree/com/jrefinery/chart/
-	(cd jfree; jar cvf ../statcvs-$(VERSION)/lib/jfreechart.jar .)
+	(cd jfree; $(JAR) cvf ../statcvs-$(VERSION)/lib/jfreechart.jar .)
 	cd $(SRCDIR); ant dist
+	#rm -rf jfree
+	#-mkdir jfree
+	# this could be usefull to compile with kaffe one day
+	#$(JAVAC) -classpath statcvs-$(VERSION)/lib/jfreechart.jar:statcvs-$(VERSION)/lib/jdom.jar:statcvs-$(VERSION)/lib/junit.jar:/usr/share/ant1.6/lib/ant.jar:jfree -d jfree `find statcvs-$(VERSION) -name "*.java"` 
+
 	touch build-stamp
 
 javadoc: 
diff --git a/statcvs b/statcvs
index 196ef7a..ff53b7e 100755
--- a/statcvs
+++ b/statcvs
@@ -1,10 +1,15 @@
 #! /bin/sh
-if [ -f /usr/lib/j2se/1.4/bin/java ]
-then
-	/usr/lib/j2se/1.4/bin/java -jar /usr/share/java/statcvs.jar $@
-else
-	if [ -f /usr/bin/kaffe ]
+# let's try to find a sun JVM
+for javabin in /usr/lib/j2re1.4-sun/bin/java /usr/lib/j2sdk1.4-sun/bin/java /usr/lib/j2se/1.4/bin/java /usr/lib/j2sdk1.4/bin/java /usr/lib/j2re1.4/bin/java
+do
+	if [ -f $javabin ]
 	then
-		/usr/bin/kaffe -classpath /usr/share/kaffe/Klasses.jar:/usr/share/classpath/glibj.zip -jar /usr/share/java/statcvs.jar $@
+		$javabin -jar /usr/share/java/statcvs.jar $@
+		exit $?
 	fi
+done
+# this should also work with kaffe
+if [ -f /usr/bin/kaffe ]
+then
+		/usr/bin/kaffe -classpath /usr/share/kaffe/Klasses.jar:/usr/share/classpath/glibj.zip -jar /usr/share/java/statcvs.jar $@
 fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/statsvn.git

More information about the pkg-java-commits mailing list