rpms/plexus-ant-factory/devel plexus-ant-factory-build.xml, NONE, 1.1 plexus-ant-factory-jpp-depmap.xml, NONE, 1.1 plexus-ant-factory.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Deepak Bhole (dbhole) fedora-extras-commits at redhat.com
Tue Mar 13 23:06:57 UTC 2007


Author: dbhole

Update of /cvs/extras/rpms/plexus-ant-factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25325/devel

Modified Files:
	.cvsignore sources 
Added Files:
	plexus-ant-factory-build.xml plexus-ant-factory-jpp-depmap.xml 
	plexus-ant-factory.spec 
Log Message:
auto-import plexus-ant-factory-1.0-0.1.a1.2jpp.1 on branch devel from plexus-ant-factory-1.0-0.1.a1.2jpp.1.src.rpm


--- NEW FILE plexus-ant-factory-build.xml ---
<project name="plexus-ant-factory" default="jar" basedir=".">
  <property file="${user.home}/.m2/maven.properties"/>
  <property name="maven.build.output" value="target/classes"/>
  <property name="maven.build.directory" value="target"/>
  <property name="maven.build.final.name" value="plexus-ant-factory-1.0-alpha-1"/>
  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
  <property name="maven.test.output" value="target/test-classes"/>
  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
  <path id="build.classpath">
    <fileset dir="lib">
      <include name="plexus_container-default.jar"/>
      <include name="classworlds.jar"/>
      <include name="ant.jar"/>
      <include name="plexus_utils.jar"/>
      <include name="ant-launcher.jar"/>
    </fileset>
  </path>
  <target name="clean" description="Clean the output directory">
    <delete dir="${maven.build.directory}"/>
  </target>
  <target name="compile" depends="get-deps" 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/main/java"/>
      </src>
      <classpath refid="build.classpath"/>
    </javac>
    <copy todir="${maven.build.output}">
      <fileset dir="src/main/resources"/>
    </copy>
  </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}"/>
  </target>
  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases"/>
  <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="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
    <mkdir dir="${maven.repo.local}"/>
    <mkdir dir="/home/dbhole/DIST/plexus-ant-factory/plexus-ant-factory/org/codehaus/plexus/plexus-container-default/1.0-alpha-9"/>
    <get src="http://snapshots.maven.codehaus.org/maven2//org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/dbhole/DIST/plexus-ant-factory/plexus-ant-factory/classworlds/classworlds/1.1-alpha-2"/>
    <get src="http://snapshots.maven.codehaus.org/maven2//classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" dest="${maven.repo.local}/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/dbhole/DIST/plexus-ant-factory/plexus-ant-factory/ant/ant/1.6.5"/>
    <get src="http://snapshots.maven.codehaus.org/maven2//ant/ant/1.6.5/ant-1.6.5.jar" dest="${maven.repo.local}/ant/ant/1.6.5/ant-1.6.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/ant/ant/1.6.5/ant-1.6.5.jar" dest="${maven.repo.local}/ant/ant/1.6.5/ant-1.6.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/ant/ant/1.6.5/ant-1.6.5.jar" dest="${maven.repo.local}/ant/ant/1.6.5/ant-1.6.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/dbhole/DIST/plexus-ant-factory/plexus-ant-factory/org/codehaus/plexus/plexus-utils/1.0.5"/>
    <get src="http://snapshots.maven.codehaus.org/maven2//org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.jar" dest="${maven.repo.local}/org/codehaus/plexus/plexus-utils/1.0.5/plexus-utils-1.0.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <mkdir dir="/home/dbhole/DIST/plexus-ant-factory/plexus-ant-factory/ant/ant-launcher/1.6.5"/>
    <get src="http://snapshots.maven.codehaus.org/maven2//ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar" dest="${maven.repo.local}/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://snapshots.maven.codehaus.org/maven2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar" dest="${maven.repo.local}/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar" usetimestamp="true" ignoreerrors="true"/>
    <get src="http://repo1.maven.org/maven2/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar" dest="${maven.repo.local}/ant/ant-launcher/1.6.5/ant-launcher-1.6.5.jar" usetimestamp="true" ignoreerrors="true"/>
  </target>
</project>


--- NEW FILE plexus-ant-factory-jpp-depmap.xml ---
<dependencies>
	<dependency>
		<maven>
		  <groupId>ant</groupId>
		  <artifactId>ant-launcher</artifactId>
		  <version>1.6.5</version>
		</maven>
		<jpp>
		  <groupId>JPP</groupId>
		  <artifactId>ant-launcher</artifactId>
		  <version>1.6.5</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
		  <groupId>ant</groupId>
		  <artifactId>ant</artifactId>
		  <version>1.6.5</version>
		</maven>
		<jpp>
		  <groupId>JPP</groupId>
		  <artifactId>ant</artifactId>
		  <version>1.6.5</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
		  <groupId>org.codehaus.plexus</groupId>
		  <artifactId>plexus-utils</artifactId>
		  <version>1.0.5</version>
		</maven>
		<jpp>
		  <groupId>JPP/plexus</groupId>
		  <artifactId>utils</artifactId>
		  <version>1.0.5</version>
		</jpp>
	</dependency>

	<dependency>
		<maven>
		  <groupId>org.codehaus.plexus</groupId>
		  <artifactId>plexus-container-default</artifactId>
		  <version>1.0-alpha-9</version>
		</maven>
		<jpp>
		  <groupId>JPP/plexus</groupId>
		  <artifactId>container-default</artifactId>
		  <version>1.0-alpha-9</version>
		</jpp>
	</dependency>

 	<dependency>
	  <maven>
		<groupId>org.codehaus.plexus</groupId>
		<artifactId>plexus-component-factories</artifactId>
		<version>1.0-alpha-5</version>
	  </maven>
	  <jpp>
		<groupId>JPP/plexus</groupId>
		<artifactId>component-factories</artifactId>
		<version>1.0-alpha-5</version>
	  </jpp>
	</dependency>

 	<dependency>
	  <maven>
		<groupId>org.codehaus.plexus</groupId>
		<artifactId>plexus-ant-factory</artifactId>
		<version>1.0-alpha-1</version>
	  </maven>
	  <jpp>
		<groupId>JPP/plexus</groupId>
		<artifactId>ant-factory</artifactId>
		<version>1.0-alpha-1</version>
	  </jpp>
	</dependency>

</dependencies>



--- NEW FILE plexus-ant-factory.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# 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}}}

%define _without_maven 1
%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}

%define parent plexus
%define subname ant-factory

Name:           %{parent}-%{subname}
Version:        1.0
Release:        0.1.a1.2jpp.1%{?dist}
Epoch:          0
Summary:        Plexus Ant component factory
License:        MIT-Style
Group:          Development/Java
URL:            http://plexus.codehaus.org/
Source0:        %{name}-src.tar.gz
# svn export svn://svn.plexus.codehaus.org/plexus/tags/
#            plexus-ant-factory-1.0-alpha-1 plexus-ant-factory/
# tar czf plexus-ant-factory-src.tar.gz plexus-ant-factory/
Source1:        %{name}-jpp-depmap.xml
Source2:        %{name}-build.xml

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%if ! %{gcj_support}
BuildArch:      noarch
%endif

BuildRequires:  jpackage-utils >= 0:1.7.2
%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:    maven2-plugin-surefire
BuildRequires:    maven2-common-poms >= 1.0-2
%endif
BuildRequires:    ant
BuildRequires:    classworlds
BuildRequires:    plexus-container-default
BuildRequires:    plexus-utils

Requires:    ant
Requires:    classworlds
Requires:    plexus-container-default
Requires:    plexus-utils

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
Ant component class creator for Plexus.

%if %{with_maven}
%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(pre):    /bin/rm,/bin/ls
Requires(post):    /bin/rm

%description javadoc
Javadoc for %{name}.
%endif

%prep
%setup -q -n %{name}

%if %{without_maven}
    cp -p %{SOURCE2} build.xml
%endif


%build

%if %{with_maven}
    export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
    mkdir -p $MAVEN_REPO_LOCAL

    mvn-jpp \
        -e \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        install javadoc:javadoc

%else

    mkdir lib
    build-jar-repository \
                             -s -p \
                            lib ant ant-launcher \
                            classworlds \
                            plexus/container-default \
                            plexus/utils
    ant -Dmaven.mode.offline=true

%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
%add_to_maven_depmap org.codehaus.plexus %{name} 1.0-alpha-1 JPP/%{parent} %{subname}

(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
install -pm 644 pom.xml \
          $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{parent}-%{subname}.pom

# javadoc
%if %{with_maven}
    install -d -m 755 $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
%endif

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif
%update_maven_depmap

%postun
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif
%update_maven_depmap

%files
%defattr(-,root,root,-)
%dir %{_javadir}/plexus
%{_javadir}/plexus
%{_datadir}/maven2
%{_mavendepmapfragdir}

%if %{gcj_support}
%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/ant-factory-1.0.jar.*
%endif

%if %{with_maven}
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%endif


%changelog
* Fri Feb 23 2007 Tania Bento <tbento at redhat.com> 0:1.0-0.1.a1.2jpp.1
- Fixed %%Release.
- Fixed %%BuildRoot.
- Removed %%Vendor.
- Removed %%Distribution.
- Removed %%post and %%postun sections for javadoc.
- Defined _with_gcj_supoprt and _gcj_support.
- Changed to use cp -p to preserve timestamps.

* Tue Oct 17 2006 Deepak Bhole <dbhole at redhat.com> 1.0-0.a1.2jpp
- Update for maven2 9jpp.

* Thu Sep 07 2006 Deepak Bhole <dbhole at redhat.com> 1.0-0.a1.1jpp
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plexus-ant-factory/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Mar 2007 22:49:40 -0000	1.1
+++ .cvsignore	13 Mar 2007 23:06:24 -0000	1.2
@@ -0,0 +1 @@
+plexus-ant-factory-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plexus-ant-factory/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Mar 2007 22:49:40 -0000	1.1
+++ sources	13 Mar 2007 23:06:24 -0000	1.2
@@ -0,0 +1 @@
+c344afdd8e8994e3061c3158eaee61bc  plexus-ant-factory-src.tar.gz




More information about the fedora-extras-commits mailing list