rpms/eclipse
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Reduce the memory available for Tycho build.

Browse Source 
- Reduce the build time.
- Use the upstream help generation patch.
This commit is contained in:
Krzysztof Daniel 2012-11-06 12:55:37 +01:00
parent ab4a085e7c
commit 44e31045cc
2 changed files with 1540 additions and 594 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2091
eclipse-build-help-contents.patch
View File

File diff suppressed because it is too large Load Diff

43
eclipse.spec
View File

@ -69,7 +69,7 @@ fi;
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
Release: 12%{?dist}
Release: 13%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@ -258,7 +258,7 @@ BuildRequires: glassfish-jsp-api >= 2.2.1-4
BuildRequires: cglib
BuildRequires: glassfish-jsp >= 2.2.6
%if %{bootstrap} != 1
BuildRequires: eclipse-pde
BuildRequires: eclipse-pde
%endif
%if 0%{?rhel} >= 6
ExclusiveArch: %{ix86} x86_64
@ -414,9 +414,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch25
%patch26
%patch27
%if %{bootstrap} != 1
%patch28
%endif
%patch28
%patch29
%patch30
%patch31
@ -537,7 +535,7 @@ mkdir -p rt.equinox.framework/bundles/org.eclipse.equinox.executable/bin/gtk/lin
%build
export MAVEN_OPTS=-Xmx2048m
export MAVEN_OPTS=-Xmx640m
mkdir -p .m2/p2/repo-sdk/plugins
mkdir -p .m2/p2/repo-sdk/features
@ -639,32 +637,14 @@ mvn-rpmbuild -f maven-cbi-plugin/pom.xml \
-Dmaven.local.mode=true -Dtycho.local.keepTarget -DskipTychoVersionCheck
# workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
# pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable
pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/
ant build_eclipse_cbi
popd
mvn-rpmbuild clean install \
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \
-Dmaven.local.mode=true -Dtycho.local.keepTarget
# popd
-Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1))
%if %{bootstrap} != 1
pushd eclipse.platform.common/bundles/org.eclipse.platform.doc.user
mvn-rpmbuild install -Dmaven.test.skip=true -Dmaven.local.mode=true -DskipTychoVersionCheck
popd
pushd eclipse.platform.common/bundles/org.eclipse.platform.doc.isv
mvn-rpmbuild install -Dmaven.test.skip=true -Dmaven.local.mode=true -DskipTychoVersionCheck
popd
pushd eclipse.platform.common/bundles/org.eclipse.jdt.doc.user
mvn-rpmbuild install -Dmaven.test.skip=true -Dmaven.local.mode=true -DskipTychoVersionCheck
popd
pushd eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv
mvn-rpmbuild install -Dmaven.test.skip=true -Dmaven.local.mode=true -DskipTychoVersionCheck
popd
pushd eclipse.platform.common/bundles/org.eclipse.pde.doc.user
mvn-rpmbuild install -Dmaven.test.skip=true -Dmaven.local.mode=true -DskipTychoVersionCheck
popd
%endif
mvn-rpmbuild clean install \
-Dmaven.test.skip=true -Dnative=linux.gtk.%{eclipse_arch} -DskipTychoVersionCheck \
-Dmaven.local.mode=true -Dtycho.local.keepTarget
pushd eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}
@ -1375,6 +1355,11 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
* Mon Nov 5 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-13
- Reduce the memory available for Tycho build.
- Reduce the build time.
- Use the upstream help generation patch.
* Wed Oct 31 2012 Krzysztof Daniel <kdaniel@redhat.com> 1:4.2.1-12
- Remove the reference to org.apache.jasper (replaced by glassfish)