rpms/eclipse-cdt/devel eclipse-cdt-cppunit-env-tab.patch, NONE, 1.1 eclipse-cdt-no-tests-4.0.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 eclipse-cdt.spec, 1.75, 1.76 sources, 1.33, 1.34

Tue Jul 17 18:25:56 UTC 2007

Author: jjohnstn

Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5593

Modified Files:
	.cvsignore eclipse-cdt.spec sources 
Added Files:
	eclipse-cdt-cppunit-env-tab.patch 
	eclipse-cdt-no-tests-4.0.patch 
Log Message:

* Tue Jul 17 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-1
- Rebase to CDT 4.0.0
- Rebase Autotools to 0.9.1




eclipse-cdt-cppunit-env-tab.patch:

--- NEW FILE eclipse-cdt-cppunit-env-tab.patch ---
--- ./org.eclipse.cdt.cppunit/src/org/eclipse/cdt/internal/cppunit/runner/CppUnitLaunchConfigurationTabGroup.java.fix	2007-06-18 19:20:01.000000000 -0400
+++ ./org.eclipse.cdt.cppunit/src/org/eclipse/cdt/internal/cppunit/runner/CppUnitLaunchConfigurationTabGroup.java	2007-06-18 19:20:29.000000000 -0400
@@ -12,7 +12,7 @@
 
 package org.eclipse.cdt.internal.cppunit.runner;
 
-import org.eclipse.cdt.launch.internal.ui.MigratingCEnvironmentTab;
+import org.eclipse.cdt.launch.ui.CEnvironmentTab;
 import org.eclipse.cdt.launch.ui.CArgumentsTab;
 import org.eclipse.cdt.launch.ui.CDebuggerTab;
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
@@ -26,7 +26,7 @@ public class CppUnitLaunchConfigurationT
 		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] {
 			new CppUnitMainTab(),
 			new CArgumentsTab(),
-			new MigratingCEnvironmentTab(),
+			new CEnvironmentTab(),
 			new CDebuggerTab(false),
 			new SourceLookupTab(),
 			new CommonTab() 

eclipse-cdt-no-tests-4.0.patch:

--- NEW FILE eclipse-cdt-no-tests-4.0.patch ---
--- build.xml.orig	2007-06-15 16:13:20.000000000 -0400
+++ build.xml	2007-06-15 16:13:38.000000000 -0400
@@ -4,7 +4,7 @@
 		<echo message="${eclipse.home}"/>
 	</target>
 	
-	<target name="build" depends="zips,sign,test"/>
+	<target name="build" depends="zips"/>
 	<target name="nightly" depends="tag,zips,sign,test,copy"/>
 	
 	<target name="cdtbuild" depends="tag,zips,test,upload"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	1 May 2007 21:45:10 -0000	1.28
+++ .cvsignore	17 Jul 2007 18:25:24 -0000	1.29
@@ -1,10 +1,3 @@
-eclipse-cdt-autotools-0.0.5.tar.gz
-eclipse-cdt-fetched-src-3.1.1.tar.bz2
-eclipse-cdt-cppunit-20061102.tar.gz
-eclipse-cdt-autotools-0.0.6.tar.gz
-eclipse-cdt-autotools-0.0.6.1.tar.gz
-eclipse-cdt-autotools-0.0.7.tar.gz
-eclipse-cdt-fetched-src-3.1.2.tar.bz2
-eclipse-cdt-autotools-0.0.8.tar.gz
-eclipse-cdt-autotools-0.0.8.1.tar.gz
-eclipse-cdt-target_filter.gif.gz
+eclipse-cdt-autotools-0.9.0.tar.gz
+eclipse-cdt-autotools-0.9.1.tar.gz
+eclipse-cdt-fetched-src-4_0_0.tar.bz2


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- eclipse-cdt.spec	1 May 2007 21:45:10 -0000	1.75
+++ eclipse-cdt.spec	17 Jul 2007 18:25:24 -0000	1.76
@@ -1,10 +1,9 @@
-Epoch: 1
 
 %define gcj_support             1
-%define major                   3
-%define minor                   1       
+%define major                   4
+%define minor                   0       
 %define majmin                  %{major}.%{minor}
-%define micro                   2
+%define micro                   0
 %define eclipse_base            %{_datadir}/eclipse
 %define eclipse_lib_base        %{_libdir}/eclipse
 
@@ -18,7 +17,7 @@
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        3%{?dist}
+Release:        1%{?dist}
 License:        Eclipse Public License / CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -28,21 +27,21 @@
 #
 # mkdir temp && cd temp
 # mkdir home
-# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CDT_3_1_2 \
+# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CDT_4_0_0 \
 #   org.eclipse.cdt-releng/org.eclipse.cdt.releng
 # cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
-# sed --in-place 's/@cdtTag@/CDT_3_1_2/' maps/cdt.map
+# sed --in-place 's/@cdtTag@/CDT_4_0_0/' maps/cdt.map
 # sed --in-place 's/home/cvsroot/' maps/cdt.map
 # eclipse -nosplash -Duser.home=../../home \
 #   -application org.eclipse.ant.core.antRunner \
 #   -buildfile build.xml -DbaseLocation=/usr/share/eclipse \
 #   -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build/scripts \
 #   -DdontUnzip=true fetch
-# cd .. && tar jcf eclipse-cdt-fetched-src-3.1.2.tar.bz2 org.eclipse.cdt.releng
+# cd .. && tar jcf eclipse-cdt-fetched-src-4_0_0.tar.bz2 org.eclipse.cdt.releng
 
 Source0: %{name}-fetched-src-%{version}.tar.bz2
 
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-autotools-0.0.8.1.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-autotools-0.9.1.tar.gz
 
 # The following tarball was generated thusly:
 #
@@ -63,17 +62,7 @@
 # Patch to add special "ForAllElements" targets to CDT sdk/customTargets.xml.
 Patch1: %{name}-no-cvs2-patch
 # Patch to remove tests from CDT build.xml.
-Patch4: %{name}-no-tests.patch
-# Patch to CDT to add the ability to specify a build subconsole.  The additional
-# build console is # used by Autotools to display configuration output.
-Patch5: %{name}-buildconsole.patch
-# Patch to add new IScannerInfoPlus interface to CDT and add code to recognize it
-# when opening header files via clicking on them in the outline view.  This
-# stops multiple include paths from being shown when the true path is already
-# known by calculation from the build's Makefile.
-Patch6: %{name}-scannerinfoplus.patch
-# Patch to CDT to add hover help for compiler defined symbols (i.e. -D flags).
-Patch7: %{name}-definedsymbolhover.patch
+Patch4: %{name}-no-tests-4.0.patch
 # Patch to cppunit code to support double-clicking on file names, classes, and
 # member names in the Hierarchy and Failure views such that the appropriate
 # file will be opened and the appropriate line will be selected.
@@ -83,14 +72,15 @@
 # Patch to fix default paths used by cppunit wizards to find header files and
 # libraries.
 Patch10: %{name}-cppunit-default-location.patch
-# Patch to ManagedMake builder to prevent running make after Makefile generation
-# failure.
-Patch11: %{name}-managedbuild-failcheck.patch
+# Patch to cppunit code to remove references to deprecated class which has
+# been removed in CDT 4.0.
+Patch11: %{name}-cppunit-env-tab.patch
 
 BuildRequires: eclipse-pde
 %if %{gcj_support}
 BuildRequires:  gcc-java >= 4.0.2
 BuildRequires:  java-gcj-compat-devel >= 1.0.64
+BuildRequires:  unzip >= 5.52
 Requires(post):   java-gcj-compat >= 1.0.64
 Requires(postun): java-gcj-compat >= 1.0.64
 %else
@@ -98,7 +88,7 @@
 %endif
 
 Requires:       gdb make gcc-c++ autoconf automake
-Requires:       eclipse-platform >= 1:3.2.0
+Requires:       eclipse-platform >= 1:3.3.0
 
 # Currently, upstream CDT only supports building on the platforms listed here.
 %if %{gcj_support}
@@ -132,15 +122,16 @@
   offset=$(expr $offset + 3) 
 done
 # Only build for the platform on which we're building
+sed --in-place -e "s:linux.gtk.x86/:linux.gtk.%{eclipse_arch}/:g" build.xml
 pushd sdk
 sed --in-place -e "74,82d" build.properties
 sed --in-place -e "s:configs=\\\:configs=linux,gtk,%{eclipse_arch}:" build.properties
 popd
+pushd master
+sed --in-place -e "74,82d" build.properties
+sed --in-place -e "s:configs= \\\:configs=linux,gtk,%{eclipse_arch}:" build.properties
+popd
 %patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch11 -p0
 # Following is a patch to the CDT which is missing a b/w version
 # of an icon.  This patch can be removed once fixed upstream.
 pushd results/plugins/org.eclipse.cdt.make.ui/icons/dtool16
@@ -163,6 +154,7 @@
 %patch8 -p0
 %patch9 -p0
 %patch10 -p0
+%patch11 -p0
 popd
 
 # Upstream CVS includes random .so files.  Let's remove them now.
@@ -202,7 +194,7 @@
 popd
 
 # Autotools has dependencies on CDT so we must add these to the SDK directory
-tar -C $SDK --strip-components=1 -zxvf org.eclipse.cdt.releng/results/I.*/org.eclipse.cdt.sdk-*.tar.gz
+unzip -o org.eclipse.cdt.releng/results/I.*/cdt-master-*.zip -d $SDK
 
 # Autotools build
 pushd autotools
@@ -240,8 +232,30 @@
 
 install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
 
-tar -C ${RPM_BUILD_ROOT}/%{eclipse_base} --strip-components=1 -zxvf \
-  org.eclipse.cdt.releng/results/I.*/org.eclipse.cdt.sdk-*.tar.gz
+unzip org.eclipse.cdt.releng/results/I.*/cdt-master-*.zip \
+-d ${RPM_BUILD_ROOT}/%{eclipse_base}
+
+# Remove testing, upc, xlc, master, and gdbjtag features and plugins
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.testing*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.master*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.debug.gdbjtag*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.xlc*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.core.parser.upc*
+
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.testing*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.debug.gdbjtag*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.parser.upc*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.errorparsers.xlc*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.ant*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.test*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.test*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.debug.ui.test*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.core.test*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.ui.test*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.refactoring.test*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.ui.test*
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/site.xml
+rm ${RPM_BUILD_ROOT}%{eclipse_base}/pack.properties
 
 # We move arch-specific plugins to libdir.
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/eclipse
@@ -287,10 +301,14 @@
 %{eclipse_base}/features/org.eclipse.cdt_*
 %{eclipse_base}/features/com.redhat.eclipse.cdt*
 %{eclipse_base}/features/org.eclipse.cdt.cppunit_*
+%{eclipse_base}/features/org.eclipse.cdt.core.parser.c99*
+%{eclipse_base}/plugins/net.sourceforge.lpg*
 %{eclipse_base}/plugins/org.eclipse.cdt_*
 %{eclipse_base}/plugins/org.eclipse.cdt.core*
 %{eclipse_base}/plugins/org.eclipse.cdt.cppunit*
-%{eclipse_base}/plugins/org.eclipse.cdt.debug*
+%{eclipse_base}/plugins/org.eclipse.cdt.debug.mi*
+%{eclipse_base}/plugins/org.eclipse.cdt.debug.ui*
+%{eclipse_base}/plugins/org.eclipse.cdt.debug.core*
 %{eclipse_base}/plugins/org.eclipse.cdt.doc*
 %{eclipse_base}/plugins/org.eclipse.cdt.launch*
 %{eclipse_base}/plugins/org.eclipse.cdt.make*
@@ -303,7 +321,6 @@
 %{_libdir}/gcj/%{name}
 %endif
 %doc %{eclipse_base}/features/org.eclipse.cdt.cppunit_*/cpl-v10.html
-%doc %{eclipse_base}/features/org.eclipse.cdt_*/epl-v10.html
 
 %files sdk
 %defattr(-,root,root)
@@ -312,9 +329,12 @@
 %{eclipse_base}/plugins/org.eclipse.cdt.source*
 %{eclipse_base}/plugins/org.eclipse.cdt.sdk*
 %{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
-%doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html
 
 %changelog
+* Tue Jul 17 2007 Jeff Johnston <jjohnstn at redhat.com> 4.0.0-1
+- Rebase to CDT 4.0.0
+- Rebase Autotools to 0.9.1
+
 * Mon Apr 16 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.2-3
 - Add missing gif to org.eclipse.cdt.make.ui.
 - Resolves: #236558


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources	1 May 2007 21:45:10 -0000	1.33
+++ sources	17 Jul 2007 18:25:24 -0000	1.34
@@ -1,4 +1,4 @@
 5c470fb0777d27541edbfa31443d91f7  eclipse-cdt-cppunit-20061102.tar.gz
-00ce7b1810685e56375f8df48cc9ae26  eclipse-cdt-fetched-src-3.1.2.tar.bz2
-622927df0c7bc770dbb43579e3668fa9  eclipse-cdt-autotools-0.0.8.1.tar.gz
 2d4ae0a2131ba1efc896d981072cc091  eclipse-cdt-target_filter.gif.gz
+6c04b9ace73a4861ff7d9e67977b6f75  eclipse-cdt-autotools-0.9.1.tar.gz
+694b0b78710bbdfc323c19a337f73a28  eclipse-cdt-fetched-src-4_0_0.tar.bz2


