rpms/plexus-cdc/devel plexus-cdc-1.0-build.xml, NONE, 1.1.2.1 plexus-cdc-DefaultComponentDescriptorWriterTest.patch, NONE, 1.1.2.1 plexus-cdc.spec, 1.10, 1.10.2.1 sources, 1.1, 1.1.2.1
Fernando Nasser
fnasser at fedoraproject.org
Wed May 20 19:46:07 UTC 2009
Author: fnasser
Update of /cvs/extras/rpms/plexus-cdc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10742
Modified Files:
Tag: private-newmaven-branch
plexus-cdc.spec sources
Added Files:
Tag: private-newmaven-branch
plexus-cdc-1.0-build.xml
plexus-cdc-DefaultComponentDescriptorWriterTest.patch
Log Message:
Update to pre-bootstrap alpha-10
--- NEW FILE plexus-cdc-1.0-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!--build.xml generated by maven from project.xml version 1.1.2
on date October 31 2005, time 1658-->
<project default="jar" name="plexus-cdc" basedir=".">
<property name="defaulttargetdir" value="target"></property>
<property name="libdir" value="target/lib"></property>
<property name="classesdir" value="target/classes"></property>
<property name="testclassesdir" value="target/test-classes"></property>
<property name="testclassesdir" value="target/test-classes"></property>
<property name="testreportdir" value="target/test-reports"></property>
<property name="distdir" value="dist"></property>
<property name="javadocdir" value="target/site/apidocs"></property>
<property name="final.name" value="plexus-cdc-1.0-alpha-4"></property>
<path id="build.classpath">
<fileset dir="${libdir}">
<include name="**/*.jar"></include>
</fileset>
</path>
<target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}"></mkdir>
<condition property="noget">
<equals arg2="only" arg1="${build.sysclasspath}"></equals>
</condition>
<!--Test if JUNIT is present in ANT classpath-->
<available property="Junit.present" classname="junit.framework.Test"></available>
</target>
<target name="compile" description="o Compile the code" depends="get-deps">
<mkdir dir="${classesdir}"></mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src>
<pathelement location="src/main/java"></pathelement>
</src>
<classpath refid="build.classpath"></classpath>
</javac>
<copy todir="${classesdir}">
<fileset dir="src/main/resources">
<include name="**/*"></include>
</fileset>
</copy>
</target>
<target name="jar" description="o Create the jar" depends="compile,test">
<jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
</target>
<target name="clean" description="o Clean up the generated directories">
<delete dir="${defaulttargetdir}"></delete>
<delete dir="${distdir}"></delete>
</target>
<target name="dist" description="o Create a distribution" depends="jar, javadoc">
<mkdir dir="dist"></mkdir>
<copy todir="dist">
<fileset dir="${defaulttargetdir}" includes="*.jar"></fileset>
<fileset dir="${basedir}" includes="LICENSE*, README*"></fileset>
</copy>
</target>
<target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
<fail message="There were test failures."></fail>
</target>
<target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
<mkdir dir="${testreportdir}"></mkdir>
<junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
<sysproperty key="basedir" value="."></sysproperty>
<formatter type="xml"></formatter>
<formatter usefile="false" type="plain"></formatter>
<classpath>
<path refid="build.classpath"></path>
<pathelement path="${testclassesdir}"></pathelement>
<pathelement path="${classesdir}"></pathelement>
</classpath>
<batchtest todir="${testreportdir}">
<fileset dir="src/test/java">
<include name="**/*Test.java"></include>
<exclude name="**/Abstract*.java"></exclude>
</fileset>
</batchtest>
</junit>
</target>
<target name="junit-present" unless="Junit.present" depends="init">
<echo>================================= WARNING ================================</echo>
<echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
<echo>==========================================================================</echo>
</target>
<target name="compile-tests" if="Junit.present" depends="junit-present,compile">
<mkdir dir="${testclassesdir}"></mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src>
<pathelement location="src/test/java"></pathelement>
</src>
<classpath>
<path refid="build.classpath"></path>
<pathelement path="${classesdir}"></pathelement>
</classpath>
</javac>
<copy todir="${testclassesdir}">
<fileset dir="src/test/resources">
<include name="**/*"></include>
</fileset>
</copy>
</target>
<target name="javadoc" description="o Generate javadoc" depends="get-deps">
<mkdir dir="${javadocdir}"></mkdir>
<tstamp>
<format pattern="-yyyy" property="year"></format>
</tstamp>
<property name="copyright" value="Copyright &copy; . All Rights Reserved."></property>
<property name="title" value="Plexus CDC Component 1.0 API"></property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.cdc.*">
<classpath>
<path refid="build.classpath"></path>
</classpath>
</javadoc>
</target>
<target name="get-deps" unless="noget" depends="init">
<!--Proxy settings works only with a JDK 1.2 and higher.-->
<setproxy></setproxy>
</target>
<target name="install-maven">
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
</target>
</project>
plexus-cdc-DefaultComponentDescriptorWriterTest.patch:
--- NEW FILE plexus-cdc-DefaultComponentDescriptorWriterTest.patch ---
--- src/test/java/org/codehaus/plexus/cdc/DefaultComponentDescriptorWriterTest.java.sav 2008-06-09 14:51:21.000000000 +0200
+++ src/test/java/org/codehaus/plexus/cdc/DefaultComponentDescriptorWriterTest.java 2008-06-09 14:52:12.000000000 +0200
@@ -39,7 +39,7 @@
protected void setUp() throws Exception {
super.setUp();
- descriptorWriter = (DefaultComponentDescriptorWriter) lookup(ComponentDescriptorWriter.class);
+ descriptorWriter = (DefaultComponentDescriptorWriter) lookup("org.codehaus.plexus.cdc.ComponentDescriptorWriter");
assertNotNull(descriptorWriter);
}
Index: plexus-cdc.spec
===================================================================
RCS file: /cvs/extras/rpms/plexus-cdc/devel/plexus-cdc.spec,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -p -r1.10 -r1.10.2.1
--- plexus-cdc.spec 23 Mar 2009 18:49:27 -0000 1.10
+++ plexus-cdc.spec 20 May 2009 19:45:37 -0000 1.10.2.1
@@ -28,66 +28,79 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define _with_gcj_support 1
+%define _without_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 gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-%define parent plexus
+# If you don't want to build with maven, and use straight ant instead,
+# give rpmbuild option '--without maven'
+
+%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
+%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+%define parent plexus
%define subname cdc
%define maven_settings_file %{_builddir}/%{name}/settings.xml
Name: %{parent}-%{subname}
Version: 1.0
-Release: 0.3.a4.1.7%{?dist}
+Release: 0.3.a10.5%{?dist}
Epoch: 0
Summary: Plexus Component Descriptor Creator
-License: MIT
+License: Apache Software License
Group: Development/Java
URL: http://plexus.codehaus.org/
-Source0: %{name}-src.tar.gz
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-cdc-1.0-alpha-4 plexus-cdc/
-# tar czf plexus-cdc-1.0-alpha-4.tar.gz plexus-cdc/
+Source0: %{name}-1.0-alpha-10-src.tgz
+# svn export http://svn.codehaus.org/plexus/plexus-tools/tags/plexus-cdc-1.0-alpha-10 plexus-cdc/
+# tar czf plexus-cdc-1.0-alpha-10-src.tgz plexus-cdc/
Source1: %{name}-jpp-depmap.xml
+Source2: %{name}-%{version}-build.xml
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if ! %{gcj_support}
BuildArch: noarch
+%else
+ExcludeArch: ppc64
%endif
BuildRequires: jpackage-utils >= 0:1.7.2
-BuildRequires: maven2 >= 2.0.4-9
-BuildRequires: maven2-plugin-compiler
-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: maven2-common-poms >= 1.0
-BuildRequires: jdom
-BuildRequires: plexus-container-default
-BuildRequires: plexus-utils
-BuildRequires: qdox
-Requires: jdom
-Requires: maven2-common-poms >= 1.0
-Requires: plexus-container-default
-Requires: plexus-utils
-Requires: qdox
+BuildRequires: ant >= 0:1.6
+%if %{with_maven}
+BuildRequires: maven2 >= 2.0.4-9
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven2-plugin-release
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven2-common-poms >= 1.0
+BuildRequires: plexus-containers-component-api >= 1.0-0.a34
+
+%endif
+BuildRequires: classworlds
+BuildRequires: jdom
+BuildRequires: plexus-container-default
+BuildRequires: plexus-utils
+BuildRequires: qdox
+%if %{gcj_support}
+BuildRequires: gnu-crypto
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
+
+Requires: jdom
+Requires: maven2-common-poms >= 1.0
+Requires: plexus-container-default
+Requires: plexus-utils
+Requires: qdox
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
-
%description
The Plexus project seeks to create end-to-end developer tools for
writing applications. At the core is the container, which can be
@@ -105,32 +118,47 @@ Javadoc for %{name}.
%prep
%setup -q -n %{name}
+cp %{SOURCE2} build.xml
+#FIXME failed to create task or type setproxy
+sed -i "s|<setproxy></setproxy>|<!-- <setproxy></setproxy> -->|" build.xml
+mv src/test/resources src/test/java
+mkdir src/test/resources
+%build
+%if %{with_maven}
mkdir external_repo
ln -s %{_javadir} external_repo/JPP
-
-%build
-
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
mvn-jpp \
-e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven2.jpp.depmap.file=%{SOURCE1} \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
install javadoc:javadoc
+%else
+mkdir -p target/lib
+build-jar-repository -s -p target/lib \
+classworlds \
+jdom \
+plexus/container-default \
+plexus/utils \
+qdox \
+
+ant jar javadoc
+%endif
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
+ $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}-%{version}.jar
%add_to_maven_depmap org.codehaus.plexus %{name} 1.0-alpha-4 JPP/%{parent} %{subname}
-(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+(cd $RPM_BUILD_ROOT%{_javadir}/%{parent} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
@@ -140,11 +168,12 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
+ $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
%if %{gcj_support}
+export CLASSPATH=$(build-classpath gnu-crypto)
%{_bindir}/aot-compile-rpm
%endif
@@ -153,7 +182,7 @@ rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
-
+%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
@@ -163,8 +192,7 @@ fi
%postun
%update_maven_depmap
-
-
+%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
@@ -172,38 +200,47 @@ then
fi
%endif
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+ rm -f %{_javadocdir}/%{name}
+fi
+
%files
%defattr(-,root,root,-)
%{_javadir}/plexus
%{_datadir}/maven2
%{_mavendepmapfragdir}
-%config(noreplace) /etc/maven/fragments/plexus-cdc
-
+%{_mavendepmapfragdir}
%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/cdc-1.0.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{subname}*-%{version}.jar.*
%endif
%files javadoc
%defattr(-,root,root,-)
-%doc %{_javadocdir}/*
+%doc %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
%changelog
-* Mon Mar 23 2009 Deepak Bhole <dbhole at redhat.com> - 0:1.0-0.3.a4.1.7
-- Build on ppc64
+* Tue Mar 17 2009 Yong Yang <yyang at redhat.com> 0:1.0-0.3.a10.5
+- rebuild with new maven2 2.0.8 built in bootstrap mode
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.3.a4.1.6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Feb 05 2009 Yong Yang <yyang at redhat.com> 0:1.0-0.1.a10.4
+- re-build with JPP6 plexus-containers
-* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-0.2.a4.1.6
-- drop repotag
+* Tue Jan 13 2009 Yong Yang <yyang at redhat.com> 0:1.0-0.1.a10.3jpp.1
+- re-build with maven
-* Thu May 29 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-0.2.a4.1jpp.5
-- Fix license tag
+* Wed Jan 07 2009 Yong Yang <yyang at redhat.com> 0:1.0-0.1.a10.2jpp.1
+- Imported from dbhole's maven 2.0.8 packages, add build.xml, Initial building on JPP
-* Thu Feb 28 2008 Deepak Bhole <dbhole at redhat.com> 1.0-0.2.a4.1jpp.4
-- Rebuild
+* Mon Jan 07 2008 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a10.1jpp.1
+- Update to alpha 10
* Fri Sep 21 2007 Deepak Bhole <dbhole at redhat.com> 0:1.0-0.1.a4.2jpp.3
- ExcludeArch ppc64
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plexus-cdc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -p -r1.1 -r1.1.2.1
--- sources 13 Mar 2007 22:21:32 -0000 1.1
+++ sources 20 May 2009 19:45:37 -0000 1.1.2.1
@@ -1 +1 @@
-c6917575b249874e088dbd6a6aca03df plexus-cdc-src.tar.gz
+d3a31211c51caf6bf8b89c47eaa8c281 plexus-cdc-1.0-alpha-10-src.tgz
More information about the scm-commits
mailing list