Build support for GTK2 and GTK3 together.

This commit is contained in:
Krzysztof Daniel 2013-02-12 15:23:49 +01:00
parent 475caa030b
commit 75d982efa2

View File

@ -55,7 +55,7 @@ fi;
Summary: An open, extensible IDE Summary: An open, extensible IDE
Name: %{?scl_prefix}eclipse Name: %{?scl_prefix}eclipse
Version: %{eclipse_version} Version: %{eclipse_version}
Release: 0.11.git201301281400%{?dist} Release: 0.12.git201301281400%{?dist}
License: EPL License: EPL
Group: Development/Tools Group: Development/Tools
URL: http://www.eclipse.org/ URL: http://www.eclipse.org/
@ -487,7 +487,7 @@ done
%build %build
#This is the lowest value where the build succeeds. 512m is not enough. #This is the lowest value where the build succeeds. 512m is not enough.
export MAVEN_OPTS="-Xmx700m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState" export MAVEN_OPTS="-Xmx700m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState"
export GTK_VERSION=3.0
mvn-rpmbuild -f eclipse-parent/pom.xml \ mvn-rpmbuild -f eclipse-parent/pom.xml \
clean install \ clean install \
-Dmaven.local.mode=true -Dtycho.local.keepTarget -DskipTychoVersionCheck -Dmaven.local.mode=true -Dtycho.local.keepTarget -DskipTychoVersionCheck
@ -500,8 +500,15 @@ mvn-rpmbuild -f maven-cbi-plugin/pom.xml \
pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/ pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/gtk/
export JAVA_HOME=%{java_home} export JAVA_HOME=%{java_home}
ant ant
popd popd
pushd eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.%{eclipse_arch}
mvn-rpmbuild clean install \
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \
-Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1)) -Pno-bree-libs
popd
export GTK_VERSION=3.0
mvn-rpmbuild clean install \ mvn-rpmbuild clean install \
-Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \ -Dmaven.test.skip=true -Dnative=gtk.linux.%{eclipse_arch} -DskipTychoVersionCheck \
-Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1)) -Pno-bree-libs -Dmaven.local.mode=true -Dtycho.local.keepTarget -Dbuilddoc=$((%{bootstrap} != 1)) -Pno-bree-libs
@ -1010,6 +1017,9 @@ echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_* %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog %changelog
* Tue Feb 12 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.12.git201301281400
- Build support for GTK2 and GTK3 together.
* Tue Feb 12 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.11.git201301281400 * Tue Feb 12 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.0-0.11.git201301281400
- Ability to use sclized icu4j. - Ability to use sclized icu4j.