rpms/plexus-velocity/devel plexus-velocity-1.1.7-build.xml, NONE, 1.1 .cvsignore, 1.2, 1.3 plexus-velocity.spec, 1.5, 1.6 sources, 1.2, 1.3 plexus-velocity-1.1.2-build.xml, 1.1, NONE plexus-velocity-1.1.2-project.xml, 1.1, NONE
Andrew Overholt
overholt at fedoraproject.org
Fri Aug 21 14:23:28 UTC 2009
Author: overholt
Update of /cvs/pkgs/rpms/plexus-velocity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22553
Modified Files:
.cvsignore plexus-velocity.spec sources
Added Files:
plexus-velocity-1.1.7-build.xml
Removed Files:
plexus-velocity-1.1.2-build.xml
plexus-velocity-1.1.2-project.xml
Log Message:
* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.1.7-3.1
- Import from Deepak Bhole's work (import from JPackage, update to 1.1.7)
- Remove gcj support
--- NEW FILE plexus-velocity-1.1.7-build.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!--build.xml generated by maven from project.xml version 1.1.7
on date October 31 2005, time 1658-->
<project default="jar" name="plexus-velocity" 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-velocity-1.1.7"></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 Velocity Component 1.1.7 API"></property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/main/java" packagenames="org.codehaus.plexus.velocity.*">
<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>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 12 Mar 2007 18:24:59 -0000 1.2
+++ .cvsignore 21 Aug 2009 14:23:28 -0000 1.3
@@ -1 +1 @@
-plexus-velocity-1.1.2-src.tar.gz
+plexus-velocity-1.1.7-src.tar.gz
Index: plexus-velocity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/plexus-velocity.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- plexus-velocity.spec 26 Jul 2009 18:56:57 -0000 1.5
+++ plexus-velocity.spec 21 Aug 2009 14:23:28 -0000 1.6
@@ -28,45 +28,45 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%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}}}
-
# If you don't want to build with maven, and use straight ant instead,
# give rpmbuild option '--without maven'
-%define _without_maven 1
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+
+%define with_maven 0
+%define without_maven 1
%define section free
+%define parent plexus
+%define subname velocity
Name: plexus-velocity
-Version: 1.1.2
-Release: 5.2%{?dist}
+Version: 1.1.7
+Release: 3.1%{?dist}
Epoch: 0
Summary: Plexus Velocity Component
-License: MIT
+License: ASL 2.0
Group: Development/Java
URL: http://plexus.codehaus.org/
-Source0: plexus-velocity-1.1.2-src.tar.gz
-# svn export svn://svn.plexus.codehaus.org/plexus/tags/plexus-velocity-1.1.2/
-# tar czf plexus-velocity-1.1.2-src.tar.gz plexus-velocity-1.1.2/
-Source1: plexus-velocity-1.1.2-build.xml
-Source2: plexus-velocity-1.1.2-project.xml
+# svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-velocity-1.1.7/
+# tar czf plexus-velocity-1.1.7-src.tar.gz plexus-velocity-1.1.7/
+Source0: plexus-velocity-%{version}-src.tar.gz
+Source1: plexus-velocity-%{version}-build.xml
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if ! %{gcj_support}
BuildArch: noarch
-%endif
+BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
-BuildRequires: jpackage-utils >= 0:1.6
%if %{with_maven}
-BuildRequires: maven >= 0:1.1
+BuildRequires: maven2 >= 2.0.4-10jpp
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven2-plugin-surefire
%endif
-BuildRequires: ant-nodeps
BuildRequires: classworlds >= 0:1.1
BuildRequires: jakarta-commons-collections
-BuildRequires: jakarta-commons-logging
BuildRequires: plexus-container-default
BuildRequires: plexus-utils
BuildRequires: velocity
@@ -75,12 +75,8 @@ Requires: jakarta-commons-collections
Requires: plexus-container-default
Requires: plexus-utils
Requires: velocity
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
+Requires(post): jpackage-utils >= 0:1.7.2
+Requires(postun): jpackage-utils >= 0:1.7.2
%description
The Plexus project seeks to create end-to-end developer tools for
@@ -97,36 +93,27 @@ Group: Development/Documentatio
%description javadoc
Javadoc for %{name}.
-
%prep
-%setup -q -n plexus-velocity-1.1.2
+%setup -q -n plexus-velocity-%{version}
for j in $(find . -name "*.jar"); do
mv $j $j.no
done
cp %{SOURCE1} build.xml
-cp %{SOURCE2} project.xml
%build
-%if %{with_maven}
-#mkdir -p .maven/repository/maven/jars
-#build-jar-repository .maven/repository/maven/jars \
-#maven-jelly-tags
-
-#mkdir -p .maven/repository/JPP/jars
-#build-jar-repository -s -p .maven/repository/JPP/jars \
-#classworlds \
-#commons-collections \
-#commons-logging-api \
-#plexus/container-default \
-#plexus/utils \
-#velocity \
-
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
-maven \
- -Dmaven.repo.remote=file:/usr/share/maven/repository \
- -Dmaven.home.local=$MAVEN_HOME_LOCAL \
- jar:install javadoc
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mkdir external_repo
+ln -s %{_javadir} external_repo/JPP
+%if %{with_maven}
+ # Use normal pom for now
+ rm -f release-pom.xml
+ mvn-jpp \
+ -e \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ install javadoc:javadoc
%else
mkdir -p target/lib
@@ -149,44 +136,38 @@ rm -rf $RPM_BUILD_ROOT
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
install -pm 644 target/%{name}-%{version}.jar \
$RPM_BUILD_ROOT%{_javadir}/plexus/velocity-%{version}.jar
+%add_to_maven_depmap org.codehaus.plexus %{name} %{version} JPP/%{parent} %{subname}
+
(cd $RPM_BUILD_ROOT%{_javadir}/plexus && for jar in *-%{version}*; \
do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+# poms
+%if %{with_maven}
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -pm 644 pom.xml \
+ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom
+%endif
+
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr target/docs/apidocs/* $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} # ghost symlink
-%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
-%endif
+%update_maven_depmap
-%if %{gcj_support}
%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
%files
%defattr(-,root,root,-)
-%{_javadir}/*
-
-%if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/velocity-1.1.2.jar.*
+%{_javadir}/%{parent}
+%{_mavendepmapfragdir}
+%if %{with_maven}
+%{_datadir}/maven2
%endif
%files javadoc
@@ -194,6 +175,10 @@ fi
%doc %{_javadocdir}/*
%changelog
+* Fri Aug 21 2009 Andrew Overholt <overholt at redhat.com> 0:1.1.7-3.1
+- Import from Deepak Bhole's work (import from JPackage, update to 1.1.7)
+- Remove gcj support
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1.2-5.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -206,6 +191,10 @@ fi
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.1.2-3jpp.1
- Autorebuild for GCC 4.3
+* Sat Mar 24 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.1.2-3jpp
+- Build with maven2 by default
+- Add gcj_support options
+
* Fri Feb 16 2007 Tania Bento <tbento at redhat.com> - 0:1.1.2-2jpp.1
- Fixed %%License.
- Fixed %%BuildRoot.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plexus-velocity/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 12 Mar 2007 18:24:59 -0000 1.2
+++ sources 21 Aug 2009 14:23:28 -0000 1.3
@@ -1 +1 @@
-9e17316bad952381538118e9684cde28 plexus-velocity-1.1.2-src.tar.gz
+99bf354c1f449006ac77366003d614c2 plexus-velocity-1.1.7-src.tar.gz
--- plexus-velocity-1.1.2-build.xml DELETED ---
--- plexus-velocity-1.1.2-project.xml DELETED ---
More information about the scm-commits
mailing list