rpms/eclipse-cdt/devel eclipse-cdt-disable-mylyn.patch, NONE, 1.1 .cvsignore, 1.48, 1.49 eclipse-cdt.spec, 1.139, 1.140

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21242/devel

Modified Files:
	.cvsignore eclipse-cdt.spec 
Added Files:
	eclipse-cdt-disable-mylyn.patch 
Log Message:
- Disable mylyn bridge build, part of eclipse-mylyn srpm now.

eclipse-cdt-disable-mylyn.patch:
 feature.xml |    4 ----
 1 file changed, 4 deletions(-)

--- NEW FILE eclipse-cdt-disable-mylyn.patch ---
--- org.eclipse.cdt.releng/results/features/org.eclipse.cdt.master/feature.xml.orig	2009-06-23 23:07:50.000000000 +0300
+++ org.eclipse.cdt.releng/results/features/org.eclipse.cdt.master/feature.xml	2009-10-28 12:46:20.635310276 +0200
@@ -74,10 +74,6 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.cdt.mylyn"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.cdt.gnu.dsf"
          version="0.0.0"/>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore	16 Oct 2009 22:04:42 -0000	1.48
+++ .cvsignore	28 Oct 2009 12:55:29 -0000	1.49
@@ -39,3 +39,5 @@ acmacros-2.61.xml
 ammacros-1.4-p6.xml
 ammacros-1.9.5.xml
 ammacros-1.9.6.xml
+eclipse-cdt-target_filter.gif.gz
+eclipse-cdt-cppunit-20061102.tar.gz


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- eclipse-cdt.spec	27 Oct 2009 15:57:22 -0000	1.139
+++ eclipse-cdt.spec	28 Oct 2009 12:55:29 -0000	1.140
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -114,8 +114,10 @@ Patch18: %{name}-discoverytab.patch
 # in the plugin.
 Patch19: %{name}-autotools-local.patch
 
+# Disable mylyn bridge compiling. Should be removed when CDT 6.1 is out.
+Patch20: %{name}-disable-mylyn.patch
+
 BuildRequires: eclipse-pde
-BuildRequires: eclipse-mylyn >= 3.0
 BuildRequires: eclipse-rse >= 3.0
 BuildRequires:  java-devel >= 1.4.2
 BuildRequires: lpg-java-compat
@@ -134,15 +136,6 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 %description
 Eclipse features and plugins that are useful for C and C++ development.
 
-%package mylyn
-Summary:        Eclipse C/C++ Development Tools (CDT) SDK plugin
-Group:          Text Editors/Integrated Development Environments (IDE)
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       eclipse-mylyn >= 3.0
-
-%description mylyn
-Mylyn integration for CDT.
-
 %package parsers
 Summary:        Eclipse C/C++ Development Tools (CDT) SDK plugin
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -289,13 +282,17 @@ cd ../org.eclipse.cdt.core.linux
 popd
 %endif
 
+#remove mylyn plugins (part of mylyn srpm now)
+rm -fr results/plugins/org.eclipse.cdt.mylyn*
+%patch20
+
 %build
 export JAVA_HOME=%{java_home}
 export PATH=%{java_bin}:/usr/bin:$PATH
 
 # See comments in the script to understand this.
 /bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK \
-  %{eclipse_base} mylyn xmlrpc codec httpclient lang rse
+  %{eclipse_base} xmlrpc codec httpclient lang rse
 ln -s %{_javadir}/lpgjavaruntime-1.1.0.jar SDK/plugins/net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
 SDK=$(cd SDK >/dev/null && pwd)
 
@@ -405,11 +402,9 @@ LAUNCHERJAR=$(ls %{eclipse_base}/plugins
 LAUNCHER=%{eclipse_base}/plugins/$LAUNCHERJAR
 
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
-mylynInstallDir=${installDir}-mylyn
 parsersInstallDir=${installDir}-parsers
 sdkInstallDir=${installDir}-sdk
 install -d -m755 $installDir
-install -d -m755 $mylynInstallDir
 install -d -m755 $parsersInstallDir
 install -d -m755 $sdkInstallDir
 
@@ -437,10 +432,6 @@ pushd libhover
 unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.zip
 popd
 
-mkdir -p $mylynInstallDir/eclipse/features $mylynInstallDir/eclipse/plugins
-mv $installDir/eclipse/features/*mylyn* $mylynInstallDir/eclipse/features
-mv $installDir/eclipse/plugins/*mylyn* $mylynInstallDir/eclipse/plugins
-
 # Move upc, xlc, and lrparser plugins/features to parsers install area.
 mkdir -p $parsersInstallDir/eclipse/features $parsersInstallDir/eclipse/plugins
 mv $installDir/eclipse/features/*xlc* $parsersInstallDir/eclipse/features
@@ -491,27 +482,6 @@ org.eclipse.equinox.p2.metadata.generato
 rm -rf repo
 popd
 
-# Generate p2 metadata for CDT Mylyn Bridge
-pushd $mylynInstallDir/eclipse
-java -jar $LAUNCHER \
--application \
-org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
--metadataRepository file:`pwd`/repo \
--artifactRepository file:`pwd`/repo \
--source `pwd` \
--root "CDT Mylyn Bridge" \
--rootVersion %{version} \
--flavor tooling \
--publishArtifacts \
--append \
--artifactRepositoryName "CDT Mylyn" \
--metadataRepositoryName "CDT Mylyn" \
--vmargs \
--Duser.home=$homedir
-
-rm -rf repo
-popd
-
 # Generate p2 metadata for CDT Parsers
 pushd $parsersInstallDir/eclipse
 java -jar $LAUNCHER \
@@ -608,10 +578,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{eclipse_base}/dropins/cdt-sdk
 
-%files mylyn
-%defattr(-,root,root)
-%{eclipse_base}/dropins/cdt-mylyn
-
 %files parsers
 %defattr(-,root,root)
 %{eclipse_base}/dropins/cdt-parsers
@@ -623,6 +589,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Oct 28 2009 Alexander Kurtakov <akurtako at redhat.com> 1:6.0.1-6
+- Disable mylyn bridge build, part of eclipse-mylyn srpm now.
+
 * Tue Oct 27 2009 Alexander Kurtakov <akurtako at redhat.com> 1:6.0.1-5
 - Sync build_id with upstream 6.0.1.