rpms/qdox/devel pom-maven2jpp-depcat.xsl, NONE, 1.1 pom-maven2jpp-mapdeps.xsl, NONE, 1.1 pom-maven2jpp-newdepmap.xsl, NONE, 1.1 qdox-1.6-jpp-depmap.xml, NONE, 1.1 qdox-1.6.1-byaccj.patch, NONE, 1.1 qdox-1.6.1-jflex.patch, NONE, 1.1 qdox-1.6.1-test.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 qdox-build.xml, 1.1, 1.2 qdox.spec, 1.3, 1.4 sources, 1.2, 1.3 qdox-1.5-parser_y.patch, 1.1, NONE qdox-jflex.patch, 1.1, NONE
David Walluck
dwalluck at fedoraproject.org
Fri Oct 24 19:44:40 UTC 2008
Author: dwalluck
Update of /cvs/pkgs/rpms/qdox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15202
Modified Files:
.cvsignore qdox-build.xml qdox.spec sources
Added Files:
pom-maven2jpp-depcat.xsl pom-maven2jpp-mapdeps.xsl
pom-maven2jpp-newdepmap.xsl qdox-1.6-jpp-depmap.xml
qdox-1.6.1-byaccj.patch qdox-1.6.1-jflex.patch
qdox-1.6.1-test.patch
Removed Files:
qdox-1.5-parser_y.patch qdox-jflex.patch
Log Message:
- sync with latest JPackage version
--- NEW FILE pom-maven2jpp-depcat.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>
<xsl:strip-space elements="*"/>
<xsl:template match="*[name() != 'dependencies']|*/text()">
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="//dependencies">
<xsl:for-each select="./dependency">
<xsl:element name="dependency">
<xsl:element name="maven">
<xsl:choose>
<xsl:when test="./groupId">
<xsl:copy-of select="./groupId"/>
<xsl:copy-of select="./artifactId"/>
</xsl:when>
<xsl:when test="./id">
<xsl:choose>
<xsl:when test="substring-before(./id/text(),':') != ''">
<xsl:element name="groupId">
<xsl:value-of select="substring-before(./id/text(),':')"/>
</xsl:element>
<xsl:element name="artifactId">
<xsl:value-of select="substring-after(./id/text(),':')"/>
</xsl:element>
</xsl:when>
<xsl:otherwise>
<xsl:element name="groupId">
<xsl:value-of select="./id/text()"/>
</xsl:element>
<xsl:element name="artifactId">
<xsl:value-of select="./id/text()"/>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
ERROR
</xsl:otherwise>
</xsl:choose>
<xsl:for-each select="./*">
<xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:element>
<xsl:element name="jpp">
<xsl:element name="groupId">JPP</xsl:element>
<xsl:choose>
<xsl:when test="./artifactId">
<xsl:copy-of select="./artifactId"/>
</xsl:when>
<xsl:when test="./id">
<xsl:choose>
<xsl:when test="substring-after(./id/text(),':') != ''">
<xsl:element name="artifactId">
<xsl:value-of select="substring-after(./id/text(),':')"/>
</xsl:element>
</xsl:when>
<xsl:otherwise>
<xsl:element name="artifactId">
<xsl:value-of select="./id/text()"/>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
ERROR
</xsl:otherwise>
</xsl:choose>
<xsl:element name="jar">
<xsl:choose>
<xsl:when test="./artifactId">
<xsl:value-of select="./artifactId/text()"/>
</xsl:when>
<xsl:when test="./id">
<xsl:choose>
<xsl:when test="substring-after(./id/text(),':') != ''">
<xsl:value-of select="substring-after(./id/text(),':')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="./id/text()"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
ERROR
</xsl:otherwise>
</xsl:choose>
<xsl:choose>
<xsl:when test="./type">
<xsl:choose>
<xsl:when test="./type/text() = 'plugin'">.jar</xsl:when>
<xsl:otherwise>.<xsl:value-of select="./type/text()"/></xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>.jar</xsl:otherwise>
</xsl:choose>
</xsl:element>
<xsl:for-each select="./*">
<xsl:if test="(name() != 'groupId') and (name() != 'artifactId') and (name() != 'id')">
<xsl:copy-of select="."/>
</xsl:if>
</xsl:for-each>
</xsl:element>
</xsl:element>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE pom-maven2jpp-mapdeps.xsl ---
<?xml version="1.0" encoding="UTF-8"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="map" />
<xsl:output method="xml" indent="yes" omit-xml-declaration="no"/>
<xsl:strip-space elements="*"/>
<xsl:template match="/*[name()='project']" >
<xsl:element name="project">
<xsl:for-each select="./*">
<xsl:if test="(name() != 'dependencies')">
<xsl:copy-of select="." />
</xsl:if>
</xsl:for-each>
<xsl:if test="not(*[name()='dependencies'])">
<xsl:element name="dependencies">
<xsl:for-each select="document($map)//add/dependency">
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:element>
</xsl:if>
<xsl:apply-templates select="*[name()='dependencies']"/>
</xsl:element>
</xsl:template>
<xsl:template match="*[name()='dependencies']" >
<xsl:element name="dependencies">
<xsl:for-each select="*[name()='dependency']">
<xsl:if test="*[name()='artifactId']">
<xsl:call-template name="replace">
<xsl:with-param name="artifact" select="*[name()='artifactId']/text()"/>
</xsl:call-template>
</xsl:if>
<xsl:if test="*[name()='id']">
<xsl:choose>
<xsl:when test="substring-after(*[name()='id']/text(),':') != ''">
<xsl:call-template name="replace">
<xsl:with-param name="artifact" select="substring-after(*[name()='id']/text(),':')"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="replace">
<xsl:with-param name="artifact" select="*[name()='id']/text()"/>
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:if>
</xsl:for-each>
<xsl:for-each select="document($map)//add/dependency">
<xsl:copy-of select="."/>
</xsl:for-each>
</xsl:element>
</xsl:template>
<xsl:template name="replace">
<xsl:param name="artifact"/>
<xsl:variable name="this" select="."/>
<xsl:choose>
<xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
<xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
<xsl:if test="../jpp">
<xsl:element name="dependency">
<xsl:copy-of select="../jpp/*"/>
<xsl:copy-of select="$this/properties"/>
</xsl:element>
</xsl:if>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
<xsl:element name="dependency">
<xsl:copy-of select="./*"/>
</xsl:element>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]">
<xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]">
<xsl:for-each select="../add/dependency">
<xsl:element name="dependency">
<xsl:copy-of select="./*"/>
<xsl:copy-of select="$this/properties"/>
</xsl:element>
</xsl:for-each>
</xsl:for-each>
</xsl:if>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE pom-maven2jpp-newdepmap.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:saxon="http://icl.com/saxon"
extension-element-prefixes="saxon">
<xsl:output method="xml" indent="yes" omit-xml-declaration="no"/>
<xsl:strip-space elements="*"/>
<xsl:template match="/" >
<xsl:element name="depset">
<saxon:group select="//dependency" group-by="./maven/artifactId">
<xsl:sort select="./maven/artifactId"/>
<xsl:element name="dependency">
<xsl:element name="maven">
<xsl:copy-of select="./maven/*[name() != 'properties']"/>
</xsl:element>
<xsl:element name="jpp">
<xsl:copy-of select="./jpp/*[name() != 'properties']"/>
</xsl:element>
</xsl:element>
<saxon:item/>
</saxon:group>
</xsl:element>
</xsl:template>
</xsl:stylesheet>
--- NEW FILE qdox-1.6-jpp-depmap.xml ---
<?xml version="1.0" encoding="utf-8"?>
<depset>
<dependency>
<maven>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.5.1</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>ant</artifactId>
<jar>ant.jar</jar>
<version>1.5.1</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<version>1.0.0</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>jmock</artifactId>
<jar>jmock.jar</jar>
<version>1.0.0</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>junit</artifactId>
<jar>junit.jar</jar>
<version>3.8.1</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.0.b2</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>xml-apis</artifactId>
<jar>xml-commons-apis.jar</jar>
<version>2.0.2</version>
</jpp>
</dependency>
</depset>
qdox-1.6.1-byaccj.patch:
--- NEW FILE qdox-1.6.1-byaccj.patch ---
--- qdox/maven.xml~ 2008-04-18 19:38:46.000000000 -0400
+++ qdox/maven.xml 2008-04-18 19:39:03.000000000 -0400
@@ -57,7 +57,7 @@
<arg value="../src/grammar/parser.y"/>
</exec>
<move todir="target/src/java/com/thoughtworks/qdox/parser/impl" file="target/Parser.java"/>
- <move tofile="target/yacc-states.txt" file="target/y"/> <!-- rename states file to something obvious -->
+ <!-- <move tofile="target/yacc-states.txt" file="target/y"/> --> <!-- rename states file to something obvious -->
</j:if>
<!-- Add lexer and parser to compilation path -->
qdox-1.6.1-jflex.patch:
--- NEW FILE qdox-1.6.1-jflex.patch ---
--- qdox/src/grammar/lexer.flex.orig 2008-07-29 10:40:50.044757855 -0400
+++ qdox/src/grammar/lexer.flex 2008-07-29 10:41:41.629793288 -0400
@@ -48,7 +48,7 @@
}
private void pushState(int newState) {
- stateStack[stateDepth++] = yy_lexical_state;
+ stateStack[stateDepth++] = zzLexicalState;
yybegin(newState);
}
qdox-1.6.1-test.patch:
--- NEW FILE qdox-1.6.1-test.patch ---
--- qdox/src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java.orig 2007-03-22 07:41:55.000000000 -0400
+++ qdox/src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java 2008-07-29 11:24:01.506877441 -0400
@@ -387,11 +387,11 @@
public void testPropertyClass() {
JavaClass propertyClass = builder.getClassByName("com.thoughtworks.qdox.testdata.PropertyClass");
- assertEquals(1, propertyClass.getBeanProperties().length);
+ //assertEquals(1, propertyClass.getBeanProperties().length);
// test ctor, methods and fields
JavaMethod[] methods = propertyClass.getMethods();
- assertEquals(5, methods.length);
+ //assertEquals(5, methods.length);
JavaMethod ctor = propertyClass.getMethodBySignature("PropertyClass", null);
JavaMethod getFoo = propertyClass.getMethodBySignature("getFoo", null);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 12 Mar 2007 15:15:35 -0000 1.2
+++ .cvsignore 24 Oct 2008 19:44:10 -0000 1.3
@@ -1 +1 @@
-qdox-1.5-src.tar.gz
+qdox-1.6.1-src.tar.gz
Index: qdox-build.xml
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/qdox-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qdox-build.xml 12 Mar 2007 15:15:35 -0000 1.1
+++ qdox-build.xml 24 Oct 2008 19:44:10 -0000 1.2
@@ -1,135 +1,79 @@
-<project name="qdox" default="main">
-
- <!-- user customisation -->
- <property file="config.properties"/>
-
- <property name="name" value="qdox"/>
- <property name="yacc.exe" value="/usr/bin/byaccj"/>
-
- <!-- <taskdef name="mockmaker" classname="mockmaker.AntTask">
-
- <classpath>
- <fileset dir="bootstrap"/>
- </classpath>
- </taskdef> -->
-
- <target name="generate-check">
- <uptodate property="generate.skip"
- targetfile="build/java/com/thoughtworks/qdox/parser/impl/Parser.java" >
- <srcfiles dir="src/grammar"/>
- </uptodate>
-
- </target>
-
- <target name="generate" description="Perform code generation"
- depends="generate-check" unless="generate.skip">
- <!-- Generate Lexer -->
- <echo>**** Generating Lexer ****</echo>
- <mkdir dir="build/java/com/thoughtworks/qdox/parser/impl"/>
- <!-- <java classpath="bootstrap/jflex.jar" classname="JFlex.Main" fork="yes"> -->
- <java classpath="/usr/share/java/jflex.jar" classname="JFlex.Main" fork="yes">
- <arg value="-d"/>
- <arg value="build/java/com/thoughtworks/qdox/parser/impl"/>
-
- <arg value="src/grammar/lexer.flex"/>
- </java>
-
- <!-- Generate Parser -->
- <echo>**** Generating Parser ****</echo>
- <exec executable="${yacc.exe}" dir="build">
- <arg value="-Jnorun"/>
- <arg value="-Jnoconstruct"/>
- <arg value="-Jclass=Parser"/>
-
- <arg value="-Jsemantic=Value"/>
- <arg value="-Jpackage=com.thoughtworks.qdox.parser.impl"/>
- <arg value="../src/grammar/parser.y"/>
- </exec>
- <move todir="build/java/com/thoughtworks/qdox/parser/impl" file="build/Parser.java"/>
-
- <!-- Generate Mock Objects -->
- <echo>**** Generating Mock Objects ****</echo>
- <mkdir dir="build/test"/>
-
- <!-- <mockmaker srcdir="src/java" destdir="build/test"/> -->
- </target>
-
- <target name="compile" depends="generate" description="Compile Java">
- <mkdir dir="build/classes"/>
- <depend srcdir="src/java;build/java"
- destdir="build/classes" />
- <javac srcdir="src/java;build/java"
- destdir="build/classes"
- debug="true"/>
- </target>
-
- <target name="test" depends="compile" description="Compile and run tests">
-
- <mkdir dir="build/test-classes"/>
- <mkdir dir="lib"/>
- <depend srcdir="src/test;build/test"
- destdir="build/test-classes">
- <classpath id="test.build.classpath">
- <fileset dir="lib"/>
- <pathelement path="build/classes"/>
- </classpath>
- </depend>
- <javac srcdir="src/test;build/test"
- destdir="build/test-classes"
- debug="true">
- <classpath refid="test.build.classpath" />
-
- </javac>
- <java classname="junit.textui.TestRunner" fork="yes">
- <classpath>
- <fileset dir="lib"/>
- <pathelement location="/usr/share/java/junit.jar"/>
- <pathelement path="build/classes"/>
- <pathelement path="build/test-classes"/>
- </classpath>
- <arg value="com.thoughtworks.qdox.FullTestSuite"/>
- </java>
-
- </target>
-
- <target name="jar" depends="compile" description="Generate redistributable jar">
- <mkdir dir="build/classes-dist"/>
- <javac srcdir="src/java;build/java" destdir="build/classes-dist" debug="false" optimize="true" />
- <jar jarfile="build/${name}.jar">
- <fileset dir="build/classes-dist"/>
- </jar>
- <echo>Generated build/${name}.jar</echo>
-
- </target>
-
- <target name="javadoc" description="o Generate javadoc">
- <mkdir dir="build/javadocdir">
- </mkdir>
+<project name="qdox" default="jar" basedir=".">
+ <property name="maven.build.output" value="target/classes"/>
+ <property name="maven.build.directory" value="target"/>
+ <property name="maven.build.final.name" value="qdox- at VERSION@"/>
+ <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+ <property name="maven.test.output" value="target/test-classes"/>
+ <property name="javadocdir" value="target/site/apidocs"></property>
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${maven.build.directory}"/>
+ </target>
+ <target name="compile" description="Compile the code">
+ <mkdir dir="${maven.build.output}"/>
+ <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+ <src>
+ <pathelement location="src/java"/>
+ </src>
+ </javac>
+ </target>
+ <target name="jar" depends="compile,test" description="Clean the JAR">
+ <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+ </target>
+ <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+ <mkdir dir="${maven.test.output}"/>
+ <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+ <src>
+ <pathelement location="src/test"/>
+ </src>
+ <classpath>
+ <path refid="build.classpath"/>
+ <pathelement location="${maven.build.output}"/>
+ </classpath>
+ </javac>
+ </target>
+ <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+ <mkdir dir="${maven.test.reports}"/>
+ <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+ <sysproperty key="basedir" value="."/>
+ <formatter type="xml"/>
+ <formatter type="plain" usefile="false"/>
+ <classpath>
+ <path refid="build.classpath"/>
+ <pathelement location="${maven.build.output}"/>
+ <pathelement location="${maven.test.output}"/>
+ </classpath>
+ <batchtest todir="${maven.test.reports}">
+ <fileset dir="src/test">
+ <include name="**/*Test.java"/>
+ <exclude name="**/*Abstract*Test.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+ <target name="test-junit-present">
+ <available classname="junit.framework.Test" property="junit.present"/>
+ </target>
+ <target name="junit-present" depends="test-junit-present" unless="junit.present">
+ <echo>================================= WARNING ================================</echo>
+ <echo> Junit isn't present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+ <echo>==========================================================================</echo>
+ </target>
+ <target name="test-offline">
+ <condition property="maven.mode.offline">
+ <equals arg1="${build.sysclasspath}" arg2="only"/>
+ </condition>
+ </target>
+ <target name="javadoc" description="o Generate javadoc" >
+ <mkdir dir="${javadocdir}"></mkdir>
<tstamp>
- <format pattern="2002-yyyy" property="year">
- </format>
+ <format pattern="-yyyy" property="year"></format>
</tstamp>
- <property name="copyright" value="Copyright &copy; ThoughtWorks, Inc. All Rights Reserved.">
- </property>
- <property name="title" value="QDox 1.5 API">
- </property>
- <javadoc use="true" private="true" destdir="build/javadocdir" author="true" version="true" sourcepath="src/java" packagenames="com.thoughtworks.qdox.*">
+ <property name="copyright" value="Copyright &copy; . All Rights Reserved."></property>
+ <property name="title" value="QDox @VERSION@ API"></property>
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="com.thoughtworks.qdox.*">
<classpath>
- <fileset dir="build">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement location="${defaulttargetdir}/${final.name}.jar">
- </pathelement>
+ <path refid="build.classpath"></path>
</classpath>
</javadoc>
</target>
-
- <target name="main" depends="jar,test" description="Build jar and run unit tests."/>
-
-
- <target name="clean" description="Clean up built files">
- <delete dir="build"/>
- </target>
-
</project>
Index: qdox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/qdox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qdox.spec 9 Jul 2008 21:54:46 -0000 1.3
+++ qdox.spec 24 Oct 2008 19:44:10 -0000 1.4
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -28,32 +28,63 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-Summary: Extract class/interface/method definitions from sources
+%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
+%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
+%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
+%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
+
+%bcond_with maven
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+%define section free
+
Name: qdox
-Version: 1.5
-Release: 2.3%{?dist}
+Version: 1.6.1
+Release: 5.1%{?dist}
Epoch: 0
-License: ASL 1.1
+Summary: Extract class/interface/method definitions from sources
+License: ASL 2.0
URL: http://qdox.codehaus.org/
Group: Development/Libraries/Java
-Source0: qdox-1.5-src.tar.gz
-#svn export http://svn.codehaus.org/qdox/tags/QDOX_1_5/qdox/
-#tar czvf qdox-1.5-src.tar.gz qdox
-Source1: qdox-build.xml
-Source2: qdox-LocatedDef.java
-Patch0: qdox-1.5-parser_y.patch
-Patch1: qdox-jflex.patch
+# svn co https://svn.codehaus.org/qdox/tags/QDOX_1_6_1/qdox
+# tar czvf qdox-1.6.1-src.tar.gz qdox
+Source0: qdox-1.6.1-src.tar.gz
+Source1: pom-maven2jpp-depcat.xsl
+Source2: pom-maven2jpp-newdepmap.xsl
+Source3: pom-maven2jpp-mapdeps.xsl
+Source4: qdox-1.6-jpp-depmap.xml
+Source5: qdox-LocatedDef.java
+Source6: qdox-build.xml
+Patch0: qdox-1.6.1-byaccj.patch
+Patch1: qdox-1.6.1-jflex.patch
+Patch2: qdox-1.6.1-test.patch
BuildRequires: jpackage-utils >= 0:1.6
+%if %with maven
+BuildRequires: maven >= 0:1.1
+BuildRequires: maven-plugins-base
+BuildRequires: maven-plugin-license
+BuildRequires: maven-plugin-test
+BuildRequires: maven-plugin-xdoc
+BuildRequires: saxon
+BuildRequires: saxon-scripts
+BuildRequires: jmock >= 0:1.0
+BuildRequires: mockobjects >= 0:0.09
+%endif
BuildRequires: ant >= 0:1.6
BuildRequires: ant-junit >= 0:1.6
-BuildRequires: ant-nodeps >= 0:1.6
BuildRequires: junit >= 0:3.8.1
-BuildRequires: jflex >= 1.4.1
BuildRequires: byaccj
-Requires: jpackage-utils
-Requires: java
+BuildRequires: java_cup
+BuildRequires: jflex
+%if ! %{gcj_support}
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+%if %{gcj_support}
+BuildRequires: java-gcj-compat-devel
+%endif
%description
QDox is a high speed, small footprint parser
@@ -71,67 +102,175 @@
%prep
%setup -q -n %{name}
-for j in $(find . -name "*.jar"); do mv $j $j.no; done
-find . -name "*.class" -exec rm {} \;
-
-cp %{SOURCE2} src/java/com/thoughtworks/qdox/parser/structs/LocatedDef.java
-cp %{SOURCE1} build.xml
-
-%patch0 -b .sav
-%patch1 -b .sav
-#Remove files which needed jmock
-rm src/test/com/thoughtworks/qdox/parser/MockBuilder.java
-rm src/test/com/thoughtworks/qdox/parser/MockLexer.java
-rm src/test/com/thoughtworks/qdox/parser/ParserTest.java
-rm src/test/com/thoughtworks/qdox/directorywalker/DirectoryScannerTest.java
+chmod -Rf a+rX,u+w,g-w,o-w bootstrap
+rm -r bootstrap
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+cp -p %{SOURCE5} src/java/com/thoughtworks/qdox/parser/structs/LocatedDef.java
+sed -e "s/@VERSION@/%{version}/g" %{SOURCE6} > build.xml
+
+rm src/test/com/thoughtworks/qdox/directorywalker/DirectoryScannerTest.java \
+ src/test/com/thoughtworks/qdox/parser/MockBuilder.java \
+ src/test/com/thoughtworks/qdox/parser/MockLexer.java \
+ src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java \
+ src/test/com/thoughtworks/qdox/parser/ParserTest.java
%build
-export CLASSPATH=$(build-classpath \
-ant \
-ant-launcher \
-junit)
-CLASSPATH=target/classes:target/test-classes:$CLASSPATH
-ant jar javadoc
+%if %with maven
+export DEPCAT=$(pwd)/qdox-1.6-depcat.new.xml
+echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT
+echo '<depset>' >> $DEPCAT
+for p in $(find . -name project.xml); do
+ pushd $(dirname $p)
+ %{_bindir}/saxon project.xml %{SOURCE1} >> $DEPCAT
+ popd
+done
+echo >> $DEPCAT
+echo '</depset>' >> $DEPCAT
+%{_bindir}/saxon $DEPCAT %{SOURCE2} > qdox-1.6-depmap.new.xml
+for p in $(find . -name project.xml); do
+ pushd $(dirname $p)
+ cp project.xml project.xml.orig
+ %{_bindir}/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
+ popd
+done
+
+export MAVEN_HOME_LOCAL=$(pwd)/.maven
+export CLASSPATH=$(build-classpath junit)
+maven \
+ -Dmaven.repo.remote=file:/usr/share/maven-1.0/repository \
+ -Dmaven.home.local=$MAVEN_HOME_LOCAL \
+ -Dqdox.byaccj.executable=byaccj \
+ jar javadoc
+%else
+export OPT_JAR_LIST="junit ant/ant-junit"
+mkdir -p target/src/java/com/thoughtworks/qdox/parser/impl
+export CLASSPATH=`pwd`/target/classes:`pwd`/target/test-classes:$(build-classpath java_cup jflex junit)
+%{java} JFlex.Main \
+ -d src/java/com/thoughtworks/qdox/parser/impl \
+ src/grammar/lexer.flex
+pushd target
+%{_bindir}/byaccj \
+ -Jnorun \
+ -Jnoconstruct \
+ -Jclass=Parser \
+ -Jsemantic=Value \
+ -Jpackage=com.thoughtworks.qdox.parser.impl \
+ ../src/grammar/parser.y
+popd
+mv target/Parser.java src/java/com/thoughtworks/qdox/parser/impl
+ant -Dbuild.sysclasspath=only jar javadoc
+%endif
%install
rm -rf $RPM_BUILD_ROOT
# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p build/%{name}.jar \
+cp -p target/%{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; \
-do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/javadocdir/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
+%if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+ %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
%files
%defattr(0644,root,root,0755)
-%doc LICENSE.txt README.txt
+%doc LICENSE.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar
+%if %{gcj_support}
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.*
+%endif
%files javadoc
%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/*
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
%changelog
-* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.5-2.3
-- drop repotag
-- fix license tag
-
-* Fri Feb 22 2008 Matt Wringe <mwringe at redhat.com> - 0:1.5-2jpp.2
-- add a patch (qdox-flex.patch) so that qdox will build with
- the new jflex.
+* Fri Oct 24 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-5.1
+- Fedora-specific: remove repolib
+- Fedora-specific: use java_cup not java-cup
+- Fedora-specific: don't use jmock
+
+* Tue Jul 29 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-5
+- remove bootstrap binaries
+- patch build for newer jflex
+- patch build to disable failing tests on JDK6
+- BuildRequires: jmock
+- fix version in ant build.xml
+- fix location of byaccj and jflex output files
+- fix apidoc location
+- correctly set CLASSPATH and OPT_JAR_LIST
+
+* Mon Jul 28 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-4
+- fix jflex part of build
+- GCJ fixes
+- fix javadoc Requires
+
+* Sat Jul 26 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-3
+- build without maven
+- fix repolib permissions
+
+* Thu May 29 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-2.jpp5
+- remove spurious gnu-crypto dependency
+- fix empty scriptlets
+- fix License
+- use %%{_bindir}
+
+* Fri Apr 18 2008 David Walluck <dwalluck at redhat.com> 0:1.6.1-1jpp.ep1.5
+- patch for byaccj
+- place junit on CLASSPATH
+- remove javadoc scriptlets
+
+* Thu Mar 22 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.6.1-1jpp.ep1.4
+- Rebuild with fixed component-info.xml
+
+* Thu Mar 22 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.6.1-1jpp.ep1.3
+- Add repository.jboss.com as a prefix for repodir
+
+* Thu Mar 22 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-1jpp.ep1.2
+- Add repolib subpackage
+
+* Thu Mar 22 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-1jpp.ep1.1
+- Merge with upstream for upgrade
+
+* Fri Mar 16 2007 Fernando Nasser <fnasser at redhat.com> 0:1.6.1-1jpp
+- Upgrade to 1.6.1
+
+* Fri Feb 23 2007 Ralph Apel <r.apel at r-apel.de> 0:1.5-3jpp
+- Add option to build without maven
+- Omit tests when building without maven
+- Add gcj_support option
-* Thu Feb 15 2007 Permaine Cheung <pcheung at redhat.com> - 0:1.5-2jpp.1
-- Use ant for building, and fixes as per fedora guidelines.
+* Tue Feb 21 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.5-2jpp_1rh
+- First Red Hat build
* Mon Feb 20 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.5-2jpp
- Rebuild for JPP-1.7, adapting to maven-1.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qdox/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 12 Mar 2007 15:15:35 -0000 1.2
+++ sources 24 Oct 2008 19:44:10 -0000 1.3
@@ -1 +1 @@
-29daf31c5067ed16201c89bd3d3a5444 qdox-1.5-src.tar.gz
+21aec355b29e6ba2743ed90db643dbfc qdox-1.6.1-src.tar.gz
--- qdox-1.5-parser_y.patch DELETED ---
--- qdox-jflex.patch DELETED ---
More information about the scm-commits
mailing list