Author: rdonkin
Date: Sat Sep 29 10:09:30 2007
New Revision: 580605
URL: http://svn.apache.org/viewvc?rev=580605&view=rev
Log:
JavaCC 4.0 is not open source. Policy dictates that it cannot remain in the
repository. In order to build JSieve, it is neccessary to download the jar and
set javacc.jar in include.properties.
Removed:
james/jsieve/trunk/tools/
Modified:
james/jsieve/trunk/build.xml
james/jsieve/trunk/default.properties
james/jsieve/trunk/include.properties
Modified: james/jsieve/trunk/build.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/build.xml?rev=580605&r1=580604&r2=580605&view=diff
==============================================================================
--- james/jsieve/trunk/build.xml (original)
+++ james/jsieve/trunk/build.xml Sat Sep 29 10:09:30 2007
@@ -117,6 +117,10 @@
Or zen for the more spiritual amongst you.
-->
<target name="preprocess" depends="prepare-common">
+ <available property='present.javacc' file='${javacc.jar}'/>
+ <fail unless='present.javacc'>JavaCC 4.0 is required to build JSieve.
+Please download from https://javacc.dev.java.net/ and edit include.properties.
+ </fail>
<!--
Generate JavaCC source inserting parse tree building actions
and the Java source for the parse classes.
Modified: james/jsieve/trunk/default.properties
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/default.properties?rev=580605&r1=580604&r2=580605&view=diff
==============================================================================
--- james/jsieve/trunk/default.properties (original)
+++ james/jsieve/trunk/default.properties Sat Sep 29 10:09:30 2007
@@ -106,6 +106,3 @@
#
tools.dir=${jsieve.dir}/tools
-
-# ----- JavaCC -----
-javacc.jar=${tools.dir}/javacc-4.0/bin/lib/javacc.jar
Modified: james/jsieve/trunk/include.properties
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/include.properties?rev=580605&r1=580604&r2=580605&view=diff
==============================================================================
--- james/jsieve/trunk/include.properties (original)
+++ james/jsieve/trunk/include.properties Sat Sep 29 10:09:30 2007
@@ -1,21 +1,21 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
# -------------------------------------------------------------------
# I N C L U D E P R O P E R T I E S
# -------------------------------------------------------------------
@@ -60,3 +60,6 @@
# ----- JUnit -----
junit.jar=${lib.dir}/junit/jars/junit-3.8.1.jar
+
+# ----- JavaCC ----
+javacc.jar=${lib.dir}/org/debian/jars/javacc-4.0.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
