Compare commits

..

2 commits

Author SHA1 Message Date
Roland Grunberg
a52d0c1063 Do not attempt to remove non-existent files. 2012-07-27 16:43:24 -04:00
Roland Grunberg
bc9a85139c Update to 0.15.0. 2012-07-27 16:43:14 -04:00
5 changed files with 129 additions and 1 deletions

2
.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
/tycho-extras-0.14.x.tar.bz2
/tycho-extras-0.15.x.tar.bz2

View file

@ -1 +0,0 @@
This project was merged upstream with the main tycho repo. The tycho-extras RPM was subsumed by the tycho RPM

1
sources Normal file
View file

@ -0,0 +1 @@
ba3b5e40696ea9cc591d2a47bc7523c0 tycho-extras-0.15.x.tar.bz2

View file

@ -0,0 +1,38 @@
diff -rauN tycho-extras-0.14.x.old/pom.xml tycho-extras-0.14.x/pom.xml
--- tycho-extras-0.14.x.old/pom.xml 2012-02-06 11:08:17.000000000 -0500
+++ tycho-extras-0.14.x/pom.xml 2012-04-14 09:54:50.894636273 -0400
@@ -177,6 +177,7 @@
<version>2.1</version>
</plugin>
<!-- m2eclipse lifecycle mapping -->
+ <!--
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
@@ -201,6 +202,7 @@
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ -->
</plugins>
</pluginManagement>
</build>
diff -rauN tycho-extras-0.14.x.old/tycho-p2-extras-plugin/pom.xml tycho-extras-0.14.x/tycho-p2-extras-plugin/pom.xml
--- tycho-extras-0.14.x.old/tycho-p2-extras-plugin/pom.xml 2012-02-06 11:08:17.000000000 -0500
+++ tycho-extras-0.14.x/tycho-p2-extras-plugin/pom.xml 2012-04-14 09:55:12.494284531 -0400
@@ -78,6 +78,7 @@
<build>
<plugins>
+ <!--
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>maven-properties-plugin</artifactId>
@@ -95,6 +96,7 @@
</execution>
</executions>
</plugin>
+ -->
<!-- During the unit tests, the test project is copied to the target folder
and the publish mojo is executed on the project. The test project may also

88
tycho-extras.spec Normal file
View file

@ -0,0 +1,88 @@
Name: tycho-extras
Version: 0.15.0
Release: 1%{?dist}
Summary: Additional plugins for Tycho
Group: Development/Libraries
License: EPL
URL: http://eclipse.org/tycho/
Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/tycho-extras-0.15.x.tar.bz2
# maven-properties-plugin is only needed for tests
Patch0: %{name}-no-maven-properties-plugin.patch
BuildArch: noarch
BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1.5
BuildRequires: tycho
Requires: jpackage-utils
Requires: java >= 1.5
Requires: tycho
%description
A small set of plugins that work with Tycho to provide additional functionality
when building projects of an OSGi nature.
%package javadoc
Summary: Java docs for %{name}
Group: Documentation
Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}-0.15.x
%patch0 -p1
%build
# To run tests, we need :
# maven-properties-plugin (unclear licensing)
mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
%install
install -d -m 755 %{buildroot}%{_javadir}/%{name}
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-main.pom
%add_maven_depmap JPP.%{name}-main.pom -a "org.eclipse.tycho:tycho-extras,org.sonatype.tycho:tycho-extras"
for mod in tycho-custom-bundle-plugin tycho-eclipserun-plugin \
tycho-source-feature-plugin tycho-version-bump-plugin \
tycho-p2-extras-plugin pack200/tycho-pack200{{a,b}-plugin,-impl}; do
echo $mod
aid=`basename $mod`
install -pm 644 $mod/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$aid.pom
install -m 644 $mod/target/$aid-%{version}.jar %{buildroot}%{_javadir}/%{name}/$aid.jar
%add_maven_depmap JPP.%{name}-$aid.pom %{name}/$aid.jar -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
done
for pommod in pack200; do
echo $pommod
aid=`basename $pommod`
install -pm 644 $pommod/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$aid.pom
%add_maven_depmap JPP.%{name}-$aid.pom -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
done
# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%files
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}
%files javadoc
%{_javadocdir}/%{name}
%changelog
* Fri Jul 27 2012 Roland Grunberg <rgrunber@redhat.com> 0.15.0-1
- Update to 0.15.0.
* Tue Apr 16 2012 Roland Grunberg <rgrunber@redhat.com> - 0.14.0-1
- Initial packaging of tycho extras.