Non-bootstrap build
- Re-enable Java 8 bundles
This commit is contained in:
parent
cd534319f1
commit
4d77eeb33c
@ -1,16 +0,0 @@
|
||||
--- eclipse.jdt/org.eclipse.jdt-feature/feature.xml.old 2014-05-19 15:24:30.868884801 -0400
|
||||
+++ eclipse.jdt/org.eclipse.jdt-feature/feature.xml 2014-05-19 15:24:42.186567987 -0400
|
||||
@@ -85,13 +85,6 @@
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
- id="org.eclipse.jdt.annotation"
|
||||
- download-size="0"
|
||||
- install-size="0"
|
||||
- version="2.0.0.qualifier"
|
||||
- unpack="false"/>
|
||||
-
|
||||
- <plugin
|
||||
id="org.eclipse.jdt.core.manipulation"
|
||||
download-size="0"
|
||||
install-size="0"
|
17
eclipse.spec
17
eclipse.spec
@ -1,11 +1,11 @@
|
||||
%{?scl:%scl_package eclipse}
|
||||
%{!?scl:%global pkg_name %{name}}
|
||||
%{?scl:%global app_name "Eclipse Luna"}
|
||||
%{?scl:%global app_name Eclipse Luna}
|
||||
|
||||
# Set to 1 to build Eclipse without dependency to eclipse-pde
|
||||
# Some parts (help) will not be built, and second run will be required,
|
||||
# but this is a way to bootstrap Eclipse on secondary archs.
|
||||
%global bootstrap 1
|
||||
%global bootstrap 0
|
||||
|
||||
|
||||
Epoch: 1
|
||||
@ -39,7 +39,7 @@ Epoch: 1
|
||||
Summary: An open, extensible IDE
|
||||
Name: %{?scl_prefix}eclipse
|
||||
Version: %{eclipse_version}
|
||||
Release: 5.1%{?dist}
|
||||
Release: 5.2%{?dist}
|
||||
License: EPL
|
||||
Group: Development/Tools
|
||||
URL: http://www.eclipse.org/
|
||||
@ -111,7 +111,6 @@ Patch20: %{pkg_name}-no-target-platform.patch
|
||||
Patch21: %{pkg_name}-mockito.patch
|
||||
|
||||
Patch22: %{pkg_name}-policy-comparators.patch
|
||||
Patch23: %{pkg_name}-disable-jdt-annotation-java8.patch
|
||||
|
||||
BuildRequires: rsync
|
||||
BuildRequires: make, gcc
|
||||
@ -324,7 +323,6 @@ tar --strip-components=1 -xf %{SOURCE1}
|
||||
%patch20
|
||||
%patch21
|
||||
%patch22
|
||||
%patch23
|
||||
|
||||
#Disable as many things as possible to make the build faster. We care only for Eclipse.
|
||||
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||
@ -360,9 +358,6 @@ tar --strip-components=1 -xf %{SOURCE1}
|
||||
%pom_disable_module bundles/org.eclipse.releng.tools eclipse.platform.releng
|
||||
%pom_disable_module features/org.eclipse.releng.tools eclipse.platform.releng
|
||||
|
||||
# Disable java 8 bits for now
|
||||
%pom_disable_module org.eclipse.jdt.annotation eclipse.jdt.core
|
||||
|
||||
# We don't need support for Eclipse 2.x style plugins
|
||||
%pom_disable_module features/org.eclipse.osgi.compatibility.plugins.feature rt.equinox.framework
|
||||
%pom_disable_module bundles/org.eclipse.osgi.compatibility.plugins rt.equinox.framework
|
||||
@ -485,13 +480,11 @@ sed -i '/javax\.servlet/ s/3\.1/3\.2/' rt.equinox.bundles/bundles/org.eclipse.eq
|
||||
|
||||
sed -i -e 's@Dhelp.lucene.tokenizer=standard@XX:MaxPermSize=384M@g' eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
|
||||
|
||||
%if %{bootstrap}
|
||||
# Not sure why this is needed yet...
|
||||
mkdir -p .m2/org/eclipse/tycho/tycho-bundles-external/0.20.0
|
||||
mkdir -p .m2/org/eclipse/tycho/tycho-standalone-p2-director/0.20.0
|
||||
cp %{_javadir}/tycho/tycho-bundles-external.zip .m2/org/eclipse/tycho/tycho-bundles-external/0.20.0/tycho-bundles-external-0.20.0.zip
|
||||
cp %{_javadir}/tycho/tycho-standalone-p2-director.zip .m2/org/eclipse/tycho/tycho-standalone-p2-director/0.20.0/tycho-standalone-p2-director-0.20.0.zip
|
||||
%endif
|
||||
|
||||
%build
|
||||
%{?scl:scl enable %{scl} - << "EOF"}
|
||||
@ -1034,6 +1027,10 @@ fi
|
||||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
||||
|
||||
%changelog
|
||||
* Fri Jul 11 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-5.2
|
||||
- Non-bootstrap build
|
||||
- Re-enable Java 8 bundles
|
||||
|
||||
* Wed Jul 09 2014 Mat Booth <mat.booth@redhat.com> - 1:4.4.0-5.1
|
||||
- Bootstrap into SCL
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user