From 55d6f2b7526dccf35090c8be8455b4fa19f46d41 Mon Sep 17 00:00:00 2001 From: Krzysztof Daniel Date: Aug 17 2012 13:09:37 +0000 Subject: Local build started working again. Remote nearly. --- diff --git a/eclipse-fix-master-equinox.patch b/eclipse-fix-master-equinox.patch index 61c01b4..2e7feab 100644 --- a/eclipse-fix-master-equinox.patch +++ b/eclipse-fix-master-equinox.patch @@ -205,7 +205,7 @@ - id="org.apache.jasper.glassfish" + + - - --- rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml.bak 2012-07-25 17:45:43.000000000 +0200 +++ rt.equinox.p2/features/org.eclipse.equinox.p2.core.feature/pom.xml 2012-07-31 07:41:13.103636303 +0200 -@@ -42,6 +42,7 @@ +@@ -42,6 +42,17 @@ -+ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ @@ -487,11 +497,12 @@ --- eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml.bak 2012-08-10 09:56:55.000000000 +0200 +++ eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml 2012-08-10 10:09:14.758180621 +0200 -@@ -59,6 +59,7 @@ +@@ -59,6 +59,8 @@ + ++ diff --git a/eclipse.spec b/eclipse.spec index 41d3692..694cc95 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -20,7 +20,7 @@ Epoch: 1 Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 10%{?dist} +Release: 9%{?dist} License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -44,7 +44,7 @@ Source30: extract_patterns.txt Source31: eclipse-copy-platform.sh Source32: eclipse-pdebuild.sh -#Patch0: lucene-3.6-compile.patch + # -com.sun.el @@ -96,6 +96,7 @@ Patch19: %{name}-p2-pick-up-renamed-jars.patch Patch20: %{name}-ignore-version-when-calculating-home.patch Patch21: %{name}-populate-update-sites-from-master.patch Patch22: %{name}-remove-jgit-provider.patch +Patch23: lucene-3.6-compile.patch BuildRequires: ant >= 1.8.3 BuildRequires: rsync @@ -126,7 +127,7 @@ BuildRequires: jsch >= 0:0.1.46-2 BuildRequires: apache-commons-el >= 1.0-22 BuildRequires: apache-commons-logging BuildRequires: apache-commons-codec >= 1.6-2 -BuildRequires: apache-sshd +BuildRequires: apache-sshd >= 0.7.0 BuildRequires: jakarta-commons-httpclient >= 1:3.1-7 BuildRequires: felix-gogo-command >= 0.12 BuildRequires: felix-gogo-shell >= 0.10.0-3 @@ -146,6 +147,9 @@ BuildRequires: tycho >= 0.16 BuildRequires: tycho-extras >= 0.16 BuildRequires: eclipse-emf-core >= 1:2.8.0-13 BuildRequires: eclipse-ecf-core +BuildRequires: tomcat-servlet-3.0-api +BuildRequires: tomcat6-servlet-2.5-api +BuildRequires: cglib %if 0%{?rhel} >= 6 ExclusiveArch: %{ix86} x86_64 @@ -205,8 +209,10 @@ Requires: atinject >= 1-6 Requires: geronimo-annotation >= 1.0-7 Requires: eclipse-ecf-core Requires: eclipse-emf-core +Requires: tomcat-servlet-3.0-api Provides: eclipse-cvs-client = 1:%{eclipse_version}-%{release} Obsoletes: eclipse-cvs-client < 1:3.3.2-20 +Obsoletes: eclipse-rcp < 1:%{eclipse_version}-%{release} Provides: eclipse-rcp = 1:%{eclipse_version}-%{release} Provides: osgi(system.bundle) = %{epoch}:%{eclipse_version} @@ -251,6 +257,10 @@ Eclipse Plugin Development Environment. This package is required for developing Eclipse plugins. %prep + +ARCH=%{_arch} +ARCH=${ARCH/i386/x86} + %setup %{SOURCE0} -n R4_platform-aggregator pushd TMP @@ -280,6 +290,7 @@ popd %patch20 %patch21 %patch22 +%patch23 #https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040 %pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles . @@ -304,13 +315,13 @@ sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javado -e "s|-breakiterator|;../org.eclipse.equinox.util/@dot\n;../org.eclipse.ecf.filetransfer_3.0.0.v20090302-0803.jar\n;../org.eclipse.ecf_3.0.0.v20090302-0803.jar\n-breakiterator|" \ eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/platformOptions.txt sed -i -e "s|http://download.oracle.com/javase/1.5.0/docs/api|%{_datadir}/javadoc/java|" \ - -e "s/win32.win32.x86/gtk.linux.%{eclipse_arch}/" \ + -e "s/win32.win32.x86/gtk.linux.${ARCH}/" \ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt sed -i -e "s|http://download.oracle.com/javase/6/docs/api|%{_datadir}/javadoc/java|" \ -e "/osgi\.org/d" \ eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/jdtOptions.txt sed -i -e "s|http://download.oracle.com/javase/1.4.2/docs/api|%{_datadir}/javadoc/java|" \ - -e "s/motif.linux.x86/gtk.linux.%{eclipse_arch}/" \ + -e "s/motif.linux.x86/gtk.linux.${ARCH}/" \ -e "/osgi\.org/d" \ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt \ eclipse.platform.common/bundles/org.eclipse.pde.doc.user/pdeOptions.txt @@ -364,30 +375,49 @@ sed -i -e "s/rt.equinox.p2<\/module>/rt.equinox.p2<\/module> %{_builddir}/%{buildsubdir}/%{name}-platform.install; +for id in `ls configuration/org.eclipse.osgi/bundles`; do + if [ "Xconfiguration" = $(echo X`find configuration/org.eclipse.osgi/bundles/$id -name libswt\*.so` | sed "s:/.*::") ]; then + echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" > %{_builddir}/%{buildsubdir}/%{name}-swt.install; + else + echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" >> %{_builddir}/%{buildsubdir}/%{name}-platform.install; + fi +done popd #make a backup @@ -466,6 +506,8 @@ popd %install +ARCH=%{_arch} +ARCH=${ARCH/i386/x86} # We don't need icon.xpm # https://bugs.eclipse.org/292472 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/icon.xpm @@ -490,6 +532,18 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} ################################# ### Extraced from old build.xml # ################################# +LOCAL_PWD=`pwd` +#change the installation p2 files +pushd TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/x86_64/eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/SDKProfile.profile/ +for i in `ls | grep "profile.gz"` ; do \ + echo $i ; \ + gunzip $i ; \ + sed -i -e "s@${LOCAL_PWD}/TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/x86_64/eclipse@%{_libdir}/eclipse@g" *.profile ; \ + gzip *.profile ; \ + done + +# TODO: some other paths +popd #installation itself - copy it into right location rsync -vrpl TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/x86_64/eclipse \ @@ -502,7 +556,7 @@ install -D %{SOURCE2} $RPM_BUILD_ROOT/usr/share/applications/eclipse.desktop chmod ugo+rx %{SOURCE3} mkdir -p $RPM_BUILD_ROOT/usr/bin install %{SOURCE3} $RPM_BUILD_ROOT/usr/bin/efj -TARGET_LAUNCHER=%{installation_loc}\/plugins/`ls TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/x86_64/eclipse/plugins | grep launcher_[0-9]*` +TARGET_LAUNCHER=%{installation_loc}\/plugins/`ls TMP/org.eclipse.sdk.epp/target/products/org.fedoraproject.eclipse.platform/linux/gtk/${ARCH}/eclipse/plugins | grep launcher_[0-9]*` sed -i -e "s,@LAUNCHER@,${TARGET_LAUNCHER}," $RPM_BUILD_ROOT/usr/bin/efj #eclipse binary @@ -512,13 +566,16 @@ pushd $RPM_BUILD_ROOT/usr/bin/ popd pushd $RPM_BUILD_ROOT/%{_libdir}/%{name} - ln -s %{_libdir}/%{name}plugins/org.eclipse.swt.gtk.linux_* swt.jar - ln -s %{_libdir}/%{name}plugins/org.eclipse.swt.gtk.linux_* swt-gtk.jar +SWT_JAR=`ls $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins | grep swt.gtk` + ln -s %{_libdir}/%{name}/plugins/${SWT_JAR} swt.jar + ln -s %{_libdir}/%{name}/plugins/${SWT_JAR} swt-gtk.jar popd -#config ini +#eclipse ini mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ -ln -s $RPM_BUILD_ROOT/%{_libdir}/%{name}/configuration/config.ini $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini +pushd $RPM_BUILD_ROOT/%{_sysconfdir}/ +ln -s %{_libdir}/%{name}/eclipse.ini +popd ################################# ### End of extraction # ################################# @@ -528,15 +585,6 @@ pushd $RPM_BUILD_ROOT%{_libdir}/%{name} rm icon.xpm -# Create file listings for the extracted shared libraries -echo -n "" > %{_builddir}/%{buildsubdir}/%{name}-platform.install; -for id in `ls configuration/org.eclipse.osgi/bundles`; do - if [ "Xconfiguration" = $(echo X`find configuration/org.eclipse.osgi/bundles/$id -name libswt\*.so` | sed "s:/.*::") ]; then - echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" > %{_builddir}/%{buildsubdir}/%{name}-swt.install; - else - echo "%verify(not mtime) %{_libdir}/%{name}/configuration/org.eclipse.osgi/bundles/$id" >> %{_builddir}/%{buildsubdir}/%{name}-platform.install; - fi -done popd # Remove state files @@ -552,22 +600,22 @@ done popd # Temporary fix until https://bugs.eclipse.org/294877 is resolved -sed -i "s|-Xms40m|-Xms128m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -sed -i "s|-Xmx384m|-Xmx512m|g" $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-Dorg.eclipse.swt.browser.UseWebKitGTK=true" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-Dhelp.lucene.tokenizer=standard" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding," >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini -echo "-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini +sed -i "s|-Xms40m|-Xms128m|g" $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +sed -i "s|-Xmx384m|-Xmx512m|g" $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-Dorg.eclipse.swt.browser.UseWebKitGTK=true" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-Dhelp.lucene.tokenizer=standard" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-XX:CompileCommand=exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-XX:CompileCommand=exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding," >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini +echo "-XX:CompileCommand=exclude,org/python/pydev/ui/filetypes/FileTypesPreferencesPage,getDottedValidSourceFiles" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini # Prevent running master Eclipse in a shared configuration -echo "-preventMasterEclipseLaunch" | cat - $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini > /tmp/out && mv -f /tmp/out $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini +echo "-preventMasterEclipseLaunch" | cat - $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini > /tmp/out && mv -f /tmp/out $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini -echo "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins" >> $RPM_BUILD_ROOT/%{_sysconfdir}/eclipse.ini +echo "-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins" >> $RPM_BUILD_ROOT%{_libdir}/%{name}/eclipse.ini # Deploy installation debug config echo -e "org.eclipse.equinox.p2.core/debug=true" > $RPM_BUILD_ROOT%{_libdir}/%{name}/.options @@ -873,7 +921,7 @@ rm -rf %{_bindir}/efj/ %{_libdir}/%{name}/plugins/org.eclipse.equinox.common_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.concurrent_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.console_* -%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.%{_arch}_* +%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.*_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_* %{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_* diff --git a/lucene-3.6-compile.patch b/lucene-3.6-compile.patch new file mode 100644 index 0000000..dea6868 --- /dev/null +++ b/lucene-3.6-compile.patch @@ -0,0 +1,11 @@ +--- eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java.sav 2012-06-27 16:52:22.000000000 +0300 ++++ eclipse.platform.ua/org.eclipse.help.base/src/org/eclipse/help/internal/search/WordTokenStream.java 2012-07-05 12:45:58.051494535 +0300 +@@ -95,4 +95,8 @@ public final class WordTokenStream exten + return tokens.get(token++); + + } ++ ++ public boolean incrementToken() { ++ return false; ++ } + }