diff --git a/.cvsignore b/.cvsignore index ad1f70e..4d6725b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ qdox-1.6.1-src.tar.gz +qdox-1.9.2-src.tar.gz diff --git a/build.xml.tar.gz b/build.xml.tar.gz new file mode 100644 index 0000000..1e11c69 Binary files /dev/null and b/build.xml.tar.gz differ diff --git a/qdox-1.8-jpp-depmap.xml b/qdox-1.8-jpp-depmap.xml new file mode 100644 index 0000000..4836cde --- /dev/null +++ b/qdox-1.8-jpp-depmap.xml @@ -0,0 +1,153 @@ + + + + + slide + slide-webdavlib + 2.1 + + + JPP/slide + slide-webdavclient-webdavlib + 2.1 + + + + + + + xpp3 + xpp3_min + 1.1.3.4.O + + + JPP + xpp3-minimal + 1.1.3.8 + + + + diff --git a/qdox-settings.xml b/qdox-settings.xml new file mode 100644 index 0000000..efe7bd7 --- /dev/null +++ b/qdox-settings.xml @@ -0,0 +1,47 @@ + + + + JPP + + + internal + jpp + __JPP_URL_PLACEHOLDER__ + + + external + jpp + __JAVADIR_PLACEHOLDER__ + + + local + jpp + __MAVENREPO_DIR_PLACEHOLDER__ + + + + + plugins-internal + plugins-internal + jpp + __JPP_URL_PLACEHOLDER__ + + + plugins-external + plugins-external + jpp + __JAVADIR_PLACEHOLDER__ + + + plugins-maven + plugins-maven + jpp + __MAVENDIR_PLUGIN_PLACEHOLDER__ + + + + + + JPP + + diff --git a/qdox.spec b/qdox.spec index e9ad428..238b27c 100644 --- a/qdox.spec +++ b/qdox.spec @@ -1,4 +1,4 @@ -# Copyright (c) 2000-2008, JPackage Project +# Copyright (c) 2000-2009, JPackage Project # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -28,140 +28,132 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%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}} +# If you don't want to build with maven, and use straight ant instead, +# give rpmbuild option '--without maven' -%bcond_with maven - -%define _with_gcj_support 1 -%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 with_maven 0 +%define without_maven 1 %define section free -Name: qdox -Version: 1.6.1 -Release: 7.2%{?dist} -Epoch: 0 Summary: Extract class/interface/method definitions from sources +Name: qdox +Version: 1.9.2 +Release: 1%{?dist} +Epoch: 0 License: ASL 2.0 URL: http://qdox.codehaus.org/ -Group: Development/Libraries/Java -# 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 +Group: Development/Libraries +Source0: %{name}-%{version}-src.tar.gz +# svn export http://svn.codehaus.org/qdox/tags/qdox-1.8/ + +Source1: build.xml.tar.gz +Source2: qdox-settings.xml +Source3: qdox-1.8-jpp-depmap.xml + +BuildRequires: jpackage-utils >= 0:1.7.4 +BuildRequires: java-devel = 0:1.5.0 BuildRequires: ant >= 0:1.6 BuildRequires: ant-junit >= 0:1.6 BuildRequires: junit >= 0:3.8.1 BuildRequires: byaccj -BuildRequires: java_cup BuildRequires: jflex -%if ! %{gcj_support} -BuildArch: noarch +%if %{with_maven} +BuildRequires: maven2 >= 2.0.7 +BuildRequires: maven2-plugin-ant +BuildRequires: maven2-plugin-antrun +BuildRequires: maven2-plugin-compiler +BuildRequires: maven2-plugin-dependency +BuildRequires: maven2-plugin-install +BuildRequires: maven2-plugin-jar +BuildRequires: maven2-plugin-javadoc +BuildRequires: maven2-plugin-release +BuildRequires: maven2-plugin-resources +BuildRequires: maven2-plugin-surefire +BuildRequires: jmock >= 0:1.0 %endif + +Requires: java >= 0:1.5.0 +Requires(post): jpackage-utils >= 0:1.7.4 +Requires(postun): jpackage-utils >= 0:1.7.4 + +BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -%endif %description -QDox is a high speed, small footprint parser -for extracting class/interface/method definitions -from source files complete with JavaDoc @tags. -It is designed to be used by active code -generators or documentation tools. +QDox is a high speed, small footprint parser +for extracting class/interface/method definitions +from source files complete with JavaDoc @tags. +It is designed to be used by active code +generators or documentation tools. %package javadoc Summary: Javadoc for %{name} -Group: Development/Documentation +Group: Documentation %description javadoc %{summary}. +%if %{with_maven} +%package manual +Summary: Documents for %{name} +Group: Documentation + +%description manual +%{summary}. +%endif + %prep %setup -q -n %{name} -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 +for j in $(find . -name "*.jar"); do + mv $j $j.no +done +rm bootstrap/yacc.linux +ln -s /usr/bin/byaccj bootstrap/yacc.linux +ln -s $(build-classpath jflex) bootstrap +#ln -s $(build-classpath java-cup) bootstrap +mkdir -p .m2/repository/JPP/maven2/default_poms +tar xzf %{SOURCE1} -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 +cp %{SOURCE2} settings.xml +sed -i -e "s|__JPP_URL_PLACEHOLDER__|file://`pwd`/.m2/repository|g" settings.xml +sed -i -e "s|__JAVADIR_PLACEHOLDER__|file://`pwd`/external_repo|g" settings.xml +sed -i -e "s|__MAVENREPO_DIR_PLACEHOLDER__|file://`pwd`/.m2/repository|g" settings.xml %build -%if %with maven -export DEPCAT=$(pwd)/qdox-1.6-depcat.new.xml -echo '' > $DEPCAT -echo '' >> $DEPCAT -for p in $(find . -name project.xml); do - pushd $(dirname $p) - %{_bindir}/saxon project.xml %{SOURCE1} >> $DEPCAT - popd -done -echo >> $DEPCAT -echo '' >> $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 +%if %{with_maven} +mkdir external_repo +ln -s %{_javadir} external_repo/JPP + +export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository +mkdir -p $MAVEN_REPO_LOCAL + +mvn-jpp \ + -e \ + -s settings.xml \ + -Dmaven2.jpp.depmap.file=%{SOURCE3} \ + -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ + ant:ant install javadoc:javadoc -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 \ +mkdir -p src/java/com/thoughtworks/qdox/parser/impl +export CLASSPATH=$(build-classpath jmock jflex):target/classes:target/test-classes +java JFlex.Main \ -d src/java/com/thoughtworks/qdox/parser/impl \ src/grammar/lexer.flex -pushd target -%{_bindir}/byaccj \ +pushd src +byaccj \ -Jnorun \ -Jnoconstruct \ -Jclass=Parser \ -Jsemantic=Value \ -Jpackage=com.thoughtworks.qdox.parser.impl \ - ../src/grammar/parser.y + grammar/parser.y popd -mv target/Parser.java src/java/com/thoughtworks/qdox/parser/impl -ant -Dbuild.sysclasspath=only jar javadoc +mv src/Parser.java src/java/com/thoughtworks/qdox/parser/impl +#TODO reenable test when jmock is imported +ant -Dbuild.sysclasspath=only -Dmaven.test.skip=true -Dmaven.mode.offline=true jar javadoc %endif %install @@ -173,115 +165,95 @@ 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) +%add_to_maven_depmap %{name} %{name} %{version} JPP %{name} +%add_to_maven_depmap com.thoughtworks.qdox qdox %{version} JPP %{name} + + +# poms +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -m 644 pom.xml \ + $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom + # javadoc 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 +# manual +mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +cp LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +%if %{with_maven} +rm -rf target/site/apidocs +cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %endif %clean rm -rf $RPM_BUILD_ROOT -%if %{gcj_support} %post -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi +%update_maven_depmap %postun -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif +%update_maven_depmap %files %defattr(0644,root,root,0755) -%doc LICENSE.txt +%doc %{_docdir}/%{name}-%{version}/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 +%{_datadir}/maven2/poms/* +%{_mavendepmapfragdir}/* %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name}-%{version} +%doc %{_javadocdir}/%{name} + +%if %{with_maven} +%files manual +%defattr(0644,root,root,0755) +%doc %{_docdir}/%{name}-%{version}/site +%endif %changelog -* Sun Jul 26 2009 Fedora Release Engineering - 0:1.6.1-7.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Tue Aug 18 2009 Alexander Kurtakov 0:1.9.2-1 +- Update to 1.9.2. -* Wed Feb 25 2009 Fedora Release Engineering - 0:1.6.1-6.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Fri Apr 03 2009 Ralph Apel 0:1.8-1.jpp5 +- 1.8 as qdox18 because of qdox frozen at 1.6.1 in JPP-5 -* Fri Oct 24 2008 David Walluck 0:1.6.1-5.2 -- Fedora-specific: enable GCJ support +* Tue Jul 01 2008 Ralph Apel 0:1.6.3-5.jpp5 +- Restore to devel +- Drop mockobjects BR -* Fri Oct 24 2008 David Walluck 0:1.6.1-5.1 -- Fedora-specific: remove repolib -- Fedora-specific: use java_cup not java-cup -- Fedora-specific: don't use jmock +* Fri Jun 13 2008 Ralph Apel 0:1.6.3-4.jpp5 +- Add com.thoughtworks.qdox groupId to depmap frag -* Tue Jul 29 2008 David Walluck 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 +* Tue Feb 26 2008 Ralph Apel 0:1.6.3-3jpp +- Add settings file +- Fix pom marking jmock dependency as of scope test +- Fix -jpp-depmap.xml for asm2-parent -* Mon Jul 28 2008 David Walluck 0:1.6.1-4 -- fix jflex part of build -- GCJ fixes -- fix javadoc Requires +* Mon Nov 26 2007 Ralph Apel 0:1.6.3-2jpp +- Fix maven macro value -* Sat Jul 26 2008 David Walluck 0:1.6.1-3 -- build without maven -- fix repolib permissions +* Thu Nov 22 2007 Ralph Apel 0:1.6.3-1jpp +- Upgrade to 1.6.3 -* Thu May 29 2008 David Walluck 0:1.6.1-2.jpp5 -- remove spurious gnu-crypto dependency -- fix empty scriptlets -- fix License -- use %%{_bindir} - -* Fri Apr 18 2008 David Walluck 0:1.6.1-1jpp.ep1.5 -- patch for byaccj -- place junit on CLASSPATH -- remove javadoc scriptlets +* Wed May 30 2007 Ralph Apel 0:1.6.2-1jpp +- Upgrade to 1.6.2 +- Activate tests while building with ant +- Make Vendor, Distribution based on macro +- Install depmap frags, poms * Thu Mar 22 2007 Vivek Lakshmanan 0:1.6.1-1jpp.ep1.4 - Rebuild with fixed component-info.xml -* Thu Mar 22 2007 Vivek Lakshmanan 0:1.6.1-1jpp.ep1.3 -- Add repository.jboss.com as a prefix for repodir - -* Thu Mar 22 2007 Fernando Nasser 0:1.6.1-1jpp.ep1.2 -- Add repolib subpackage - -* Thu Mar 22 2007 Fernando Nasser 0:1.6.1-1jpp.ep1.1 -- Merge with upstream for upgrade - -* Fri Mar 16 2007 Fernando Nasser 0:1.6.1-1jpp -- Upgrade to 1.6.1 - * Fri Feb 23 2007 Ralph Apel 0:1.5-3jpp - Add option to build without maven - Omit tests when building without maven - Add gcj_support option -* Tue Feb 21 2006 Fernando Nasser - 0:1.5-2jpp_1rh -- First Red Hat build - * Mon Feb 20 2006 Ralph Apel - 0:1.5-2jpp - Rebuild for JPP-1.7, adapting to maven-1.1 diff --git a/sources b/sources index a258d1d..05bac31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -21aec355b29e6ba2743ed90db643dbfc qdox-1.6.1-src.tar.gz +1d61cb18731aa74a60d9dd04029b9884 qdox-1.9.2-src.tar.gz