[tycho/f17] Detect OSGi jars using presence of the Bundle-SymbolicName entry.
Roland Grunberg
rgrunber at fedoraproject.org
Fri Jul 27 16:29:25 UTC 2012
commit d9fe733c79bf766646b4f87d23b156739b397adb
Author: Roland Grunberg <rgrunber at redhat.com>
Date: Mon Jul 23 12:54:02 2012 -0400
Detect OSGi jars using presence of the Bundle-SymbolicName entry.
copy-platform-all | 2 +-
tycho-use-custom-resolver.patch | 3 ++-
tycho.spec | 7 +++++--
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/copy-platform-all b/copy-platform-all
index 0adfd14..8a44193 100755
--- a/copy-platform-all
+++ b/copy-platform-all
@@ -77,7 +77,7 @@ for f in $(ls -d $eclipse/features/*); do
done
for p in $(find /usr/share/java -name "*.jar"); do
- unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-ManifestVersion'
+ unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName'
if [ $? = 0 ]; then
plugin=$(basename $p)
[ ! -e plugins/$plugin ] && ln -s $p plugins/$plugin
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index db8b4b3..c1adedc 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -80,7 +80,7 @@ index 80810d6..24efc87 100644
import java.util.List;
import org.apache.maven.AbstractMavenLifecycleParticipant;
-@@ -51,6 +52,20 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
+@@ -51,6 +52,21 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
registerExecutionListener(session);
configureComponents(session);
@@ -89,6 +89,7 @@ index 80810d6..24efc87 100644
+ try {
+ String[] cmd = new String[] { "/usr/share/java/tycho/copy-platform-all",
+ System.getProperty("user.dir") + "/.m2/p2/repo" };
++ System.out.println("Building system local p2 repository...");
+ Process p = Runtime.getRuntime().exec(cmd);
+ p.waitFor();
+ } catch (IOException e) {
diff --git a/tycho.spec b/tycho.spec
index 576ca87..b9694aa 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,5 +1,5 @@
%global eclipsedir %{_libdir}/eclipse
-%global bootstrap 0
+%global bootstrap 1
%if %{bootstrap}
%global snap -SNAPSHOT
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.14.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -197,6 +197,9 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
%{_javadocdir}/%{name}
%changelog
+* Mon Jul 23 2012 Roland Grunberg <rgrunber at redhat.com> 0.14.1-6
+- Detect OSGi jars using presence of Bundle-SymbolicName entry (BZ #838513).
+
* Mon Jun 11 2012 Roland Grunberg <rgrunber at redhat.com> 0.14.1-5
- Non-bootstrap build.
More information about the scm-commits
mailing list