[tycho] Add support for more flexible OSGi bundle paths.

Roland Grunberg rgrunber at fedoraproject.org
Mon Dec 3 21:33:14 UTC 2012


commit f4258b7555786a8ad07877864164895cbbe5c771
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Mon Dec 3 12:38:48 2012 -0500

    Add support for more flexible OSGi bundle paths.
    
    Introduce environment variable ROOT_PREFIX which can define an arbitrary
    prefix for the location of OSGi bundles.

 copy-platform-all |    9 ++++++---
 tycho.spec        |    5 ++++-
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/copy-platform-all b/copy-platform-all
index 77afbde..4c556dc 100755
--- a/copy-platform-all
+++ b/copy-platform-all
@@ -1,11 +1,14 @@
 #! /bin/sh
 
+prefix=$ROOT_PREFIX
 sdk=$1'-sdk'
 launcher=$1'-launcher'
 repo=$1
-eclipse=$(rpm --eval '%{_eclipse_base}')
 
-datadir=/usr/share/eclipse
+eclipse=$prefix$(rpm --eval '%{_libdir}')/eclipse
+
+datadir=$prefix/usr/share/eclipse
+javadir=$prefix/usr/share/java
 tycho_bundles_external=/usr/share/java/tycho/tycho-bundles-external.zip
 
 mkdir -p $sdk/plugins $sdk/features
@@ -80,7 +83,7 @@ done
 
 # jars in %%{_javadir} may not be uniquely named
 id=1
-for p in $(find /usr/share/java -name "*.jar"); do
+for p in $(find $javadir -name "*.jar"); do
     unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName'
     if [ $? = 0 ]; then
         plugin=${id}-$(basename $p)
diff --git a/tycho.spec b/tycho.spec
index da21470..8a95dd2 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -8,7 +8,7 @@
 
 Name:           tycho
 Version:        0.16.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -255,6 +255,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Dec 3 2012 Roland Grunberg <rgrunber at redhat.com> 0.16.0-18
+- Add support for more flexible OSGi bundle paths.
+
 * Mon Nov 19 2012 Roland Grunberg <rgrunber at redhat.com> 0.16.0-17
 - Make additional changes to get Tycho building bootstrapped.
 


More information about the scm-commits mailing list