[MMTP-devel] SF.net SVN: mtp: [35] trunk

[<ido...@us...>]

Revision: 35
          http://mtp.svn.sourceforge.net/mtp/?rev=35&view=rev
Author:   idominguez
Date:     2007-12-06 07:36:12 -0800 (Thu, 06 Dec 2007)

Log Message:
-----------
JavaCC added to this repository. Note that JavaCC's license
is BSD, not GPL

Modified Paths:
--------------
    trunk/INSTALL
    trunk/src/mtp/parser/build.xml

Added Paths:
-----------
    trunk/lib/javacc.jar

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2007-12-06 15:21:40 UTC (rev 34)
+++ trunk/INSTALL	2007-12-06 15:36:12 UTC (rev 35)
@@ -22,15 +22,9 @@
 2. Compiling MMTP
 ================
 
-To build MMTP we are currently using Apache Ant. As Ant can't find the
-JavaCC libraries by itself, you need the environment variable JAVACC
-to point to the JavaCC lib directory. This location must have the javacc.jar
-file inside.
+To build MMTP we are currently using Apache Ant. Compiling mtp should
+be as simple as typing:
 
-In most Debian systems, you must set JAVACC=/usr/share/java,
-in Gentoo systems, the correct value is JAVACC=/usr/share/javacc/lib.
-
-fons@escher:~/proyectos/mtp$ export JAVACC=/usr/share/java
 fons@escher:~/proyectos/mtp$ ant
 .....
 Done build.

Added: trunk/lib/javacc.jar
===================================================================
(Binary files differ)


Property changes on: trunk/lib/javacc.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/mtp/parser/build.xml
===================================================================
--- trunk/src/mtp/parser/build.xml	2007-12-06 15:21:40 UTC (rev 34)
+++ trunk/src/mtp/parser/build.xml	2007-12-06 15:36:12 UTC (rev 35)
@@ -8,30 +8,10 @@
 <property file="build/common.properties" />
 <property environment="env" />
 
-<!--
-     We try to locate the javacc.jar home directory.
-     In Ubuntu and other debian-based linux distributions,
-     it is usually set to /usr/share/java.
-     In other distributions it might not be the same.
-
-//-->
-<condition property="JAVACC" value="${env.JAVACC}" >
- <isset property="env.JAVACC" />
-</condition>
-<condition property="JAVACC" value="/usr/share/javacc/lib" >
- <and>
-   <not> <isset property="${JAVACC}" /> </not>
-   <contains string="${os.version}" substring="gentoo" />
- </and>
-</condition>
-<condition property="JAVACC" value="/usr/share/java" >
- <not> <isset property="${JAVACC}" /> </not>
-</condition>
-
 <target name="compile-javacc" 
         description="compiles the source" >
     <javacc target="${parser}/MtpParser.jj"
-            javacchome="${JAVACC}"
+            javacchome="${lib}/"
             outputdirectory="${parser}" />
 </target>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.