[pkg-java] r3861 - trunk/ehcache/debian

[avdyk at alioth.debian.org]

Author: avdyk
Date: 2007-07-16 10:17:42 +0000 (Mon, 16 Jul 2007)
New Revision: 3861

Added:
   trunk/ehcache/debian/README.Debian
Modified:
   trunk/ehcache/debian/build.xml
   trunk/ehcache/debian/control
   trunk/ehcache/debian/rules
Log:
ehcache done

Added: trunk/ehcache/debian/README.Debian
===================================================================
--- trunk/ehcache/debian/README.Debian	                        (rev 0)
+++ trunk/ehcache/debian/README.Debian	2007-07-16 10:17:42 UTC (rev 3861)
@@ -0,0 +1,18 @@
+ehcache
+-------
+
+ehcache is build without Hibernate support at the moment because
+Hibernate is not yet in Debian. Anyway, we'll have a bootstrap problem
+because Hibernate needs ehcache!
+
+At the moment, I solve it with to ant targets, one that builds ehcache
+without hibernate if org.hibernate.cache.CacheException is not present
+and one that builds every classes if the hibernate class is present. So
+building ehcahce, then building hibernate, then rebuilding ehcache
+should do the trick...
+
+Any comment welcome via bug reports.
+
+Thanks
+
+ -- Arnaud Vandyck <avdyk at debian.org>, Mon, 16 Jul 2007 12:16:03 +0200

Modified: trunk/ehcache/debian/build.xml
===================================================================
--- trunk/ehcache/debian/build.xml	2007-07-16 09:46:09 UTC (rev 3860)
+++ trunk/ehcache/debian/build.xml	2007-07-16 10:17:42 UTC (rev 3861)
@@ -19,11 +19,23 @@
     </jar> 
   </target>
 
-  <target name="compile">
-    <mkdir dir="${build}" />
+  <target name="compile" depends="init" unless="compile-with-hibernate">
     <javac destdir="${build}" srcdir=".">
+      <exclude name="**/hibernate/**" />
       <classpath refid="compile.classpath" />
     </javac>    
   </target>
 
+  <target name="compile-with-hibernate" depends="init" if="hibernate.present">
+    <javac destdir="${build}" srcdir=".">
+      <classpath refid="compile.classpath" />
+    </javac>    
+  </target>
+
+  <target name="init">
+    <mkdir dir="${build}"/>
+    <available classname="org.hibernate.cache.CacheException"
+           property="hibernate.present"/>
+  </target>
+
 </project>

Modified: trunk/ehcache/debian/control
===================================================================
--- trunk/ehcache/debian/control	2007-07-16 09:46:09 UTC (rev 3860)
+++ trunk/ehcache/debian/control	2007-07-16 10:17:42 UTC (rev 3861)
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>= 4.2.30), java-gcj-compat-dev (>= 1.0.69-2), ant, cdbs, libcommons-logging-java, libservlet2.4-java, libbackport-util-concurrent-java
+Build-Depends-Indep: debhelper (>= 4.2.30), java-gcj-compat-dev (>= 1.0.69-2), ant, cdbs, libcommons-logging-java, libservlet2.4-java, libbackport-util-concurrent-java, libjsr107cache-java
 Standards-Version: 3.7.2
 
 Package: libehcache-java
 Section: libs
 Architecture: all
-Depends: java-gcj-compat | java2-runtime, libcommons-logging-java, libservlet2.4-java, libbackport-util-concurrent-java
+Depends: java-gcj-compat | java2-runtime, libcommons-logging-java, libservlet2.4-java, libbackport-util-concurrent-java, libjsr107cache-java
 Description: distributed cache library
  Ehcache is a distributed cache for general purpose caching in Java,
  J2EE and light-weight containers. It features memory and disk stores,

Modified: trunk/ehcache/debian/rules
===================================================================
--- trunk/ehcache/debian/rules	2007-07-16 09:46:09 UTC (rev 3860)
+++ trunk/ehcache/debian/rules	2007-07-16 10:17:42 UTC (rev 3861)
@@ -9,6 +9,7 @@
 
 JAVA_HOME := /usr/lib/jvm/java-gcj/
 
-DEB_JARS := commons-logging servlet-api-2.4 backport-util-concurrent
+DEB_JARS := commons-logging servlet-api-2.4 backport-util-concurrent jsr107cache hibernate
+# hibernate is needed if you wanna build net.sf.ehcache.hibernate.* package
 DEB_ANT_BUILD_TARGET := jar # javadocs
 DEB_ANT_BUILDFILE := debian/build.xml