[pkg-java] r5150 - in trunk/libfreemarker-java/debian: . patches
varun-guest at alioth.debian.org
varun-guest at alioth.debian.org
Fri Dec 21 10:27:51 UTC 2007
Author: varun-guest
Date: 2007-12-21 10:27:51 +0000 (Fri, 21 Dec 2007)
New Revision: 5150
Added:
trunk/libfreemarker-java/debian/build.xml
Removed:
trunk/libfreemarker-java/debian/patches/java-version.diff
trunk/libfreemarker-java/debian/patches/javacc-home.diff
trunk/libfreemarker-java/debian/patches/jsp.diff
trunk/libfreemarker-java/debian/patches/no-downloads.diff
trunk/libfreemarker-java/debian/patches/sun-xalan.diff
Modified:
trunk/libfreemarker-java/debian/ant.properties
trunk/libfreemarker-java/debian/changelog
trunk/libfreemarker-java/debian/control
trunk/libfreemarker-java/debian/doc-base
trunk/libfreemarker-java/debian/docs
trunk/libfreemarker-java/debian/patches/series
trunk/libfreemarker-java/debian/rules
Log:
* Add a new debian/build.xml
* Add some more Build-Depends and jars for building
* Move javadocs to api sub folder
* Clean up patches
Modified: trunk/libfreemarker-java/debian/ant.properties
===================================================================
--- trunk/libfreemarker-java/debian/ant.properties 2007-12-20 22:27:38 UTC (rev 5149)
+++ trunk/libfreemarker-java/debian/ant.properties 2007-12-21 10:27:51 UTC (rev 5150)
@@ -1,15 +1,4 @@
-javacc.home=/usr/share/java/
-lib.jdom=
-lib.jaxen=
-lib.saxpath=
-#jython.home=
-lib.log4j=
-lib.logkit=
-lib.xerces=
-lib.junit=
-lib.dom4j=
-lib.ant=
-lib.rhino=
-lib.servlet=/usr/share/java/servlet-api.jar
-all.libs.present=true
-build.sysclasspath=first
+class.dir=classes
+source.dir=src
+javadoc.dir=docs/api
+jar.name=freemarker.jar
Added: trunk/libfreemarker-java/debian/build.xml
===================================================================
--- trunk/libfreemarker-java/debian/build.xml (rev 0)
+++ trunk/libfreemarker-java/debian/build.xml 2007-12-21 10:27:51 UTC (rev 5150)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project default="jar" name="${project.name}" basedir="..">
+ <patternset id="compiler.resources">
+ <include name="**/?*.properties" />
+ </patternset>
+
+ <target name="clean">
+ <delete dir="${class.dir}" quiet="true"/>
+ <delete file="${jar.name}" quiet="true"/>
+ <delete file="${source.dir}/freemarker/core/FMParser.java" quiet="true"/>
+ <delete file="${source.dir}/freemarker/core/FMParserConstants.java" quiet="true"/>
+ <delete file="${source.dir}/freemarker/core/FMParserTokenManager.java" quiet="true"/>
+ <delete file="${source.dir}/freemarker/core/SimpleCharStream.java" quiet="true"/>
+ <delete file="${source.dir}/freemarker/core/Token.java" quiet="true"/>
+ <delete file="${source.dir}/freemarker/core/TokenMgrError.java" quiet="true"/>
+ </target>
+
+ <target name="javacc" description="Build the JavaCC parser from its grammar file">
+ <javacc target="${source.dir}/freemarker/core/FMParser.jj"
+ javacchome="/usr/share/java/" static="false"/>
+
+ <replace file="src/freemarker/core/FMParserConstants.java"
+ token="public interface FMParserConstants"
+ value="interface FMParserConstants" />
+ <replace file="${source.dir}/freemarker/core/FMParserTokenManager.java"
+ token="public class FMParserTokenManager"
+ value="class FMParserTokenManager" />
+ <replace file="${source.dir}/freemarker/core/Token.java"
+ token="public class Token"
+ value="class Token" />
+ <replace file="${source.dir}/freemarker/core/SimpleCharStream.java"
+ token="public final class SimpleCharStream"
+ value="final class SimpleCharStream" />
+ <replace file="${source.dir}/freemarker/core/FMParser.java"
+ token="enum"
+ value="ENUM" />
+ </target>
+
+ <target name="compile" description="o Compile the code" depends="javacc">
+ <mkdir dir="${class.dir}"/>
+ <javac srcdir="${source.dir}" destdir="${class.dir}"
+ deprecation="true" debug="true" optimize="false">
+ <exclude name="**/*SunInternalXalanXPathSupport.java"/>
+ <exclude name="**/*FreeMarkerPageContext1.java"/>
+ <exclude name="**/*FreeMarkerPageContext2.java"/>
+ <exclude name="**/*FreeMarkerJspFactory2.java" />
+ </javac>
+
+ <copy todir="${class.dir}">
+ <fileset dir="${source.dir}">
+ <patternset refid="compiler.resources" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="jar" description="o Create the jar" depends="compile">
+ <jar jarfile="${jar.name}" basedir="${class.dir}" />
+ </target>
+
+ <target name="javadoc" description="o Generate javadoc">
+ <mkdir dir="${javadoc.dir}"/>
+ <javadoc packagenames="freemarker.*"
+ sourcepath="${source.dir}" destdir="${javadoc.dir}" />
+ </target>
+
+</project>
Modified: trunk/libfreemarker-java/debian/changelog
===================================================================
--- trunk/libfreemarker-java/debian/changelog 2007-12-20 22:27:38 UTC (rev 5149)
+++ trunk/libfreemarker-java/debian/changelog 2007-12-21 10:27:51 UTC (rev 5150)
@@ -1,5 +1,6 @@
libfreemarker-java (2.3.11-1) unstable; urgency=low
+ [ Torsten Werner ]
* new upstream version
* Bump up Standards-Version: 3.7.3 (no changes needed).
* Refresh our patches.
@@ -10,8 +11,14 @@
compiler.
* Disable support for jsp api < 2.1.
- -- Torsten Werner <twerner at debian.org> Tue, 18 Dec 2007 19:45:35 +0100
+ [ Varun Hiremath ]
+ * Add a new debian/build.xml
+ * Add some more Build-Depends and jars for building
+ * Move javadocs to api sub folder
+ * Clean up patches
+ -- Varun Hiremath <varun at debian.org> Fri, 21 Dec 2007 15:45:01 +0530
+
libfreemarker-java (2.3.10-6) unstable; urgency=low
* Move the package to pkg-java svn.
Modified: trunk/libfreemarker-java/debian/control
===================================================================
--- trunk/libfreemarker-java/debian/control 2007-12-20 22:27:38 UTC (rev 5149)
+++ trunk/libfreemarker-java/debian/control 2007-12-21 10:27:51 UTC (rev 5150)
@@ -2,11 +2,12 @@
Section: libs
Priority: optional
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>
+Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt
Build-Depends-Indep: ant, ant-optional, glassfish-javaee, java-gcj-compat-dev,
javacc, junit, jython, libdom4j-java, libjaxen-java, libjdom0-java,
- liblog4j1.2-java, liblogkit-java, libxerces2-java, rhino
+ liblog4j1.2-java, liblogkit-java, libxerces2-java, rhino,
+ libcommons-jxpath-java, libxalan2-java
Standards-Version: 3.7.3
Homepage: http://www.freemarker.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libfreemarker-java
Modified: trunk/libfreemarker-java/debian/doc-base
===================================================================
--- trunk/libfreemarker-java/debian/doc-base 2007-12-20 22:27:38 UTC (rev 5149)
+++ trunk/libfreemarker-java/debian/doc-base 2007-12-21 10:27:51 UTC (rev 5150)
@@ -7,5 +7,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libfreemarker-java/index.html
-Files: /usr/share/doc/libfreemarker-java/*.html
+Index: /usr/share/doc/libfreemarker-java/api/index.html
+Files: /usr/share/doc/libfreemarker-java/api/*.html
Modified: trunk/libfreemarker-java/debian/docs
===================================================================
--- trunk/libfreemarker-java/debian/docs 2007-12-20 22:27:38 UTC (rev 5149)
+++ trunk/libfreemarker-java/debian/docs 2007-12-21 10:27:51 UTC (rev 5150)
@@ -1,2 +1,2 @@
-build/api/*
+docs/*
README.txt
Deleted: trunk/libfreemarker-java/debian/patches/java-version.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/java-version.diff 2007-12-20 22:27:38 UTC (rev 5149)
+++ trunk/libfreemarker-java/debian/patches/java-version.diff 2007-12-21 10:27:51 UTC (rev 5150)
@@ -1,103 +0,0 @@
-Index: libfreemarker-java-2.3.11/build.xml
-===================================================================
---- libfreemarker-java-2.3.11.orig/build.xml 2007-12-05 01:36:34.000000000 +0100
-+++ libfreemarker-java-2.3.11/build.xml 2007-12-16 12:51:03.000000000 +0100
-@@ -433,7 +433,7 @@
- <target depends="init, prepare, javacc" 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">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="lib/rt122.jar" source="1.3" target="1.3">
- <src path="${src.dir}"/>
- <patternset refid="freemarker.compile"/>
- <!-- src path="${build.javacc.dir}"/ -->
-@@ -461,7 +461,7 @@
- </target>
-
- <target name="compile-log4j" if="log4j.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.log4j"/>
-@@ -469,7 +469,7 @@
- </target>
-
- <target name="compile-logkit" if="logkit.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.logkit"/>
-@@ -493,7 +493,7 @@
- </target>
-
- <target name="compile-jython" if="jython.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.jython"/>
-@@ -501,7 +501,7 @@
- </target>
-
- <target name="compile-jsp1">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.jsp1.classpath"/>
- <patternset refid="freemarker.compile.jsp1"/>
-@@ -509,7 +509,7 @@
- </target>
-
- <target name="compile-jsp2">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.jsp2.classpath"/>
- <patternset refid="freemarker.compile.jsp2"/>
-@@ -517,7 +517,7 @@
- </target>
-
- <target name="compile-rhino" if="rhino.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.rhino"/>
-@@ -525,7 +525,7 @@
- </target>
-
- <target name="compile-dom4j" if="dom4j.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.dom4j"/>
-@@ -533,7 +533,7 @@
- </target>
-
- <target name="compile-jaxen" if="jaxen.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.jaxen"/>
-@@ -541,7 +541,7 @@
- </target>
-
- <target name="compile-jdom" if="jdom.available">
-- <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.2" source="1.2">
-+ <javac deprecation="off" destdir="${build.classes.dir}" debug="on" optimize="off" bootclasspath="${boot.class.path}" target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.jdom"/>
-@@ -553,7 +553,7 @@
- destdir="${build.classes.dir}"
- debug="on"
- optimize="off"
-- target="1.2" source="1.2">
-+ target="1.3" source="1.3">
- <src path="${src.dir}"/>
- <classpath refid="compile.classpath"/>
- <patternset refid="freemarker.compile.xalan"/>
Deleted: trunk/libfreemarker-java/debian/patches/javacc-home.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/javacc-home.diff 2007-12-20 22:27:38 UTC (rev 5149)
+++ trunk/libfreemarker-java/debian/patches/javacc-home.diff 2007-12-21 10:27:51 UTC (rev 5150)
@@ -1,13 +0,0 @@
-Index: libfreemarker-java-2.3.11/build.xml
-===================================================================
---- libfreemarker-java-2.3.11.orig/build.xml 2007-12-16 13:03:30.000000000 +0100
-+++ libfreemarker-java-2.3.11/build.xml 2007-12-16 13:04:37.000000000 +0100
-@@ -376,7 +376,7 @@
- <javacc
- target="${src.dir}/freemarker/core/FMParser.jj"
- outputdirectory="src/freemarker/core"
-- javacchome="lib"
-+ javacchome="${javacc.home}"
- />
- <replace
- file="src/freemarker/core/FMParserConstants.java"
Deleted: trunk/libfreemarker-java/debian/patches/jsp.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/jsp.diff 2007-12-20 22:27:38 UTC (rev 5149)
+++ trunk/libfreemarker-java/debian/patches/jsp.diff 2007-12-21 10:27:51 UTC (rev 5150)
@@ -1,13 +0,0 @@
-Index: libfreemarker-java-2.3.11/build.xml
-===================================================================
---- libfreemarker-java-2.3.11.orig/build.xml 2007-12-18 19:43:29.000000000 +0100
-+++ libfreemarker-java-2.3.11/build.xml 2007-12-18 19:43:49.000000000 +0100
-@@ -419,8 +419,6 @@
- <antcall target="compile-logkit"/>
- <antcall target="compile-jdk14"/>
- <antcall target="compile-jdk15"/>
-- <antcall target="compile-jsp1"/>
-- <antcall target="compile-jsp2"/>
- <antcall target="compile-jython"/>
- <antcall target="compile-dom4j"/>
- <antcall target="compile-jdom"/>
Deleted: trunk/libfreemarker-java/debian/patches/no-downloads.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/no-downloads.diff 2007-12-20 22:27:38 UTC (rev 5149)
+++ trunk/libfreemarker-java/debian/patches/no-downloads.diff 2007-12-21 10:27:51 UTC (rev 5150)
@@ -1,36 +0,0 @@
-Index: libfreemarker-java-2.3.11/build.xml
-===================================================================
---- libfreemarker-java-2.3.11.orig/build.xml 2007-12-16 12:54:15.000000000 +0100
-+++ libfreemarker-java-2.3.11/build.xml 2007-12-16 12:54:27.000000000 +0100
-@@ -286,31 +286,6 @@
- </target>
-
- <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"/>
-- </and>
-- </condition>
- <antcall target="fetchlibs"/>
- <available
- property="log4j.available"
Modified: trunk/libfreemarker-java/debian/patches/series
===================================================================
--- trunk/libfreemarker-java/debian/patches/series 2007-12-20 22:27:38 UTC (rev 5149)
+++ trunk/libfreemarker-java/debian/patches/series 2007-12-21 10:27:51 UTC (rev 5150)
@@ -1,6 +1 @@
class_name.diff
-java-version.diff
-no-downloads.diff
-javacc-home.diff
-sun-xalan.diff
-jsp.diff
Deleted: trunk/libfreemarker-java/debian/patches/sun-xalan.diff
===================================================================
--- trunk/libfreemarker-java/debian/patches/sun-xalan.diff 2007-12-20 22:27:38 UTC (rev 5149)
+++ trunk/libfreemarker-java/debian/patches/sun-xalan.diff 2007-12-21 10:27:51 UTC (rev 5150)
@@ -1,12 +0,0 @@
-Index: libfreemarker-java-2.3.11/build.xml
-===================================================================
---- libfreemarker-java-2.3.11.orig/build.xml 2007-12-18 13:43:58.000000000 +0100
-+++ libfreemarker-java-2.3.11/build.xml 2007-12-18 13:44:08.000000000 +0100
-@@ -180,7 +180,6 @@
-
- <patternset id="freemarker.compile.jdk15">
- <include name="freemarker/ext/beans/EnumModels.java"/>
-- <include name="freemarker/ext/dom/SunInternalXalanXPathSupport.java"/>
- </patternset>
-
- <patternset id="freemarker.compile.xalan">
Modified: trunk/libfreemarker-java/debian/rules
===================================================================
--- trunk/libfreemarker-java/debian/rules 2007-12-20 22:27:38 UTC (rev 5149)
+++ trunk/libfreemarker-java/debian/rules 2007-12-21 10:27:51 UTC (rev 5150)
@@ -5,12 +5,13 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_ANT_BUILD_TARGET := all
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_BUILD_TARGET := jar javadoc
DEB_JARS := ant-nodeps dom4j glassfish-javaee jaxen jdom0 js junit \
- jython log4j-1.2 logkit xercesImpl
+ jython log4j-1.2 logkit xercesImpl jsp-api xalan2 commons-jxpath
install/libfreemarker-java::
- install -m 644 -D lib/freemarker.jar $(DEB_DESTDIR)/usr/share/java/freemarker-$(DEB_UPSTREAM_VERSION).jar
+ install -m 644 -D freemarker.jar $(DEB_DESTDIR)/usr/share/java/freemarker-$(DEB_UPSTREAM_VERSION).jar
dh_link /usr/share/java/freemarker-$(DEB_UPSTREAM_VERSION).jar \
/usr/share/java/freemarker.jar
More information about the pkg-java-commits
mailing list