From 84e96cc84e128ea5cc2469ac49121a55cc37ccc3 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Apr 15 2011 15:23:48 +0000 Subject: Separate ide/SDK so as to being able to build individual Mylyn RPMs without circular deps. I.e. org.eclipse.mylyn.context-feature depends on org.eclipse.mylyn-feature, but org.eclipse.mylyn.ide-feature depends on org.eclipse.mylyn.context-feature. First build succeeded with eclipse-mylyn-commons as dependency. --- diff --git a/.gitignore b/.gitignore index 0eaa59d..cfa9075 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ org.eclipse.mylyn-R_3_4_0-fetched-src.tar.bz2 org.eclipse.mylyn-R_3_4_1-fetched-src.tar.bz2 /org.eclipse.mylyn-R_3_4_2-fetched-src.tar.bz2 +eclipse-mylyn-R_3_5_0-fetched-src.tar.bz2 diff --git a/eclipse-mylyn-clean-sdk.patch b/eclipse-mylyn-clean-sdk.patch deleted file mode 100644 index a9fecb1..0000000 --- a/eclipse-mylyn-clean-sdk.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- org.eclipse.mylyn.sdk-feature/feature.xml 2010-05-26 14:49:25.000000000 -0400 -+++ org.eclipse.mylyn.sdk-feature/feature.xml.removeunneeded 2010-07-27 10:26:22.311165476 -0400 -@@ -127,13 +127,6 @@ - unpack="false"/> - - -- -- - - -- -- -- -- -- -- -- -- - - -- -- -- -- - -- -- - diff --git a/eclipse-mylyn-nosoap.patch b/eclipse-mylyn-nosoap.patch deleted file mode 100644 index 5a63f94..0000000 --- a/eclipse-mylyn-nosoap.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- org.eclipse.mylyn.commons-feature/feature.xml 2010-07-13 15:49:19.000000000 -0400 -+++ org.eclipse.mylyn.commons-feature/feature.xml.nosoap 2010-07-13 15:58:30.000000000 -0400 -@@ -47,13 +47,6 @@ - unpack="false"/> - - -- -- - - -- -- -- -- -- -- -- -- -- -- - - -- -- -- -- = 1.5.0 +# bash fetch-eclipse-mylyn.sh +Source0: eclipse-mylyn-R_3_5_0-fetched-src.tar.bz2 +Source1: fetch-eclipse-mylyn.sh BuildArch: noarch +BuildRequires: java-devel >= 1.5.0 +BuildRequires: eclipse-platform >= 1:3.4.0 BuildRequires: eclipse-pde >= 1:3.4.0 -BuildRequires: eclipse-cdt -BuildRequires: jakarta-commons-lang >= 2.3-2.3 -BuildRequires: ws-commons-util >= 1.0.1-5 -BuildRequires: xmlrpc3-client >= 3.0-2.8 -BuildRequires: xmlrpc3-common >= 3.0-2.8 -BuildRequires: ws-jaxme >= 0.5.1-2.4 -BuildRequires: rome -BuildRequires: jdom >= 1.0-5.5 +BuildRequires: eclipse-mylyn-commons + Requires: eclipse-platform >= 1:3.4.0 -Requires: jakarta-commons-lang >= 2.3-2.3 -Requires: ws-commons-util >= 1.0.1-5 -Requires: xmlrpc3-client >= 3.0-2.8 -Requires: xmlrpc3-common >= 3.0-2.8 -Requires: ws-jaxme >= 0.5.1-2.4 +Requires: eclipse-mylyn-commons + Provides: eclipse-mylar = 2.0.0-1.fc7 Obsoletes: eclipse-mylar < 2.0.0 -Provides: eclipse-mylyn-ide = %{version}-%{release} -Obsoletes: eclipse-mylyn-ide < 3.0.0 -Provides: eclipse-bugzilla = 1:0.2.4-4.fc6 -Obsoletes: eclipse-bugzilla < 1:0.2.5 -Provides: eclipse-mylar-bugzilla = 2.0.0-1.fc7 -Obsoletes: eclipse-mylar-bugzilla < 2.0.0 -Provides: eclipse-mylyn-bugzilla = %{version}-%{release} -Obsoletes: eclipse-mylyn-bugzilla < 3.0.0 Group: Development/Tools %description -Mylyn integrates task support into Eclipse. It supports offline editing +Mylyn integrates task support into Eclipse. It supports offline editing for certain task repositories and monitors work activity to hide -information that is not relevant to the current task. Also included is -the Mylyn Focused UI for reducing information overload when working with -tasks and the Bugzilla task connector. - -%package trac -Summary: Mylyn Trac Connector -Requires: %{name} = %{version}-%{release} -Group: Development/Tools -Provides: eclipse-mylar-trac = 2.0.0-1.fc7 -Obsoletes: eclipse-mylar-trac < 2.0.0 - -%description trac -Trac client integrated with Eclipse and Mylyn; can be used standalone. - -%package java -Summary: Mylyn Bridge: Java Development -Requires: eclipse-jdt -Requires: %{name}-ide = %{version}-%{release} -Group: Development/Tools - -%description java -Mylyn Task-Focused UI extensions for JDT. Provides focusing of Java -element views and editors. - -%package pde -Summary: Mylyn Bridge: Plug-in Development -Requires: eclipse-pde -Requires: %{name}-java = %{version}-%{release} -Group: Development/Tools - -%description pde -Mylyn Task-Focused UI extensions for PDE, Ant, Team Support and CVS. - -%package webtasks -Summary: Mylyn Connector: Web Templates -Requires: %{name} = %{version}-%{release} -Requires: rome -Requires: jdom -Group: Development/Tools - -%description webtasks -Provides Task List integration for several web-based issue trackers -and templates for example projects. - -%package wikitext -Summary: Mylyn WikiText -Requires: %{name} = %{version}-%{release} -Group: Development/Tools - -%description wikitext -Enables parsing and display of lightweight markup (wiki text). Extends -the Mylyn task editor to create a markup-aware editor. Includes WikiText -SDK - -%package cdt -Summary: Mylyn Bridge: C/C++ Development -Requires: %{name} = %{version}-%{release} -Requires: eclipse-cdt -Group: Development/Tools -Provides: eclipse-cdt-mylyn = 2:1.0.0-1.fc12 -Obsoletes: eclipse-cdt-mylyn < 2:1.0.0 - -%description cdt -Mylyn Task-Focused UI extensions for CDT. Provides focusing of C/C++ -element views and editors. - -#%package sdk -#Summary: Mylyn SDK -#Requires: %{name} = %{version}-%{release} -#Group: Development/Tools -# -#%description sdk -#SDK for Mylyn project. - +information that is not relevant to the current task. %prep -%setup -q -n org.eclipse.mylyn - -# The tests and sdk have dependencies we don't need/want/have -# Save the wikitext tests for now -mv org.eclipse.mylyn.wikitext.tests backup -rm -rf *tests* -mv backup org.eclipse.mylyn.wikitext.tests - -mkdir orbitDeps -pushd orbitDeps -ln -s %{_javadir}/commons-lang.jar org.apache.commons.lang_2.4.0.jar -ln -s %{_javadir}/commons-logging-api.jar org.apache.commons.logging.api_1.0.4.jar -ln -s %{_javadir}/xmlrpc3-client.jar -ln -s %{_javadir}/xmlrpc3-common.jar -ln -s %{_javadir}/ws-commons-util.jar org.apache.ws.commons.util_1.0.0.v20080530-1550.jar -ln -s %{_javadir}/jdom.jar org.jdom_1.0.0.v200806100616.jar -ln -s %{_javadir}/rome-0.9.jar com.sun.syndication_0.9.0.v200803061811.jar -ln -s %{_javadir}/jaxme/jaxmeapi.jar javax.xml.bind.jar -popd - -#javax.activation_1.1.0.v200806101325.jar -#javax.xml.bind_2.0.0.v20080604-1500.jar -#javax.mail_1.4.0.v200804091730.jar -#javax.servlet_2.4.0.v200806031604.jar -#org.apache.ant_1.7.0.v200803061910.zip,unpack=true -#javax.xml.rpc_1.1.0.v200806030420.zip,unpack=true -#javax.wsdl_1.5.1.v200806030408.jar -#javax.xml.soap_1.2.0.v200806030421.zip,unpack=true -#org.apache.axis_1.4.0.v200806030120.zip,unpack=true -#org.apache.commons.discovery_0.2.0.v200806030120.zip,unpack=true - -%patch0 -%patch1 -%patch2 -%patch3 -%patch4 -p1 -%patch5 -%patch6 -b .sav - -sed -i 's|bundle-version="2.3.0"|bundle-version="[2.3.0,3.0.0)"|g' org.eclipse.mylyn.commons.net/META-INF/MANIFEST.MF - -find -name feature.xml | - while read f; do - sed -i "s/qualifier/%{qualifier}/g" $f - done +%setup -c %build -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.commons \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -d "cdt rse" %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn_feature \ -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.context_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.team_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.bugzilla_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.ide_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.trac_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.java_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.pde_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.web.tasks_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.wikitext_feature \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.cdt.mylyn \ - -a "-DjavacSource=1.5 -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -d "cdt" -%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.wikitext.sdk \ - -a "-DindividualSourceBundles=true -DjavacSource=1.5 -DexportSource=true -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ - -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ - -o `pwd`/orbitDeps -d "rse cdt" -#%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.mylyn.sdk_feature \ -# -a "-DindividualSourceBundles=true -DjavacSource=1.5 -DexportSource=true -DjavacTarget=1.5 -DforceContextQualifier=%{qualifier} -DmylynQualifier=%{qualifier}" \ -# -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar \ -# -o `pwd`/orbitDeps -d "cdt" - + -d "mylyn-commons" %install rm -rf %{buildroot} -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/eclipse -install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn -install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-java -install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-pde -install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-trac -install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-webtasks -install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-wikitext -#install -d -m 755 $RPM_BUILD_ROOT%{install_loc}/mylyn-sdk - -unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn \ - build/rpmBuild/org.eclipse.mylyn.commons.zip -unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn \ - build/rpmBuild/org.eclipse.mylyn_feature.zip -unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn \ - build/rpmBuild/org.eclipse.mylyn.bugzilla_feature.zip -unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn \ - build/rpmBuild/org.eclipse.mylyn.context_feature.zip -unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn \ - build/rpmBuild/org.eclipse.mylyn.team_feature.zip -unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn \ - build/rpmBuild/org.eclipse.mylyn.ide_feature.zip -unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-trac \ - build/rpmBuild/org.eclipse.mylyn.trac_feature.zip -unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-java \ - build/rpmBuild/org.eclipse.mylyn.java_feature.zip -unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-pde \ - build/rpmBuild/org.eclipse.mylyn.pde_feature.zip -unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-webtasks \ - build/rpmBuild/org.eclipse.mylyn.web.tasks_feature.zip -unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-wikitext \ - build/rpmBuild/org.eclipse.mylyn.wikitext.sdk.zip -unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-cdt \ - build/rpmBuild/org.eclipse.cdt.mylyn.zip -#unzip -q -o -d $RPM_BUILD_ROOT%{install_loc}/mylyn-sdk \ -# build/rpmBuild/org.eclipse.mylyn.sdk_feature.zip - -pushd $RPM_BUILD_ROOT%{install_loc}/mylyn/eclipse/plugins -rm org.apache.commons.codec_*.jar -rm org.apache.commons.httpclient_3.1.0.v20080605-1935.jar -rm org.apache.commons.lang_*.jar -rm org.apache.commons.logging_*.jar -rm javax.xml.bind_2.0.0*.jar -rm org.apache.ws.commons.util_1.0.0.%{qualifier}.jar -rm org.apache.xmlrpc_3.0.0.%{qualifier}.jar -ln -s %{_javadir}/ws-commons-util.jar org.apache.ws.commons.util_1.0.0.v20080530-1550.jar -ln -s %{_javadir}/xmlrpc3-client.jar org.apache.xmlrpc.client_3.0.0.v20080530-1550.jar -ln -s %{_javadir}/xmlrpc3-common.jar -ln -s %{_javadir}/commons-lang.jar org.apache.commons.lang_2.4.0.jar -ln -s %{_javadir}/commons-logging-api.jar org.apache.commons.logging.api_1.0.4.jar -popd - -pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-trac/eclipse/plugins -rm org.apache.ws.commons.util_1.0.0.%{qualifier}.jar -rm org.apache.xmlrpc_3.0.0.%{qualifier}.jar -ln -s %{_javadir}/jaxme/jaxmeapi.jar javax.xml.bind.jar -popd - -#Do not use qualifier value for dependencies to not be forced to rebuild them for -# every mylyn -pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-trac/eclipse/features - find -name feature.xml | - while read f; do - sed -i "s/3.0.0.%{qualifier}/3.0.0.qualifier/g" $f - sed -i "s/1.0.0.%{qualifier}/1.0.0.qualifier/g" $f - done -popd - -pushd $RPM_BUILD_ROOT%{install_loc}/mylyn-webtasks/eclipse/plugins -rm org.jdom_1.0.0.v200806100616.jar -rm com.sun.syndication_0.9.0.v200803061811.jar -ln -s %{_javadir}/jdom.jar org.jdom_1.0.0.v200806100616.jar -ln -s %{_javadir}/rome-0.9.jar com.sun.syndication_0.9.0.v200803061811.jar -popd - -%clean -rm -rf %{buildroot} -%files webtasks -%defattr(-,root,root,-) -%{install_loc}/mylyn-webtasks +install -d -m 755 %{buildroot}%{_datadir}/eclipse +install -d -m 755 %{buildroot}%{install_loc}/mylyn -%files wikitext -%defattr(-,root,root,-) -%{install_loc}/mylyn-wikitext - -%files trac -%defattr(-,root,root,-) -%{install_loc}/mylyn-trac -# FIXME: add the doc files back -#%doc %{install_loc}/features/org.eclipse.mylyn.trac_feature_*/license.html -#%doc %{install_loc}/features/org.eclipse.mylyn.trac_feature_*/epl-v10.html -#%doc %{install_loc}/features/org.eclipse.mylyn.trac_feature_*/about.html - -%files java -%defattr(-,root,root,-) -%{install_loc}/mylyn-java -# FIXME: add the doc files back -#%doc %{install_loc}/features/org.eclipse.mylyn.java_feature_*/license.html -#%doc %{install_loc}/features/org.eclipse.mylyn.java_feature_*/epl-v10.html -#%doc %{install_loc}/features/org.eclipse.mylyn.java_feature_*/about.html - -%files pde -%defattr(-,root,root,-) -%{install_loc}/mylyn-pde -# FIXME: add the doc files back -#%doc %{install_loc}/features/org.eclipse.mylyn.pde_feature_*/license.html -#%doc %{install_loc}/features/org.eclipse.mylyn.pde_feature_*/epl-v10.html -#%doc %{install_loc}/features/org.eclipse.mylyn.pde_feature_*/about.html - -%files cdt -%defattr(-,root,root,-) -%{install_loc}/mylyn-cdt +unzip -q -o -d %{buildroot}%{install_loc}/mylyn \ + build/rpmBuild/org.eclipse.mylyn_feature.zip %files %defattr(-,root,root,-) %{install_loc}/mylyn -# FIXME: add the doc files back - -#%files -#%defattr(-,root,root,-) -#%{install_loc}/mylyn-sdk +%doc org.eclipse.mylyn.tasks/org.eclipse.mylyn-feature/epl-v10.html %changelog +* Fri Apr 8 2011 Severin Gehwolf 3.5.0-1 +- Update to upstream 3.5.0 release. This update splits this + existing SRPM up into about 7 additional ones. +- Now requires new package eclipse-mylyn-commons. + * Tue Feb 08 2011 Fedora Release Engineering - 3.4.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/fetch-eclipse-mylyn.sh b/fetch-eclipse-mylyn.sh new file mode 100644 index 0000000..6da6d54 --- /dev/null +++ b/fetch-eclipse-mylyn.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# +# eclipse-mylyn SRPM produces one binary RPM including +# the org.eclipse.mylyn-feature +# +# Note: +# eclipse-mylyn-commons needs to be built prior to this package. +RELEASE_TAG="R_3_5_0" + +rm -fr org.eclipse.mylyn.contexts +# get sources from org.eclipse.mylyn.contexts repo +cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/mylyn \ +export -r ${RELEASE_TAG} org.eclipse.mylyn.contexts/org.eclipse.mylyn.context.core; + +rm -fr org.eclipse.mylyn.commons +# get sources from org.eclipse.mylyn.commons repo +for f in \ +org.eclipse.mylyn \ +org.eclipse.mylyn.discovery.core \ +org.eclipse.mylyn.discovery.ui \ +org.eclipse.mylyn.monitor.core \ +org.eclipse.mylyn.monitor.ui; do +cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/mylyn \ +export -r ${RELEASE_TAG} org.eclipse.mylyn.commons/$f; +done + +rm -fr org.eclipse.mylyn.tasks +# get sources from org.eclipse.mylyn.tasks repo +for f in org.eclipse.mylyn.tasks.core \ +org.eclipse.mylyn.tasks.search \ +org.eclipse.mylyn-feature \ +org.eclipse.mylyn.tasks.ui; do +cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/mylyn \ +export -r ${RELEASE_TAG} org.eclipse.mylyn.tasks/$f; +done + +rm -f eclipse-mylyn-${RELEASE_TAG}-fetched-src.tar.bz2 +tar cjf eclipse-mylyn-${RELEASE_TAG}-fetched-src.tar.bz2 \ + org.eclipse.mylyn.contexts \ + org.eclipse.mylyn.commons \ + org.eclipse.mylyn.tasks diff --git a/fetch-mylyn.sh b/fetch-mylyn.sh deleted file mode 100644 index fb997c7..0000000 --- a/fetch-mylyn.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh - -rm -fr org.eclipse.mylyn - -for f in \ -org.eclipse.mylyn \ -org.eclipse.mylyn-feature \ -org.eclipse.mylyn.bugzilla.core \ -org.eclipse.mylyn.bugzilla-feature \ -org.eclipse.mylyn.bugzilla.ide \ -org.eclipse.mylyn.bugzilla.tests \ -org.eclipse.mylyn.bugzilla.ui \ -org.eclipse.mylyn.commons.core \ -org.eclipse.mylyn.commons-feature \ -org.eclipse.mylyn.commons.net \ -org.eclipse.mylyn.commons.ui \ -org.eclipse.mylyn.commons.xmlrpc \ -org.eclipse.mylyn.context.core \ -org.eclipse.mylyn.context-feature \ -org.eclipse.mylyn.context.tests \ -org.eclipse.mylyn.context.ui \ -org.eclipse.mylyn.discovery.core \ -org.eclipse.mylyn.discovery.tests \ -org.eclipse.mylyn.discovery.ui \ -org.eclipse.mylyn-feature \ -org.eclipse.mylyn.help.ui \ -org.eclipse.mylyn.ide.ant \ -org.eclipse.mylyn.ide-feature \ -org.eclipse.mylyn.ide.tests \ -org.eclipse.mylyn.ide.ui \ -org.eclipse.mylyn.java-feature \ -org.eclipse.mylyn.java.tasks \ -org.eclipse.mylyn.java.tests \ -org.eclipse.mylyn.java.ui \ -org.eclipse.mylyn.monitor.core \ -org.eclipse.mylyn.monitor-feature \ -org.eclipse.mylyn.monitor.tests \ -org.eclipse.mylyn.monitor.reports \ -org.eclipse.mylyn.monitor.ui \ -org.eclipse.mylyn.monitor.usage \ -org.eclipse.mylyn.pde-feature \ -org.eclipse.mylyn.pde.ui \ -org.eclipse.mylyn.resources.tests \ -org.eclipse.mylyn.resources.ui \ -org.eclipse.mylyn.sdk-feature \ -org.eclipse.mylyn.tasks.bugs \ -org.eclipse.mylyn.tasks.core \ -org.eclipse.mylyn.tasks.search \ -org.eclipse.mylyn.tasks.tests \ -org.eclipse.mylyn.tasks.ui \ -org.eclipse.mylyn.team.cvs \ -org.eclipse.mylyn.team-feature \ -org.eclipse.mylyn.team.tests \ -org.eclipse.mylyn.team.ui \ -org.eclipse.mylyn.tests \ -org.eclipse.mylyn.tests.util \ -org.eclipse.mylyn.trac.core \ -org.eclipse.mylyn.trac-feature \ -org.eclipse.mylyn.trac.tests \ -org.eclipse.mylyn.trac.ui \ -org.eclipse.mylyn.trac.wiki \ -org.eclipse.mylyn.web.tasks-feature \ -org.eclipse.mylyn.web.tasks \ -org.eclipse.mylyn.wikitext-feature \ -org.eclipse.mylyn.wikitext.confluence.core \ -org.eclipse.mylyn.wikitext.confluence.ui \ -org.eclipse.mylyn.wikitext.core \ -org.eclipse.mylyn.wikitext.help.ui \ -org.eclipse.mylyn.wikitext.help.sdk \ -org.eclipse.mylyn.wikitext.mediawiki.core \ -org.eclipse.mylyn.wikitext.mediawiki.ui \ -org.eclipse.mylyn.wikitext.sdk-feature \ -org.eclipse.mylyn.wikitext.tasks.ui \ -org.eclipse.mylyn.wikitext.tests \ -org.eclipse.mylyn.wikitext.textile.core \ -org.eclipse.mylyn.wikitext.textile.ui \ -org.eclipse.mylyn.wikitext.tracwiki.core \ -org.eclipse.mylyn.wikitext.tracwiki.ui \ -org.eclipse.mylyn.wikitext.twiki.core \ -org.eclipse.mylyn.wikitext.twiki.ui \ -org.eclipse.mylyn.wikitext.ui \ -org.eclipse.mylyn.cdt-feature \ -org.eclipse.mylyn.cdt.ui \ -; do -cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/tools \ -export -r R_3_4_2 org.eclipse.mylyn/$f; -done - -tar cjf org.eclipse.mylyn-R_3_4_2-fetched-src.tar.bz2 org.eclipse.mylyn - -rm -rf org.eclipse.mylyn.bak -cp -r org.eclipse.mylyn org.eclipse.mylyn.bak diff --git a/fix_mediawiki_image_fetch.patch b/fix_mediawiki_image_fetch.patch deleted file mode 100644 index 08493b4..0000000 --- a/fix_mediawiki_image_fetch.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- org.eclipse.mylyn.wikitext.mediawiki.core/src_ant/org/eclipse/mylyn/internal/wikitext/mediawiki/core/tasks/MediaWikiApiImageFetchingStrategy.java.sav 2010-06-09 02:05:09.000000000 +0300 -+++ org.eclipse.mylyn.wikitext.mediawiki.core/src_ant/org/eclipse/mylyn/internal/wikitext/mediawiki/core/tasks/MediaWikiApiImageFetchingStrategy.java 2010-09-01 13:52:52.894189355 +0300 -@@ -42,7 +42,7 @@ import org.xml.sax.XMLReader; - - class MediaWikiApiImageFetchingStrategy extends ImageFetchingStrategy { - -- private final Pattern imageTitlePattern = Pattern.compile("Image:(.+)"); //$NON-NLS-1$ -+ private final Pattern imageTitlePattern = Pattern.compile("(?:Image|File):(.+)"); //$NON-NLS-1$ - - private URL url; - -@@ -112,10 +112,14 @@ class MediaWikiApiImageFetchingStrategy - String name = titleMatcher.group(1); - name = name.replace(' ', '_'); - String qualifiedUrl = base; -- if (imageUrl.startsWith("/")) { //$NON-NLS-1$ -- qualifiedUrl += imageUrl.substring(0); -+ if (imageUrl.matches("https?://.*")) { //$NON-NLS-1$ -+ qualifiedUrl = imageUrl; - } else { -- qualifiedUrl += imageUrl; -+ if (imageUrl.startsWith("/")) { //$NON-NLS-1$ -+ qualifiedUrl += imageUrl.substring(0); -+ } else { -+ qualifiedUrl += imageUrl; -+ } - } - - log("Fetching " + qualifiedUrl, Project.MSG_INFO); //$NON-NLS-1$ diff --git a/sources b/sources index 9161250..617f9aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -48fb43b835ec614d86ca80c5f27182b8 org.eclipse.mylyn-R_3_4_2-fetched-src.tar.bz2 +7ce18701a9ecfd2d977dadb1391b254d eclipse-mylyn-R_3_5_0-fetched-src.tar.bz2