From b314cc9b5e4a03d00bf0cd1e7e9ec14e44d47f62 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 23 2015 07:36:41 +0000 Subject: import devtoolset-3-tycho-extras-0.22.0-3.el7 --- diff --git a/.devtoolset-3-tycho-extras.metadata b/.devtoolset-3-tycho-extras.metadata new file mode 100644 index 0000000..16989ad --- /dev/null +++ b/.devtoolset-3-tycho-extras.metadata @@ -0,0 +1 @@ +a302a694eba1e862732d2db7d288a5187abd568a SOURCES/org.eclipse.tycho.extras-tycho-extras-0.22.0.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4b99df0 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/org.eclipse.tycho.extras-tycho-extras-0.22.0.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/tycho-extras-fix-build.patch b/SOURCES/tycho-extras-fix-build.patch new file mode 100644 index 0000000..beb06c5 --- /dev/null +++ b/SOURCES/tycho-extras-fix-build.patch @@ -0,0 +1,31 @@ +diff --git a/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java b/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java +index 05baf87..2c62fb0 100644 +--- a/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java ++++ b/tycho-source-feature-plugin/src/main/java/org/eclipse/tycho/extras/sourcefeature/SourceFeatureMojo.java +@@ -515,15 +515,19 @@ public class SourceFeatureMojo extends AbstractMojo { + } + + private String getAttribute(PlexusConfiguration dom, String attrName) { +- String attr = dom.getAttribute(attrName); +- if (attr == null) { +- return null; +- } +- attr = attr.trim(); +- if (attr.length() == 0) { ++ try { ++ String attr = dom.getAttribute(attrName); ++ if (attr == null) { ++ return null; ++ } ++ attr = attr.trim(); ++ if (attr.length() == 0) { ++ return null; ++ } ++ return attr; ++ } catch (Exception e) { + return null; + } +- return attr; + } + + } diff --git a/SOURCES/tycho-extras-use-custom-resolver.patch b/SOURCES/tycho-extras-use-custom-resolver.patch new file mode 100644 index 0000000..6931a6e --- /dev/null +++ b/SOURCES/tycho-extras-use-custom-resolver.patch @@ -0,0 +1,68 @@ +From 1136a52447b28da1dfa29c46b8ba025435a798be Mon Sep 17 00:00:00 2001 +From: Roland Grunberg +Date: Mon, 6 May 2013 14:20:58 -0400 +Subject: [PATCH] Use custom resolver for tycho-eclipserun-plugin. + +Add various system local OSGi bundle locations to the target platform +used by tycho-eclipserun-plugin. + +Change-Id: Ifd0aae3f32c8077cd0ae33e70f40698c1129788d +--- + tycho-eclipserun-plugin/pom.xml | 5 +++++ + .../org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java | 10 ++++++++++ + 2 files changed, 15 insertions(+) + +diff --git a/tycho-eclipserun-plugin/pom.xml b/tycho-eclipserun-plugin/pom.xml +index 708b35c..c4e9b17 100644 +--- a/tycho-eclipserun-plugin/pom.xml ++++ b/tycho-eclipserun-plugin/pom.xml +@@ -38,6 +38,11 @@ + org.eclipse.tycho.extras + tycho-p2-extras-plugin + ++ ++ org.fedoraproject.p2 ++ org.fedoraproject.p2 ++ 0.0.1-SNAPSHOT ++ + + + +diff --git a/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java b/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java +index 4c4baf0..18db847 100644 +--- a/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java ++++ b/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java +@@ -13,6 +13,7 @@ package org.eclipse.tycho.extras.eclipserun; + + import java.io.File; + import java.net.MalformedURLException; ++import java.net.URI; + import java.util.ArrayList; + import java.util.List; + import java.util.Map; +@@ -51,6 +52,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2Resolver; + import org.eclipse.tycho.p2.resolver.facade.P2ResolverFactory; + import org.eclipse.tycho.p2.target.facade.TargetPlatformConfigurationStub; + import org.eclipse.tycho.plugins.p2.extras.Repository; ++import org.fedoraproject.p2.EclipseSystemLayout; + + /** + * Launch an eclipse process with arbitrary commandline arguments. The eclipse installation is +@@ -187,6 +189,14 @@ public class EclipseRunMojo extends AbstractMojo { + TargetPlatformConfigurationStub tpConfiguration = new TargetPlatformConfigurationStub(); + // we want to resolve from remote repos only + tpConfiguration.setForceIgnoreLocalArtifacts(true); ++ ++ // Add Fedora Local P2 Repository when running in local mode ++ if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) { ++ for (URI uri : EclipseSystemLayout.getRepositories()) { ++ tpConfiguration.addP2Repository(new MavenRepositoryLocation(uri.getPath(), uri)); ++ } ++ } ++ + for (Repository repository : repositories) { + tpConfiguration.addP2Repository(new MavenRepositoryLocation(repository.getId(), repository.getLocation())); + } +-- +1.9.3 + diff --git a/SPECS/tycho-extras.spec b/SPECS/tycho-extras.spec new file mode 100644 index 0000000..f6297f1 --- /dev/null +++ b/SPECS/tycho-extras.spec @@ -0,0 +1,155 @@ +%global pkg_name tycho-extras +%{?scl:%scl_package %{pkg_name}} +# When building version under development (non-release) +# %%global snap -SNAPSHOT +%global snap %{nil} + +Name: %{?scl_prefix}tycho-extras +Version: 0.22.0 +Release: 3%{?dist} +Summary: Additional plugins for Tycho + +License: EPL +URL: http://eclipse.org/tycho/ +Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/org.eclipse.tycho.extras-tycho-extras-0.22.0.tar.bz2 +Patch0: %{pkg_name}-fix-build.patch +Patch1: %{pkg_name}-use-custom-resolver.patch + +BuildArch: noarch + +BuildRequires: %{?scl_prefix}jgit +BuildRequires: %{?scl_prefix_java_common}maven-local +BuildRequires: %{?scl_prefix}tycho >= 0.22.0-3 + +Requires: %{?scl_prefix}jgit +Requires: %{?scl_prefix}tycho >= 0.22.0-3 + +%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 %{pkg_name} +Group: Documentation + +%description javadoc +This package contains the API documentation for %{pkg_name}. + +%prep +%setup -q -n org.eclipse.tycho.extras-tycho-extras-0.22.0 +%patch0 -p1 +%patch1 -p1 + +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +# maven-properties-plugin is only needed for tests +%pom_remove_plugin org.eclipse.m2e:lifecycle-mapping +%pom_remove_plugin org.sonatype.plugins:maven-properties-plugin tycho-p2-extras-plugin +# remove org.apache.maven:apache-maven zip +%pom_remove_dep org.apache.maven:apache-maven tycho-p2-extras-plugin + +%mvn_alias :{*} org.eclipse.tycho:@1 +%{?scl:EOF} + +%build +# To run tests, we need : +# maven-properties-plugin (unclear licensing) +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_build -f +%{?scl:EOF} + +%install +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%mvn_install +%{?scl:EOF} + +%files -f .mfiles +%dir %{_javadir}/%{pkg_name} +%dir %{_mavenpomdir}/%{pkg_name} + +%files javadoc -f .mfiles-javadoc + +%changelog +* Fri Jan 09 2015 Roland Grunberg - 0.22.0-3 +- Add explicit Requires and disable auto-prov/req generation. + +* Tue Jan 06 2015 Roland Grunberg - 0.22.0-2.1 +- SCL-ize. +- Related: rhbz#1175105 + +* Fri Dec 5 2014 Mikolaj Izdebski - 0.22.0-2 +- Port to latest fedoraproject-p2 + +* Mon Dec 01 2014 Mat Booth - 0.22.0-1 +- Update to tagged release +- Fix directory ownership problem + +* Tue Nov 25 2014 Roland Grunberg - 0.22.0-0.1.gitef068a +- Update to 0.22.0 pre-release. + +* Wed Sep 03 2014 Roland Grunberg - 0.21.0-3 +- Use fedoraproject-p2 to do OSGi bundle discovery. + +* Thu Aug 21 2014 Roland Grunberg - 0.21.0-2 +- Integrate fedoraproject-p2 functionality. + +* Fri Jul 25 2014 Roland Grunberg - 0.21.0-1 +- Update to 0.21.0 Release. + +* Sun Jun 08 2014 Fedora Release Engineering - 0.20.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 25 2014 Roland Grunberg - 0.20.0-1 +- Update to 0.20.0 Release. + +* Tue Mar 11 2014 Michael Simacek - 0.19.0-3 +- Use mvn_build and mvn_install. +- Drop manual requires. + +* Thu Feb 27 2014 Roland Grunberg - 0.19.0-2 +- Change R:java to R:java-headless (Bug 1068575). + +* Fri Oct 25 2013 Roland Grunberg - 0.19.0-1 +- Update to 0.19.0 Release. + +* Mon Jul 29 2013 Roland Grunberg 0.18.1-1 +- Update to 0.18.1 Release. + +* Thu May 30 2013 Roland Grunberg 0.18.0-1 +- Update to 0.18.0 Release. + +* Tue May 7 2013 Roland Grunberg 0.17.0-2 +- tycho-eclipserun-plugin should use the system local p2 repo. + +* Tue Apr 2 2013 Roland Grunberg 0.17.0-1 +- Update to 0.17.0 Release. + +* Mon Feb 25 2013 Roland Grunberg 0.17.0-0.1.git0a9370 +- Update to latest 0.17.0-SNAPSHOT. + +* Thu Feb 21 2013 Roland Grunberg - 0.16.0-5 +- Fix PlexusConfiguration class issues identically across branches. + +* Wed Feb 20 2013 Roland Grunberg - 0.16.0-4 +- Fix build issues relating to PlexusConfiguration. + +* Fri Feb 15 2013 Fedora Release Engineering - 0.16.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Dec 13 2012 Roland Grunberg 0.16.0-3 +- Fix upstream Bug 393686. + +* Fri Oct 19 2012 Roland Grunberg 0.16.0-2 +- Update to 0.16.0 Release. + +* Mon Jul 30 2012 Roland Grunberg 0.16.0-1.e58861 +- Update to 0.16.0 SNAPSHOT. + +* Fri Jul 27 2012 Roland Grunberg 0.15.0-1 +- Update to 0.15.0. + +* Sun Jul 22 2012 Fedora Release Engineering - 0.14.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Apr 16 2012 Roland Grunberg - 0.14.0-1 +- Initial packaging of tycho extras.