diff options
| author | Roland Grunberg <rgrunber@redhat.com> | 2013-09-09 10:58:55 -0400 |
|---|---|---|
| committer | Roland Grunberg <rgrunber@redhat.com> | 2013-09-09 11:03:57 -0400 |
| commit | 509744d875d8a227bdfc421596024f3e468e9539 (patch) | |
| tree | 417f1d8468354706ee424feba3136bb10f6b1b3a | |
| parent | cccf5aa46fe9186a05c0c9f0276f036a0d35addf (diff) | |
| download | testbundle-to-eclipse-test-509744d875d8a227bdfc421596024f3e468e9539.tar.gz testbundle-to-eclipse-test-509744d875d8a227bdfc421596024f3e468e9539.tar.xz testbundle-to-eclipse-test-509744d875d8a227bdfc421596024f3e468e9539.zip | |
Remove dependence on Tycho by using Eclipse's Equinox Launcher.
Instead of the equinox launcher from
/usr/share/java/tycho/tycho-bundles-external.zip use the one provided by
Eclipse in /usr/lib*/eclipse/plugins/org.eclipse.equinox.launcher_*.jar.
| -rwxr-xr-x | gatherBundles.sh | 2 | ||||
| -rwxr-xr-x | genRepo.sh | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/gatherBundles.sh b/gatherBundles.sh index a811c99..869b9ce 100755 --- a/gatherBundles.sh +++ b/gatherBundles.sh @@ -2,7 +2,6 @@ prefix=$ROOT_PREFIX sdk=$1'-sdk' -launcher=$1'-launcher' repo=$1 eclipse=$prefix$(rpm --eval '%{_libdir}')/eclipse @@ -10,7 +9,6 @@ eclipse=$prefix$(rpm --eval '%{_libdir}')/eclipse datadir=$prefix/usr/share/eclipse javadir=$prefix/usr/share/java jnidir=$prefix/usr/lib/java -tycho_bundles_external=/usr/share/java/tycho/tycho-bundles-external.zip mkdir -p $sdk/plugins $sdk/features pushd $sdk @@ -2,22 +2,12 @@ prefix=$ROOT_PREFIX sdk=$1'-sdk' -launcher=$1'-launcher' repo=$1 -tycho_bundles_external=/usr/share/java/tycho/tycho-bundles-external.zip - -# use the bundled equinox launcher to publish the p2 repo -mkdir -p $launcher -pushd $launcher -unzip $tycho_bundles_external - -java -jar eclipse/plugins/org.eclipse.equinox.launcher_*.jar -nosplash -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \ +java -jar /usr/lib*/eclipse/plugins/org.eclipse.equinox.launcher_*.jar -nosplash -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \ -metadataRepository file:$repo \ -artifactRepository file:$repo \ -source $sdk \ -compress -append -publishArtifacts -popd - -rm -rf $sdk $launcher +rm -rf $sdk |