Update to latest I-build
- Require jetty 9.2.9 - Fix arm-build
This commit is contained in:
Mat Booth
parent
c7e197f5f2
commit
8b5c72eeca
|
|
@ -73,21 +73,6 @@
|
|||
</environments>
|
||||
</configuration>
|
||||
</plugin>
|
||||
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
|
||||
index 80a32e4..85de879 100644
|
||||
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
|
||||
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
|
||||
@@ -58,6 +58,10 @@
|
||||
root.linux.gtk.s390=rootfiles/linux.gtk.s390,../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/gtk/linux/s390
|
||||
root.linux.gtk.s390.permissions.755=eclipse
|
||||
|
||||
+root.linux.gtk.arm=rootfiles/linux.gtk.arm,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/arm
|
||||
+root.linux.gtk.arm.permissions.755=eclipse
|
||||
+root.linux.gtk.aarch64=rootfiles/linux.gtk.aarch64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/aarch64
|
||||
+root.linux.gtk.aarch64.permissions.755=eclipse
|
||||
|
||||
bin.includes = feature.properties
|
||||
|
||||
diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binaries/pom.xml
|
||||
index 7dd0536..66d79ee 100644
|
||||
--- a/eclipse.platform.swt.binaries/pom.xml
|
||||
|
|
@ -387,12 +372,14 @@ index 29d3871..45526c8 100644
|
|||
<profile>
|
||||
<id>build-native-launchers-win32.win32.x86_64</id>
|
||||
<activation>
|
||||
@@ -347,8 +530,6 @@
|
||||
@@ -347,8 +530,8 @@
|
||||
<include name="gtk/solaris/x86/**/*"/>
|
||||
<include name="win32/win32/x86/**/*"/>
|
||||
<include name="win32/win32/x86_64/**/*"/>
|
||||
- </fileset>
|
||||
- <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
|
||||
+ <include name="gtk/linux/arm/**/*"/>
|
||||
+ <include name="gtk/linux/aarch64/**/*"/>
|
||||
<include name="gtk/linux/s390/**/*"/>
|
||||
<include name="gtk/linux/s390x/**/*"/>
|
||||
</fileset>
|
||||
|
|
|
|||
17
eclipse.spec
17
eclipse.spec
|
|
@ -13,9 +13,9 @@ Epoch: 1
|
|||
%global eclipse_minor 5
|
||||
%global eclipse_micro 0
|
||||
%global eb_commit 2775b93d3d9f147f5711c91bb3aa623f2582019d
|
||||
%global eclipse_tag I20150217-0800
|
||||
%global eclipse_tag I20150224-0800
|
||||
%global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
|
||||
%global _jetty_version 9.2.7
|
||||
%global _jetty_version 9.2.9
|
||||
|
||||
%ifarch %{ix86}
|
||||
%define eclipse_arch x86
|
||||
|
|
@ -38,7 +38,7 @@ Epoch: 1
|
|||
Summary: An open, extensible IDE
|
||||
Name: %{?scl_prefix}eclipse
|
||||
Version: %{eclipse_version}
|
||||
Release: 0.2.git201502170800%{?dist}
|
||||
Release: 0.3.git201502240800%{?dist}
|
||||
License: EPL
|
||||
URL: http://www.eclipse.org/
|
||||
|
||||
|
|
@ -331,6 +331,7 @@ tar --strip-components=1 -xf %{SOURCE1}
|
|||
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||
%pom_disable_module rcp eclipse.platform.releng.tychoeclipsebuilder
|
||||
%pom_disable_module rcp.sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||
%pom_disable_module rcp.config eclipse.platform.releng.tychoeclipsebuilder
|
||||
%pom_disable_module sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||
%pom_disable_module equinox-sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||
%pom_disable_module equinox.starterkit.product eclipse.platform.releng.tychoeclipsebuilder
|
||||
|
|
@ -409,7 +410,7 @@ done
|
|||
|
||||
# Include some extra features with the product that some other projects may need at
|
||||
# build time as part of their target platform definitions
|
||||
sed -i -e '170i<feature id="org.eclipse.core.runtime.feature"/>' \
|
||||
sed -i -e '169i<feature id="org.eclipse.core.runtime.feature"/>' \
|
||||
eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
|
||||
|
||||
# Don't mirror stuff to the repo that we haven't built
|
||||
|
|
@ -442,8 +443,7 @@ 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 \
|
||||
eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties ; do
|
||||
rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties; do
|
||||
grep '^root\.linux\.gtk\.%{eclipse_arch}[.=]' $f > tmp
|
||||
sed -i -e '/^root\./d' $f && cat tmp >> $f
|
||||
done
|
||||
|
|
@ -1017,6 +1017,11 @@ fi
|
|||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
||||
|
||||
%changelog
|
||||
* Wed Feb 25 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.3.git201502240800
|
||||
- Update to latest I-build
|
||||
- Require jetty 9.2.9
|
||||
- Fix arm-build
|
||||
|
||||
* Wed Feb 18 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-0.2.git201502170800
|
||||
- Update to latest I-build
|
||||
- Unbundle third party libs from tests subpackage rhbz#1150185
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
|
||||
TAG=I20150217-0800
|
||||
TAG=I20150224-0800
|
||||
|
||||
rm -rf R4_platform-aggregator-$TAG
|
||||
rm -rf R4_platform-aggregator-$TAG.tar.xz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
d278fe90472b34231fba180c8bdaf7e6 R4_platform-aggregator-I20150217-0800.tar.xz
|
||||
5cf9e91b3ce32272e2c4df2a2f853020 R4_platform-aggregator-I20150224-0800.tar.xz
|
||||
1497147a427b98a00a87263880063294 org.eclipse.linuxtools.eclipse-build-2775b93d3d9f147f5711c91bb3aa623f2582019d.tar.bz2
|
||||
|
|
|
|||
Loading…
Reference in New Issue