activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r679134 - in /activemq/sandbox/zookeeper: ./ src/java/lib/javacc-4.0/ src/java/lib/javacc-4.0/bin/ src/java/lib/javacc-4.0/bin/lib/ zookeeper-jute/src/main/javacc/
Date Wed, 23 Jul 2008 17:35:41 GMT
Author: chirino
Date: Wed Jul 23 10:35:39 2008
New Revision: 679134

URL: http://svn.apache.org/viewvc?rev=679134&view=rev
Log:
updating the ant build to work with the new source stucture.

Added:
    activemq/sandbox/zookeeper/src/java/lib/javacc-4.0/
    activemq/sandbox/zookeeper/src/java/lib/javacc-4.0/LICENSE
    activemq/sandbox/zookeeper/src/java/lib/javacc-4.0/bin/
    activemq/sandbox/zookeeper/src/java/lib/javacc-4.0/bin/lib/
    activemq/sandbox/zookeeper/src/java/lib/javacc-4.0/bin/lib/javacc.jar   (with props)
Removed:
    activemq/sandbox/zookeeper/zookeeper-jute/src/main/javacc/
Modified:
    activemq/sandbox/zookeeper/build.xml

Modified: activemq/sandbox/zookeeper/build.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/zookeeper/build.xml?rev=679134&r1=679133&r2=679134&view=diff
==============================================================================
--- activemq/sandbox/zookeeper/build.xml (original)
+++ activemq/sandbox/zookeeper/build.xml Wed Jul 23 10:35:39 2008
@@ -31,29 +31,29 @@
     <!-- (for example, JMX) are only supported on JDK 1.6            -->
     <property name="target.jdk" value="${ant.java.version}" />
 
-    <property name="src.dir" value="${basedir}/src" />
-    <property name="java.src.dir" value="${src.dir}/java/main" />
-    <property name="jmx.src.dir" value="${src.dir}/java/jmx" />
-    <property name="lib.dir" value="${src.dir}/java/lib" />
+    <property name="java.src.dir" value="${basedir}/zookeeper-core/src/main/java" />
+    <property name="jmx.src.dir" value="${basedir}/zookeeper-jmx/src/main/java" />
+    <property name="lib.dir" value="${basedir}/src/java/lib" />
     <property name="build.dir" value="${basedir}/build" />
     <property name="distribution" value="${basedir}/distribution" />
-    <property name="src_generated.dir" value="${src.dir}/java/generated" />
-    <property name="c.src.dir" value="${src.dir}/c" />    
+    <property name="jute_generated.dir" value="${basedir}/zookeeper-jute-compiler/target/generated-sources/javacc"
/>
+    <property name="src_generated.dir" value="${basedir}/zookeeper-core/target/generated-sources/jute"
/>
+    <property name="c.src.dir" value="${src.dir}/zookeeper-c" />    
     <property name="csrc_generated.dir" value="${c.src.dir}/generated" />
     <property name="build.classes" value="${build.dir}/classes" />
     <property name="jar.name" value="zookeeper-dev.jar" />
 
-    <property name="jute.file" value="${src.dir}/zookeeper.jute" />
+    <property name="jute.file" value="${basedir}/zookeeper.jute" />
 
     <property name="build.testclasses" value="${build.dir}/testclasses"/>
     <property name="test.build.dir" value="${build.dir}/test" />
-    <property name="test.src.dir" value="${src.dir}/java/test"/>
+    <property name="test.src.dir" value="${basedir}/zookeeper-core/src/test/java"/>
     <property name="test.log.dir" value="${test.build.dir}/logs" />
     <property name="test.tmp.dir" value="${test.build.dir}/tmp" />
     <property name="test.output" value="no" />
     <property name="test.timeout" value="900000" />
     <property name="test.junit.output.format" value="plain" />
-    <property name="config.dir" value="${src.dir}/java/test/config" />
+    <property name="config.dir" value="${basedir}/zookeeper-core/src/test/java/config"
/>
     <property name="test.junit.maxmem" value="512m" />
     <property name="conf.dir" value="${basedir}/conf"/>
     <property name="docs.dir" value="${basedir}/docs"/>
@@ -95,8 +95,24 @@
     </target>
     
     <target name="jute" depends="init">
-        <javac srcdir="${java.src.dir}" destdir="${build.classes}" target="${target.jdk}"

-            includes="org/apache/jute/**" debug="on" />
+      
+        <mkdir dir="${jute_generated.dir}/org/apache/jute/compiler/generated"/>
+      
+        <!-- Generate the jute parser Java code -->
+        <javacc javacchome="${basedir}/src/java/lib/javacc-4.0"
+                target="${basedir}/zookeeper-jute-compiler/src/main/javacc/rcc.jj" 
+                outputdirectory="${jute_generated.dir}/org/apache/jute/compiler/generated"/>
+                
+        <!-- Now compile it all -->
+        <javac srcdir="${basedir}/zookeeper-jute/src/main/java"  />
+        <javac destdir="${build.classes}" target="${target.jdk}" debug="on">
+          <src path="${basedir}/zookeeper-jute/src/main/java"/>
+          <src path="${basedir}/zookeeper-jute-compiler/src/main/java"/>
+          <src path="${jute_generated.dir}"/>
+          
+          <!-- Don't compile the maven bits -->
+          <exclude name="**/*Mojo.java"/>
+        </javac>
     </target>
 
     <target name="compile_jute_uptodate">
@@ -111,7 +127,7 @@
         <java classname="org.apache.jute.compiler.generated.Rcc" fork="true" dir="${src_generated.dir}">
             <arg value="-l" />
             <arg value="java" />
-            <arg value="../../zookeeper.jute" /> 
+            <arg value="../../../zookeeper.jute" /> 
             <classpath>
                 <pathelement path="${build.classes}" />
             </classpath>
@@ -120,7 +136,7 @@
         <java classname="org.apache.jute.compiler.generated.Rcc" fork="true" dir="${csrc_generated.dir}">
             <arg value="-l" />
             <arg value="c" />
-            <arg value="../../zookeeper.jute" />
+            <arg value="../../../zookeeper.jute" />
             <classpath>
                 <pathelement path="${build.classes}" />
             </classpath>
@@ -136,7 +152,7 @@
     
     <target name="svn-revision" unless="lastRevision">
         <svn>
-            <status path="${src.dir}/java" lastChangedRevisionProperty="lastRevision"
/>
+            <status path="${basedir}" lastChangedRevisionProperty="lastRevision" />
         </svn>
         <mkdir dir="${revision.dir}" />
         <echo file="${revision.dir}/${revision.properties}" 

Added: activemq/sandbox/zookeeper/src/java/lib/javacc-4.0/LICENSE
URL: http://svn.apache.org/viewvc/activemq/sandbox/zookeeper/src/java/lib/javacc-4.0/LICENSE?rev=679134&view=auto
==============================================================================
--- activemq/sandbox/zookeeper/src/java/lib/javacc-4.0/LICENSE (added)
+++ activemq/sandbox/zookeeper/src/java/lib/javacc-4.0/LICENSE Wed Jul 23 10:35:39 2008
@@ -0,0 +1,18 @@
+Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without modification, 
+are permitted provided that the following conditions are met:
+
+-Redistribution of source code must retain the above copyright notice, this  list of conditions
and the following disclaimer.
+
+-Redistribution in binary form must reproduce the above copyright notice, 
+this list of conditions and the following disclaimer in the documentation and/or 
+other materials provided with the distribution.
+
+Neither the name of Sun Microsystems, Inc. or the names of contributors may 
+be used to endorse or promote products derived from this software without 
+specific prior written permission.
+
+This software is provided "AS IS," without a warranty of any kind. ALL EXPRESS OR IMPLIED
CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN MIDROSYSTEMS,
INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS
A RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT
WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT,
SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE
THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF
SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+You acknowledge that  this software is not designed, licensed or intended for use in the
design, construction, operation or maintenance of any nuclear facility.

Added: activemq/sandbox/zookeeper/src/java/lib/javacc-4.0/bin/lib/javacc.jar
URL: http://svn.apache.org/viewvc/activemq/sandbox/zookeeper/src/java/lib/javacc-4.0/bin/lib/javacc.jar?rev=679134&view=auto
==============================================================================
Binary file - no diff available.

Propchange: activemq/sandbox/zookeeper/src/java/lib/javacc-4.0/bin/lib/javacc.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message