Fix bootstrap build
This commit is contained in:
parent
bd26017258
commit
97727f7630
2
sources
2
sources
@ -1,3 +1,3 @@
|
|||||||
2cfc11196f68212dbaf9e6eb364c4a98 fedoraproject-p2-7a5a01.tar.xz
|
2cfc11196f68212dbaf9e6eb364c4a98 fedoraproject-p2-7a5a01.tar.xz
|
||||||
0a14e091316e0a467f94c7821b9e21e6 org.eclipse.tycho-tycho-0.23.0.tar.xz
|
0a14e091316e0a467f94c7821b9e21e6 org.eclipse.tycho-tycho-0.23.0.tar.xz
|
||||||
c600a5115f29962c974b75b4b25e74f1 eclipse-bootstrap.tar.xz
|
6c81cc0da4efbb555b28abb2847791b4 eclipse-bootstrap.tar.xz
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
eclipse_bootstrap=$1
|
eclipse_bootstrap=$1
|
||||||
preV='0.23.0'
|
preV='0.23.0'
|
||||||
v='0.23.0-SNAPSHOT'
|
v='0.23.0-SNAPSHOT'
|
||||||
osgiV='3.10.0.v20140328-1811'
|
osgiV='3.10.100.v20150602-1500'
|
||||||
fp2V='0.0.1-SNAPSHOT'
|
fp2V='0.0.1-SNAPSHOT'
|
||||||
bundles=()
|
bundles=()
|
||||||
bundles[0]='tycho-bundles/org.eclipse.tycho.embedder.shared'
|
bundles[0]='tycho-bundles/org.eclipse.tycho.embedder.shared'
|
||||||
|
@ -42,7 +42,7 @@ packagefiles="${classfiles}"
|
|||||||
[ -e plugin.properties ] && packagefiles="plugin.properties $packagefiles"
|
[ -e plugin.properties ] && packagefiles="plugin.properties $packagefiles"
|
||||||
[ -e plugin.xml ] && packagefiles="plugin.xml $packagefiles"
|
[ -e plugin.xml ] && packagefiles="plugin.xml $packagefiles"
|
||||||
[ -e OSGI-INF ] && packagefiles="OSGI-INF $packagefiles"
|
[ -e OSGI-INF ] && packagefiles="OSGI-INF $packagefiles"
|
||||||
jar -cfmv "target/${bName}-${version}.jar" 'META-INF/MANIFEST.MF' ${classfiles}
|
jar -cfmv "target/${bName}-${version}.jar" 'META-INF/MANIFEST.MF' ${packagefiles}
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# Install
|
# Install
|
||||||
|
22
tycho.spec
22
tycho.spec
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
Name: %{?scl_prefix}tycho
|
Name: %{?scl_prefix}tycho
|
||||||
Version: 0.23.0
|
Version: 0.23.0
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
|
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
|
||||||
|
|
||||||
# license file is missing but all files having some licensing information are ASL 2.0
|
# license file is missing but all files having some licensing information are ASL 2.0
|
||||||
@ -39,9 +39,9 @@ Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/or
|
|||||||
# version 2.4.3 (impossible to have empty mojo created as aggregate). This
|
# version 2.4.3 (impossible to have empty mojo created as aggregate). This
|
||||||
# should be fixed upstream properly
|
# should be fixed upstream properly
|
||||||
Source1: EmptyMojo.java
|
Source1: EmptyMojo.java
|
||||||
Source2: %{pkg_name}-scripts.sh
|
Source2: tycho-scripts.sh
|
||||||
Source3: %{pkg_name}-bootstrap.sh
|
Source3: tycho-bootstrap.sh
|
||||||
Source4: %{pkg_name}-debundle.sh
|
Source4: tycho-debundle.sh
|
||||||
# Fedora Eclipse bundles (needed when Eclipse not present) to build Tycho
|
# Fedora Eclipse bundles (needed when Eclipse not present) to build Tycho
|
||||||
%if %{eclipse_bootstrap}
|
%if %{eclipse_bootstrap}
|
||||||
Source5: eclipse-bootstrap.tar.xz
|
Source5: eclipse-bootstrap.tar.xz
|
||||||
@ -91,10 +91,13 @@ BuildRequires: %{name}
|
|||||||
%if %{eclipse_bootstrap}
|
%if %{eclipse_bootstrap}
|
||||||
# Dependencies for Eclipse bundles we use
|
# Dependencies for Eclipse bundles we use
|
||||||
BuildRequires: eclipse-filesystem
|
BuildRequires: eclipse-filesystem
|
||||||
BuildRequires: icu4j
|
BuildRequires: apache-commons-jxpath
|
||||||
BuildRequires: geronimo-annotation
|
BuildRequires: geronimo-annotation
|
||||||
|
BuildRequires: glassfish-jsp-api
|
||||||
|
BuildRequires: icu4j
|
||||||
BuildRequires: sac
|
BuildRequires: sac
|
||||||
BuildRequires: sat4j
|
BuildRequires: sat4j
|
||||||
|
BuildRequires: xz-java
|
||||||
%else
|
%else
|
||||||
BuildRequires: eclipse-platform
|
BuildRequires: eclipse-platform
|
||||||
%endif
|
%endif
|
||||||
@ -155,8 +158,6 @@ no duplication of metadata between POM and OSGi metadata.
|
|||||||
|
|
||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: Javadocs for %{pkg_name}
|
Summary: Javadocs for %{pkg_name}
|
||||||
Group: Documentation
|
|
||||||
Requires: jpackage-utils
|
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
This package contains the API documentation for %{pkg_name}.
|
This package contains the API documentation for %{pkg_name}.
|
||||||
@ -377,7 +378,7 @@ echo '<?xml version="1.0" encoding="UTF-8"?>
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.eclipse.osgi</groupId>
|
<groupId>org.eclipse.osgi</groupId>
|
||||||
<artifactId>org.eclipse.osgi</artifactId>
|
<artifactId>org.eclipse.osgi</artifactId>
|
||||||
<version>3.10.0.v20140328-1811</version>
|
<version>3.10.100.v20150602-1500</version>
|
||||||
</project>' > JPP.tycho-osgi.pom
|
</project>' > JPP.tycho-osgi.pom
|
||||||
|
|
||||||
install -pm 644 JPP.tycho-osgi.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.pom
|
install -pm 644 JPP.tycho-osgi.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.pom
|
||||||
@ -393,7 +394,7 @@ echo '<?xml version="1.0" encoding="UTF-8"?>
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.eclipse.osgi</groupId>
|
<groupId>org.eclipse.osgi</groupId>
|
||||||
<artifactId>org.eclipse.osgi.compatibility.state</artifactId>
|
<artifactId>org.eclipse.osgi.compatibility.state</artifactId>
|
||||||
<version>1.0.0.v20140328-1811</version>
|
<version>1.0.100.v20150602-1500</version>
|
||||||
</project>' > JPP.tycho-osgi.compatibility.state.pom
|
</project>' > JPP.tycho-osgi.compatibility.state.pom
|
||||||
|
|
||||||
install -pm 644 JPP.tycho-osgi.compatibility.state.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.compatibility.state.pom
|
install -pm 644 JPP.tycho-osgi.compatibility.state.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.compatibility.state.pom
|
||||||
@ -422,6 +423,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
|
|||||||
%{_javadocdir}/tycho
|
%{_javadocdir}/tycho
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 09 2015 Mat Booth <mat.booth@redhat.com> - 0.23.0-3
|
||||||
|
- Fix bootstrap build
|
||||||
|
|
||||||
* Tue Jun 9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.23.0-2
|
* Tue Jun 9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.23.0-2
|
||||||
- Port to Plexus Archiver 3.0.1
|
- Port to Plexus Archiver 3.0.1
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user