[pkg-java] r4688 - trunk/jbossas4/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-11-11 11:18:13 +0000 (Sun, 11 Nov 2007)
New Revision: 4688

Modified:
   trunk/jbossas4/debian/build.xml
   trunk/jbossas4/debian/control
   trunk/jbossas4/debian/rules
Log:
* add Build-Depends: javacc, ant-optional
* move javacc call from debian/rules into debian/build.xml


Modified: trunk/jbossas4/debian/build.xml
===================================================================
--- trunk/jbossas4/debian/build.xml	2007-11-11 11:01:46 UTC (rev 4687)
+++ trunk/jbossas4/debian/build.xml	2007-11-11 11:18:13 UTC (rev 4688)
@@ -156,6 +156,9 @@
     </jar>
 
     <mkdir dir="${security.dir}/${class.dir}"/>
+    <javacc
+      target="security/src/main/org/jboss/security/auth/login/SunConfigParser.jj"
+      javacchome="/usr/share/java/" static="false" debugparser="true"/>
     <javac srcdir="${security.dir}/${source.dir}" destdir="${security.dir}/${class.dir}"
 	   debug="true" source="1.5">
       <classpath>
@@ -188,6 +191,9 @@
     </jar>
 
     <mkdir dir="${messaging.dir}/${class.dir}"/>
+    <javacc
+      target="messaging/src/main/org/jboss/mq/selectors/SelectorParser.jj"
+      javacchome="/usr/share/java/" static="false" debugparser="true"/>
     <javac srcdir="${messaging.dir}/${source.dir}" destdir="${messaging.dir}/${class.dir}"
 	   debug="true" source="1.5">
       <classpath>

Modified: trunk/jbossas4/debian/control
===================================================================
--- trunk/jbossas4/debian/control	2007-11-11 11:01:46 UTC (rev 4687)
+++ trunk/jbossas4/debian/control	2007-11-11 11:18:13 UTC (rev 4688)
@@ -4,11 +4,11 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
 Build-Depends: cdbs, debhelper (>= 5), quilt
-Build-Depends-Indep: ant, java-gcj-compat-dev, junit, libgetopt-java,
+Build-Depends-Indep: ant, java-gcj-compat-dev, javacc, junit, libgetopt-java,
  libbcel-java, libdom4j-java, libjboss-common-java, libjboss-profiler-java,
  libjboss-xml-binding-java, liblog4j1.2-java, libservlet2.4-java,
  glassfish-javaee, libconcurrent-java, libcommons-httpclient-java,
- libaxis-java
+ libaxis-java, ant-optional
 Standards-Version: 3.7.2
 Homepage: http://labs.jboss.com/jbossas/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jbossas4

Modified: trunk/jbossas4/debian/rules
===================================================================
--- trunk/jbossas4/debian/rules	2007-11-11 11:01:46 UTC (rev 4687)
+++ trunk/jbossas4/debian/rules	2007-11-11 11:18:13 UTC (rev 4688)
@@ -10,19 +10,9 @@
 DEB_JARS		:= jboss-common junit log4j-1.2 jboss-profiler ant-junit commons-httpclient \
 			   bcel	concurrent dom4j jboss-xml-binding servlet-api gnu-getopt glassfish-javaee \
 			   glassfish-activation glassfish-ejb-api jaxrpc javassist jboss-remoting \
-			   jboss-serialization jboss-microcontainer quartz
+			   javacc jboss-serialization jboss-microcontainer quartz \
+			   ant-nodeps
 
-clean::
-	$(RM) debian/build-javacc
-
-post-patches:: debian/build-javacc
-debian/build-javacc::
-	(cd messaging/src/main/org/jboss/mq/selectors;\
-	javacc  -STATIC=false -debug_parser SelectorParser.jj)
-	(cd security/src/main/org/jboss/security/auth/login;\
-	javacc  -STATIC=false -debug_parser SunConfigParser.jj)
-	touch $@
-
 ALL_JARS = $(wildcard *.jar)
 DEST_DIR = $(DEB_DESTDIR)/usr/share/java