Re: [Freemarker-commits] SF.net SVN: freemarker:[847] branches/2.3/freemarker/build.xml

Are you absolutely sure FreeCC is stable enough for building stable
2.3.x-s? Oh, and if you are sure, are you right too? :)

-- 
Best regards,
 Daniel Dekany

Monday, September 15, 2008, 7:28:39 PM, [email protected] wrote:

> Revision: 847
>          
> http://freemarker.svn.sourceforge.net/freemarker/?rev=847&view=rev
> Author:   revusky
> Date:     2008-09-15 17:28:30 +0000 (Mon, 15 Sep 2008)
>
> Log Message:
> -----------
> Switching the build to use freecc, mostly I want to be able to add
> the stable version of FM to a freecc powered by page, and also it increases the amount
> of continual stress testing.
>
> Modified Paths:
> --------------
>     branches/2.3/freemarker/build.xml
>
> Modified: branches/2.3/freemarker/build.xml
> ===================================================================
> --- branches/2.3/freemarker/build.xml   2008-09-11 08:29:13 UTC (rev 846)
> +++ branches/2.3/freemarker/build.xml   2008-09-15 17:28:30 UTC (rev 847)
> @@ -10,11 +10,11 @@
>  
>  Version: $Id: build.xml,v 1.138.2.4 2006/12/27 16:11:23 szegedia Exp $
>  
--->>
+-->>
>  
>  <project basedir="." default="jar" name="freemarker">
>  
> -    <property name="libs.location"
> value="http://freemarker.sourceforge.net/jarsforbuild"/>
> +    <property name="libs.location"
> value="http://freemarker.sourceforge.net/jarsforbuild"/>
>      <property name="repositoryRootDir" value="../../../"/>
>  
>      <property file="src/freemarker/version.properties" />
> @@ -25,7 +25,7 @@
>      <property name="build.examples.dir" value="build/examples"/>
>      <property name="build.jython-webapp.dir"
> value="${build.examples.dir}/jython-webapp"/>
>      <property name="build.classes.dir" value="build/classes"/>
> -    <property name="build.javacc.dir" value="build/javacc"/>
> +    <property name="build.freecc.dir" value="build/freecc"/>
>      <property name="build.javadoc.dir" value="build/api" />
>      <property name="testcase.dir" value="build/testcase"/>
>      <property name="dist.dir" value="build/dist"/>
> @@ -104,11 +104,11 @@
>          <pathelement path="${lib.saxpath}"/>
>          <pathelement path="${lib.xalan}"/> <!-- Xalan is not
> included with Sun JRE 1.5 with the old classname! -->
>          <pathelement path="${lib.servlet}"/>
> -        <pathelement path="${lib.jsp21}"/>
> +        <pathelement path="${lib.jsp21}"/>
>          <pathelement path="${lib.logkit}"/>
>          <pathelement path="${lib.log4j}"/>
>          <pathelement path="${src.dir}"/>
> -        <pathelement path="${build.javacc.dir}"/>
> +        <pathelement path="${build.freecc.dir}"/>
>          <pathelement path="${java.class.path}"/>
>      </path>
>  
> @@ -146,7 +146,7 @@
>          <exclude name="freemarker/ext/ant/**"/>
>          <exclude name="freemarker/ext/beans/EnumModels.java"/>
>          <exclude name="freemarker/ext/dom/XalanXPathSupport.java"/>
> -        <exclude
> name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>
> +        <exclude
> name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>
>          <exclude name="freemarker/ext/dom/JaxenXPathSupport.java"/>
>          <exclude name="freemarker/ext/jdom/NodeListModel.java"/>
>          <exclude name="freemarker/ext/jython/**"/>
> @@ -180,7 +180,7 @@
>  
>      <patternset id="freemarker.compile.jdk15">
>          <include name="freemarker/ext/beans/EnumModels.java"/>
> -        <include
> name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>
> +        <include
> name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>
>      </patternset>
>  
>      <patternset id="freemarker.compile.xalan">
> @@ -267,7 +267,8 @@
>         <get src="${libs.location}/dom4j.jar" dest="lib/dom4j.jar" usetimestamp="true"/>
>         <get src="${libs.location}/emma.jar" dest="lib/emma.jar" usetimestamp="true"/>
>         <get src="${libs.location}/emma_ant.jar"
> dest="lib/emma_ant.jar" usetimestamp="true"/>
> -       <get src="${libs.location}/2.3/javacc.jar"
> dest="lib/javacc.jar" usetimestamp="true"/>
> +       <get src="${libs.location}/freecc.jar"
> dest="lib/freecc.jar" usetimestamp="true"/>
> +       <get src="${libs.location}/freemarker-bootstrap.jar"
> dest="lib/freemarker-bootstrap.jar" usetimestamp="true"/>
>         <get src="${libs.location}/jaxen.jar" dest="lib/jaxen.jar" usetimestamp="true"/>
>         <get src="${libs.location}/2.3/jdom.jar"
> dest="lib/jdom.jar" usetimestamp="true"/>
>         <get src="${libs.location}/js.jar" dest="lib/js.jar" usetimestamp="true"/>
> @@ -278,7 +279,7 @@
>         <get src="${libs.location}/2.3/rt122.jar"
> dest="lib/rt122.jar" usetimestamp="true"/>
>         <get src="${libs.location}/saxpath.jar"
> dest="lib/saxpath.jar" usetimestamp="true"/>
>         <get src="${libs.location}/servlet.jar"
> dest="lib/servlet.jar" usetimestamp="true"/>
> -       <get src="${libs.location}/struts.jar"
> dest="lib/struts.jar" usetimestamp="true"/>
> +       <get src="${libs.location}/struts.jar"
> dest="lib/struts.jar" usetimestamp="true"/>
>         <get src="${libs.location}/jsp-api-1.2.jar"
> dest="lib/jsp-api-1.2.jar" usetimestamp="true"/>
>         <get src="${libs.location}/jsp-api-2.0.jar"
> dest="lib/jsp-api-2.0.jar" usetimestamp="true"/>
>         <get src="${libs.location}/jsp-api-2.1.jar"
> dest="lib/jsp-api-2.1.jar" usetimestamp="true"/>
> @@ -288,27 +289,28 @@
>      <target name="init">
>          <condition property="all.libs.present">
>              <and>
> -                <available file="lib/README.txt"/>
> -                <available file="lib/ant.jar"/>
> -                <available file="lib/dom4j.jar"/>
> -                <available file="lib/emma.jar"/>
> -                <available file="lib/emma_ant.jar"/>
> -                <available file="lib/javacc.jar"/>
> -                <available file="lib/jaxen.jar"/>
> -                <available file="lib/jdom.jar"/>
> -                <available file="lib/js.jar"/>
> -                <available file="lib/junit.jar"/>
> -                <available file="lib/jython.jar"/>
> -                <available file="lib/log4j.jar"/>
> -                <available file="lib/logkit.jar"/>
> -                <available file="lib/rt122.jar"/>
> -                <available file="lib/saxpath.jar"/>
> -                <available file="lib/servlet.jar"/>
> -                <available file="lib/struts.jar"/>
> -                <available file="lib/jsp-api-1.2.jar"/>
> -                <available file="lib/jsp-api-2.0.jar"/>
> -                <available file="lib/jsp-api-2.1.jar"/>
> -                <available file="lib/xalan.jar"/>
> +                <available file="lib/README.txt"/>
> +                <available file="lib/ant.jar"/>
> +                <available file="lib/dom4j.jar"/>
> +                <available file="lib/emma.jar"/>
> +                <available file="lib/emma_ant.jar"/>
> +                <available file="lib/freecc.jar"/>
> +                <available file="lib/freemarker-bootstrap.jar"/>
> +                <available file="lib/jaxen.jar"/>
> +                <available file="lib/jdom.jar"/>
> +                <available file="lib/js.jar"/>
> +                <available file="lib/junit.jar"/>
> +                <available file="lib/jython.jar"/>
> +                <available file="lib/log4j.jar"/>
> +                <available file="lib/logkit.jar"/>
> +                <available file="lib/rt122.jar"/>
> +                <available file="lib/saxpath.jar"/>
> +                <available file="lib/servlet.jar"/>
> +                <available file="lib/struts.jar"/>
> +                <available file="lib/jsp-api-1.2.jar"/>
> +                <available file="lib/jsp-api-2.0.jar"/>
> +                <available file="lib/jsp-api-2.1.jar"/>
> +                <available file="lib/xalan.jar"/>
>              </and>
>          </condition>
>          <antcall target="fetchlibs"/>
> @@ -331,12 +333,12 @@
>          <available
>              property="jython.available"
>              classname="org.python.core.PyObject"
> -            classpathref="compile.classpath"/>
> -        <available
> -            property="jsp21.available"
> -            classname="javax.el.ELResolver"
> -            classpathref="compile.classpath"/>
> +            classpathref="compile.classpath"/>
>          <available
> +            property="jsp21.available"
> +            classname="javax.el.ELResolver"
> +            classpathref="compile.classpath"/>
> +        <available
>              property="dom4j.available"
>              classname="org.dom4j.Node"
>              classpathref="compile.classpath"/>
> @@ -356,6 +358,10 @@
>              property="xalan.available"
>              classname="org.apache.xpath.XPathAPI"
>              classpathref="compile.classpath" />
> +       <uptodate property="parser.gen"
> +                targetfile="src/freemarker/core/FMParser.jj">
> +           <srcfiles dir="src/freemarker/core" includes="FMParser.java" />
> +       </uptodate>
>      </target>
>      
>      <!-- The build targets begin here -->
> @@ -394,9 +400,9 @@
>      </target>
>  
>      <target name="javacc"
> -        description="Build the JavaCC parser from its grammar file">
> +        description="Build the FreeCC parser from its grammar file">
>          <!-- mkdir dir="${build.javacc.dir}/freemarker/core"/ -->
> -        <copy todir="${build.javacc.dir}/freemarker/core"
> file="${src.dir}/freemarker/core/ParseException.java" />
> +        <copy todir="${build.freecc.dir}/freemarker/core"
> file="${src.dir}/freemarker/core/ParseException.java" />
>          <taskdef name="javacc"
> classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC" classpath="lib/javacc.jar"/>
>          <javacc
>              target="${src.dir}/freemarker/core/FMParser.jj"
> @@ -430,7 +436,21 @@
>         />
>      </target>
>  
> -    <target depends="init, prepare, javacc" name="compile"
> +   <target name="freecc" depends="init" if="parser.gen"
> +            description="Build the parser from its grammar file"
+    >>
> +        <java classname="org.visigoths.freecc.Main"
> +               
> classpath="lib/freecc.jar:lib/freemarker-bootstrap.jar"
> +                failonerror="true" fork="true"
+        >>
> +            <arg value="-OUTPUT_DIRECTORY=src/freemarker/core" />
> +            <arg value="-JDK_VERSION=1.4" />
> +            <arg file="src/freemarker/core/FMParser.jj" />
> +            <assertions><enable/></assertions>
> +       </java>
> +   </target>
> +       
> +    <target depends="init, prepare, freecc" name="compile"
>              description="Compile Java source files">
>          <mkdir dir="${build.classes.dir}"/>
>          <javac deprecation="off" destdir="${build.classes.dir}"
> debug="on" optimize="off" bootclasspath="lib/rt122.jar" source="1.2" target="1.2">
> @@ -599,7 +619,7 @@
>              <classpath>
>                <path path="${java.class.path}"/>
>                <path refid="compile.classpath"/>
> -              <pathelement path="${lib.junit}"/>
> +              <pathelement path="${lib.junit}"/>
>                <pathelement path="${lib.jdom}"/>
>                <pathelement path="${build.classes.dir}"/>
>                <pathelement path="${testcase.dir}"/>
> @@ -754,7 +774,7 @@
>          />
>  
>          <copy todir="${dist.dir.versioned}/lib"  includeEmptyDirs="no">
> -          <fileset file="lib/freemarker.jar" />
> +          <fileset file="lib/freemarker.jar" />
>          </copy>
>  
>          <!-- Generate website pages and copy them to distro -->



-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/