[java-sig-commits] [tycho] Stop symlinking o.e.osgi and o.e.jdt.core into the m2 cache.
Roland Grunberg
rgrunber at fedoraproject.org
Fri Mar 9 21:59:09 UTC 2012
commit 8d36c52a2f135f29c897a8770383ab8862e668d5
Author: Roland Grunberg <rgrunber at redhat.com>
Date: Thu Feb 23 16:31:51 2012 -0500
Stop symlinking o.e.osgi and o.e.jdt.core into the m2 cache.
tycho.spec | 46 +++++-----------------------------------------
1 files changed, 5 insertions(+), 41 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index bc14d1a..71d2b05 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,12 +1,4 @@
-%global bootstrap 0
-
-%global e_osgi org.eclipse.osgi
-%global e_osgi_v 3.6.2.R36x_v20110210
-%global e_osgi_v2 3.8.0.v20120123-1419
-%global e_osgi_v3 3.8.0.v20110726-1606
-%global e_core org.eclipse.jdt.core
-%global e_core_v 3.6.2.v_A76_R36x
-%global e_core_v2 3.8.1.v20120125-1544
+%global bootstrap 1
%global eclipsedir %{_libdir}/eclipse
@@ -18,7 +10,7 @@
Name: tycho
Version: 0.14.0
-Release: 4%{?dist}
+Release: 4.1%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -131,7 +123,6 @@ pushd tycho-maven-plugin/src/main/java/org/fedoraproject
cp %{SOURCE1} .
popd
-
%if %{bootstrap}
tar xf %{SOURCE3}
%else
@@ -139,36 +130,6 @@ mkdir -p .m2/org/eclipse/%{name}/%{name}-bundles-external/%{version}
unzip -d .m2/org/eclipse/%{name}/%{name}-bundles-external/%{version} %{_javadir}/%{name}/%{name}-bundles-external.zip
%endif
-# prepare directories for eclipse symlinks
-mkdir -p .m2/org/sonatype/tycho
-mkdir -p .m2/org/sonatype/tycho/%{e_osgi}/%{e_osgi_v}/
-mkdir -p .m2/org/sonatype/tycho/%{e_core}/%{e_core_v}/
-mkdir -p .m2/org/eclipse/tycho
-mkdir -p .m2/org/eclipse/tycho/%{e_osgi}/%{e_osgi_v2}/
-mkdir -p .m2/org/eclipse/tycho/%{e_osgi}/%{e_osgi_v3}/
-mkdir -p .m2/org/eclipse/tycho/%{e_core}/%{e_core_v2}/
-
-# maven resolver doesn't know how to resolve from directories other than _javadir
-pushd .m2/org/sonatype/tycho
-ln -sf %{eclipsedir}/plugins/org.eclipse.osgi_*.jar \
- %{e_osgi}/%{e_osgi_v}/%{e_osgi}-%{e_osgi_v}.jar
-ln -sf %{eclipsedir}/plugins/org.eclipse.jdt.core_*.jar \
- %{e_core}/%{e_core_v}/%{e_core}-%{e_core_v}.jar || \
-ln -sf %{eclipsedir}/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar \
- %{e_core}/%{e_core_v}/%{e_core}-%{e_core_v}.jar
-popd
-
-pushd .m2/org/eclipse/tycho
-ln -sf %{eclipsedir}/plugins/org.eclipse.osgi_*.jar \
- %{e_osgi}/%{e_osgi_v2}/%{e_osgi}-%{e_osgi_v2}.jar
-ln -sf %{eclipsedir}/plugins/org.eclipse.osgi_*.jar \
- %{e_osgi}/%{e_osgi_v3}/%{e_osgi}-%{e_osgi_v3}.jar
-ln -sf %{eclipsedir}/plugins/org.eclipse.jdt.core_*.jar \
- %{e_core}/%{e_core_v2}/%{e_core}-%{e_core_v2}.jar || \
-ln -sf %{eclipsedir}/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar \
- %{e_core}/%{e_core_v2}/%{e_core}-%{e_core_v2}.jar
-popd
-
%build
export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m"
export TYCHO_TARGET_PLATFORM=%{eclipsedir}
@@ -239,6 +200,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%{_javadocdir}/%{name}
%changelog
+* Thu Feb 23 2012 Roland Grunberg <rgrunber at redhat.com> 0.14.0-4.1
+- Stop symlinking o.e.osgi and o.e.jdt.core into the m2 cache.
+
* Thu Feb 16 2012 Roland Grunberg <rgrunber at redhat.com> 0.14.0-4
- Non-bootstrap build.
More information about the java-sig-commits
mailing list