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

Fix pattern matching for x86/x86_64 arches

Browse Source
This commit is contained in:
Mat Booth 2015-06-02 15:23:54 +01:00
parent 7cf0be83ee
commit 0711cd3fe1
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eclipse.spec
View File

@ -37,7 +37,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
Release: 0.23.git201506012000%{?dist}
Release: 0.24.git201506012000%{?dist}
License: EPL
URL: http://www.eclipse.org/
@ -383,18 +383,20 @@ for dir in eclipse.platform.swt.binaries/bundles \
done
# Remove platform-specific stuff that we don't care about to reduce build time
# (i.e., all bundles that are only applicable on non-linux platforms)
# (i.e., all bundles that are not applicable to the current build platform --
# this reduces the build time on arm by around 20 minutes per architecture that
# we are not currently building)
TYCHO_ENV="<environment><os>linux</os><ws>gtk</ws><arch>%{eclipse_arch}</arch></environment>"
%pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse-platform-parent
%pom_xpath_set "pom:configuration/pom:environments" "$TYCHO_ENV" eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests
for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt\.(?!gtk\.linux.%{eclipse_arch})'` ; do
for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt\.(?!gtk\.linux.%{eclipse_arch}$)'` ; do
module=$(grep ">bundles/$b<" eclipse.platform.swt.binaries/pom.xml || :)
if [ -n "$module" ] ; then
%pom_disable_module bundles/$b eclipse.platform.swt.binaries
%pom_xpath_inject "pom:excludes" "<plugin id='$b'/>" eclipse.platform.ui/features/org.eclipse.e4.rcp
fi
done
for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux.%{eclipse_arch})'` ; do
for b in `ls rt.equinox.framework/bundles | grep -P -e 'org.eclipse.equinox.launcher\.(?!gtk\.linux.%{eclipse_arch}$)'` ; do
module=$(grep ">bundles/$b<" rt.equinox.framework/pom.xml || :)
if [ -n "$module" ] ; then
%pom_disable_module bundles/$b rt.equinox.framework
@ -460,13 +462,6 @@ sed -i -e '169i<feature id="org.eclipse.core.runtime.feature"/>' \
%pom_remove_plugin :maven-resources-plugin eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests
sed -i 's|\${project.build.directory}/resources|\${project.basedir}/src/main/resources|' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
# Remove the SWT build sections from every linux arch that is not currently being built
# (this is not really necessary but further reduces the build time on arm by around 20
# minutes per architecture that we are not currently building, over 2.5 hours in total)
for b in `ls eclipse.platform.swt.binaries/bundles | grep -P -e 'org.eclipse.swt.gtk.linux.(?!%{eclipse_arch})'` ; do
%pom_xpath_remove "/pom:project/pom:build" eclipse.platform.swt.binaries/bundles/$b
done
# Don't set perms on files for platforms that aren't linux
for f in \
rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties; do
@ -1049,6 +1044,9 @@ fi
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
%changelog
* Tue Jun 02 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.24.git201506012000
- Fix pattern matching for x86/x86_64 arches
* Tue Jun 02 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.23.git201506012000
- Update to latest I-build
- Don't build contributor tools with external deps during bootstrap builds