diff --git a/copy-platform-all b/copy-platform-all index be875c7..77afbde 100755 --- a/copy-platform-all +++ b/copy-platform-all @@ -1,13 +1,15 @@ #! /bin/sh -where=$1'-sdk' -repo=$1; shift -eclipse=$(rpm --eval '%{_eclipse_base}'); shift +sdk=$1'-sdk' +launcher=$1'-launcher' +repo=$1 +eclipse=$(rpm --eval '%{_eclipse_base}') datadir=/usr/share/eclipse +tycho_bundles_external=/usr/share/java/tycho/tycho-bundles-external.zip -mkdir -p $where/plugins $where/features -pushd $where +mkdir -p $sdk/plugins $sdk/features +pushd $sdk (cd $eclipse; ls -d plugins/* features/* 2>/dev/null) | @@ -89,10 +91,17 @@ done popd -eclipse -nosplash -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \ +# 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 \ -metadataRepository file:$repo \ -artifactRepository file:$repo \ --source $where \ +-source $sdk \ -compress -append -publishArtifacts -rm -rf $where +popd + +rm -rf $sdk $launcher diff --git a/tycho.spec b/tycho.spec index fe3ff3b..80f6788 100644 --- a/tycho.spec +++ b/tycho.spec @@ -1,4 +1,4 @@ -%global bootstrap 0 +%global bootstrap 1 %global sha d7f8850f746dd72e0a97c1fdf32c06ce794fb83d %if %{bootstrap} @@ -11,7 +11,7 @@ Name: tycho Version: 0.16.0 -Release: 11.d7f885%{?dist} +Release: 11.1.d7f885%{?dist} Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven Group: Development/Libraries @@ -195,6 +195,9 @@ install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all %{_javadocdir}/%{name} %changelog +* Thu Oct 11 2012 Roland Grunberg 0.16.0-11.1.d7f885 +- Remove dependence on eclipse by use of self-bundled equinox launcher. + * Wed Oct 10 2012 Roland Grunberg 0.16.0-11.d7f885 - copy-platform-all should make symlinked jars from %%{_javadir} unique. - Non-bootstrap build (reset the %%bootstrap flag properly).