Use poms produced by the build not foreign ones.

Adapt to current guidelines.
This commit is contained in:
Alexander Kurtakov 2011-09-16 17:11:05 +03:00
parent c1801b5ac5
commit 8203106c1b
9 changed files with 26 additions and 335 deletions

View File

@ -1,14 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
<version>3.3.1</version>
</parent>
<name>ASM Core</name>
<artifactId>asm</artifactId>
<packaging>jar</packaging>
</project>

View File

@ -1,15 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>asm</groupId>
<artifactId>asm-parent</artifactId>
<version>3.3.1</version>
</parent>
<name>ASM All</name>
<groupId>asm</groupId>
<artifactId>asm-all</artifactId>
<packaging>jar</packaging>
</project>

View File

@ -1,21 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
<version>3.3.1</version>
</parent>
<name>ASM Analysis</name>
<artifactId>asm-analysis</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<artifactId>asm-tree</artifactId>
<groupId>asm</groupId>
</dependency>
</dependencies>
</project>

View File

@ -1,21 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
<version>3.3.1</version>
</parent>
<name>ASM Commons</name>
<artifactId>asm-commons</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<artifactId>asm-tree</artifactId>
<groupId>asm</groupId>
</dependency>
</dependencies>
</project>

View File

@ -1,144 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
<version>3.3.1</version>
<packaging>pom</packaging>
<name>ASM</name>
<description>A very small and fast Java bytecode manipulation framework</description>
<url>http://asm.objectweb.org/</url>
<organization>
<name>ObjectWeb</name>
<url>http://www.objectweb.org/</url>
</organization>
<inceptionYear>2000</inceptionYear>
<licenses>
<license>
<name>BSD</name>
<url>http://asm.objectweb.org/license.html</url>
</license>
</licenses>
<developers>
<developer>
<name>Eric Bruneton</name>
<id>ebruneton</id>
<email>ebruneton@free.fr</email>
<roles>
<role>Creator</role>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<name>Eugene Kuleshov</name>
<id>eu</id>
<email>eu@javatx.org</email>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<name>Remi Forax</name>
<id>forax</id>
<email>forax@univ-mlv.fr</email>
<roles>
<role>Java Developer</role>
</roles>
</developer>
</developers>
<scm>
<connection>scm:svn:svn://svn.forge.objectweb.org/svnroot/asm/trunk</connection>
<developerConnection>scm:svn:svn+ssh://${maven.username}@svn.forge.objectweb.org/svnroot/asm/trunk</developerConnection>
<url>http://svn.forge.objectweb.org/cgi-bin/viewcvs.cgi/asm/trunk/</url>
</scm>
<issueManagement>
<url>http://forge.objectweb.org/tracker/?group_id=23</url>
</issueManagement>
<dependencyManagement>
<dependencies>
<dependency>
<artifactId>asm</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>asm-tree</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>asm-analysis</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>asm-commons</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>asm-util</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>asm-xml</artifactId>
<groupId>${project.groupId}</groupId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<mailingLists>
<mailingList>
<name>ASM Users List</name>
<subscribe>sympa@ow2.org?subject=subscribe%20asm</subscribe>
<unsubscribe>sympa@ow2.org?subject=unsubscribe%20asm</unsubscribe>
<post>asm@ow2.org</post>
<archive>http://www.ow2.org/wws/arc/asm</archive>
</mailingList>
<mailingList>
<name>ASM Team List</name>
<subscribe>sympa@ow2.org?subject=subscribe%20asm-team</subscribe>
<unsubscribe>sympa@ow2.org?subject=unsubscribe%20asm-team</unsubscribe>
<post>asm-team@ow2.org</post>
<archive>http://www.ow2.org/wws/arc/asm-team</archive>
</mailingList>
</mailingLists>
<distributionManagement>
<downloadUrl>http://mojo.codehaus.org/my-project</downloadUrl>
<repository>
<id>objectweb</id>
<uniqueVersion>false</uniqueVersion>
<name>ObjectWeb Maven 2.0 Repository</name>
<url>dav:https://maven.forge.objectweb.org:8002/maven2/</url>
<layout>default</layout>
</repository>
<snapshotRepository>
<id>objectweb.snapshots</id>
<uniqueVersion>false</uniqueVersion>
<name>ObjectWeb Maven 2.0 Snapshot Repository</name>
<url>dav:https://maven.forge.objectweb.org:8002/maven2-snapshot/</url>
<layout>default</layout>
</snapshotRepository>
</distributionManagement>
</project>

View File

@ -1,21 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
<version>3.3.1</version>
</parent>
<name>ASM Tree</name>
<artifactId>asm-tree</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<artifactId>asm</artifactId>
<groupId>asm</groupId>
</dependency>
</dependencies>
</project>

View File

@ -1,21 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
<version>3.3.1</version>
</parent>
<name>ASM Util</name>
<artifactId>asm-util</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<artifactId>asm-tree</artifactId>
<groupId>asm</groupId>
</dependency>
</dependencies>
</project>

View File

@ -1,21 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>asm-parent</artifactId>
<groupId>asm</groupId>
<version>3.3.1</version>
</parent>
<name>ASM XML</name>
<artifactId>asm-xml</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<artifactId>asm-util</artifactId>
<groupId>asm</groupId>
</dependency>
</dependencies>
</project>

View File

@ -28,26 +28,16 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
%define section free
Name: objectweb-asm
Version: 3.3.1
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 0
Summary: A code manipulation tool to implement adaptable systems
License: BSD
URL: http://asm.objectweb.org/
Group: Development/Libraries/Java
Source0: http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
Source1: http://repo1.maven.org/maven2/asm/asm/3.3.1/asm-3.3.1.pom
Source2: http://repo1.maven.org/maven2/asm/asm-analysis/3.3.1/asm-analysis-3.3.1.pom
Source3: http://repo1.maven.org/maven2/asm/asm-commons/3.3.1/asm-commons-3.3.1.pom
Source4: http://repo1.maven.org/maven2/asm/asm-tree/3.3.1/asm-tree-3.3.1.pom
Source5: http://repo1.maven.org/maven2/asm/asm-util/3.3.1/asm-util-3.3.1.pom
Source6: http://repo1.maven.org/maven2/asm/asm-xml/3.3.1/asm-xml-3.3.1.pom
Source7: http://repo1.maven.org/maven2/asm/asm-all/3.3.1/asm-all-3.3.1.pom
Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.3.1/asm-parent-3.3.1.pom
Source9: asm-MANIFEST.MF
Source1: asm-MANIFEST.MF
Patch0: objectweb-asm-no-classpath-in-manifest.patch
# Needed by asm-xml.jar
Requires: xml-commons-jaxp-1.3-apis
@ -60,14 +50,13 @@ BuildRequires: objectweb-anttask
BuildRequires: xml-commons-jaxp-1.3-apis
BuildRequires: zip
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
ASM is a code manipulation tool to implement adaptable systems.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
Group: Documentation
%description javadoc
Javadoc for %{name}.
@ -78,79 +67,59 @@ Javadoc for %{name}.
perl -pi -e 's/\r$//g' LICENSE.txt README.txt
mkdir META-INF
cp -p %{SOURCE9} META-INF/MANIFEST.MF
cp -p %{SOURCE1} META-INF/MANIFEST.MF
%build
export CLASSPATH=
export OPT_JAR_LIST=:
ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc
%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
for jar in output/dist/lib/*.jar; do
install -m 644 ${jar} \
$RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${jar}`
$RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${jar/-%{version}/}`
done
touch META-INF/MANIFEST.MF
zip -u output/dist/lib/all/asm-all-%{version}.jar META-INF/MANIFEST.MF
install -m 644 output/dist/lib/all/asm-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do \
ln -sf ${jar} ${jar/-%{version}/}; done)
install -m 644 output/dist/lib/all/asm-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/asm-all.jar
install -m 644 output/dist/lib/all/asm-all-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-asm-all.pom
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm.pom
%add_to_maven_depmap asm asm %{version} JPP/objectweb-asm asm
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-analysis.pom
%add_to_maven_depmap asm asm-analysis %{version} JPP/objectweb-asm asm-analysis
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-commons.pom
%add_to_maven_depmap asm asm-commons %{version} JPP/objectweb-asm asm-commons
install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-tree.pom
%add_to_maven_depmap asm asm-tree %{version} JPP/objectweb-asm asm-tree
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-util.pom
%add_to_maven_depmap asm asm-util %{version} JPP/objectweb-asm asm-util
install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-xml.pom
%add_to_maven_depmap asm asm-xml %{version} JPP/objectweb-asm asm-xml
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-all.pom
%add_to_maven_depmap asm asm-all %{version} JPP/objectweb-asm asm-all
install -m 644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.objectweb-asm-asm-parent.pom
%add_to_maven_depmap asm asm-parent %{version} JPP/objectweb-asm asm-parent
for pom in output/dist/lib/*.pom; do
install -m 644 ${pom} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-`basename ${pom/-%{version}/}`
done
%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar
%add_maven_depmap JPP.objectweb-asm-asm-analysis.pom %{name}/asm-analysis.jar
%add_maven_depmap JPP.objectweb-asm-asm-commons.pom %{name}/asm-commons.jar
%add_maven_depmap JPP.objectweb-asm-asm-tree.pom %{name}/asm-tree.jar
%add_maven_depmap JPP.objectweb-asm-asm-util.pom %{name}/asm-util.jar
%add_maven_depmap JPP.objectweb-asm-asm-xml.pom %{name}/asm-xml.jar
%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar
%add_maven_depmap JPP.objectweb-asm-asm-parent.pom
# javadoc
install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
%postun
%update_maven_depmap
install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt README.txt
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/*.jar
%{_datadir}/maven2/*
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
* Fri Sep 16 2011 Alexander Kurtakov <akurtako@redhat.com> 0:3.3.1-2
- Use poms produced by the build not foreign ones.
- Adpat to current guidelines.
* Mon Apr 04 2011 Chris Aniszczyk <zx@redhat.com> 0:3.3.1
- Upgrade to 3.3.1