rpms/eclipse-cdt/devel .cvsignore, 1.52, 1.53 eclipse-cdt-autotools-local.patch, 1.3, 1.4 eclipse-cdt-libhover-local.patch, 1.1, 1.2 eclipse-cdt.spec, 1.146, 1.147 fetch-cdt.sh, 1.10, 1.11 sources, 1.61, 1.62

Jeff Johnston jjohnstn at fedoraproject.org
Wed Jul 14 21:31:41 UTC 2010 

Author: jjohnstn

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12481

Modified Files:
	.cvsignore eclipse-cdt-autotools-local.patch 
	eclipse-cdt-libhover-local.patch eclipse-cdt.spec fetch-cdt.sh 
	sources 
Log Message:
* Wed Jul 14 2010 Jeff Johnston  <jjohnstn at redhat.com> 1:7.0.0-1
- Rebase CDT to Helios (7.0.0)
- Rebase Autotools/Libhover to Linux tools R0.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- .cvsignore	18 May 2010 20:50:52 -0000	1.52
+++ .cvsignore	14 Jul 2010 21:31:40 -0000	1.53
@@ -46,3 +46,6 @@ eclipse-cdt-fetched-src-autotools-R0_5_0
 eclipse-cdt-fetched-src-libhover-R0_5_0.tar.gz
 eclipse-cdt-fetched-src-autotools-R0_5_1.tar.gz
 eclipse-cdt-fetched-src-libhover-R0_5_1.tar.gz
+eclipse-cdt-fetched-src-CDT_7_0_0.tar.bz2
+eclipse-cdt-fetched-src-libhover-R0_6_0.tar.gz
+eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz

eclipse-cdt-autotools-local.patch:
 build.properties |    1 +
 1 file changed, 1 insertion(+)

Index: eclipse-cdt-autotools-local.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt-autotools-local.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- eclipse-cdt-autotools-local.patch	19 Mar 2010 21:08:04 -0000	1.3
+++ eclipse-cdt-autotools-local.patch	14 Jul 2010 21:31:40 -0000	1.4
@@ -1,12 +1,11 @@
 diff -up ./org.eclipse.linuxtools.cdt.autotools.core/build.properties.fix ./org.eclipse.linuxtools.cdt.autotools.core/build.properties
---- ./org.eclipse.linuxtools.cdt.autotools.core/build.properties.fix	2010-03-19 15:28:41.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.autotools.core/build.properties	2010-03-19 15:39:38.000000000 -0400
-@@ -3,5 +3,6 @@ output.. = bin/
+--- ./org.eclipse.linuxtools.cdt.autotools.core/build.properties.fix	2010-07-13 19:15:37.032946268 -0400
++++ ./org.eclipse.linuxtools.cdt.autotools.core/build.properties	2010-07-13 19:16:07.933950873 -0400
+@@ -3,6 +3,7 @@ output.. = bin/
  bin.includes = plugin.xml,\
                 META-INF/,\
                 .,\
 +               macros/,\
                 html/,\
--               plugin.properties
-\ No newline at end of file
-+               plugin.properties
+ 	       about.html,\
+                plugin.properties

eclipse-cdt-libhover-local.patch:
 build.properties |    1 +
 1 file changed, 1 insertion(+)

Index: eclipse-cdt-libhover-local.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt-libhover-local.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-cdt-libhover-local.patch	24 Sep 2009 22:20:05 -0000	1.1
+++ eclipse-cdt-libhover-local.patch	14 Jul 2010 21:31:41 -0000	1.2
@@ -1,37 +1,11 @@
 diff -up ./org.eclipse.linuxtools.cdt.libhover/build.properties.fix ./org.eclipse.linuxtools.cdt.libhover/build.properties
---- ./org.eclipse.linuxtools.cdt.libhover/build.properties.fix	2009-09-23 17:07:18.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover/build.properties	2009-09-23 17:07:38.000000000 -0400
-@@ -3,7 +3,8 @@ output.. = bin/
- bin.includes = plugin.xml,\
+--- ./org.eclipse.linuxtools.cdt.libhover/build.properties.fix	2010-07-13 19:19:11.327110623 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover/build.properties	2010-07-13 19:19:37.166960175 -0400
+@@ -4,6 +4,7 @@ bin.includes = plugin.xml,\
                 META-INF/,\
                 .,\
--               plugin.properties
-+               plugin.properties,\
-+               libhoverdocs/
+ 	       about.html,\
++               libhoverdocs,\
+                plugin.properties
  
  javacSource=1.5
- javacTarget=1.5
-diff -up ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml.fix ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml
---- ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml.fix	2009-09-23 17:12:01.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover.glibc/plugin.xml	2009-09-23 17:12:26.000000000 -0400
-@@ -7,7 +7,7 @@
-          point="org.eclipse.linuxtools.cdt.libhover.library">
-       <library
-             docs="http://www.gnu.org/software/libc/manual/html_node/index.html"
--            location="http://www.sourceware.org/eclipse/libhover/glibc-2.7-2.libhover"
-+            location="libhoverdocs/glibc-2.7-2.libhover"
-             name="glibc library"
-             type="C">
-       </library>
-diff -up ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml
---- ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml.fix	2009-09-23 17:12:43.000000000 -0400
-+++ ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml	2009-09-23 17:13:04.000000000 -0400
-@@ -7,7 +7,7 @@
-          point="org.eclipse.linuxtools.cdt.libhover.library">
-       <library
-             docs="http://gcc.gnu.org/onlinedocs/libstdc++/manual/spine.html"
--            location="http://www.sourceware.org/eclipse/libhover/libstdc++-v3.libhover"
-+            location="libhoverdocs/libstdc++-v3.libhover"
-             name="libstdc++ library"
-             type="C++">
-       </library>


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- eclipse-cdt.spec	18 May 2010 20:50:53 -0000	1.146
+++ eclipse-cdt.spec	14 Jul 2010 21:31:41 -0000	1.147
@@ -4,12 +4,12 @@ Epoch: 1
 
 %define run_tests               0
 %define ship_tests              0
-%define major                   6
+%define major                   7
 %define minor                   0       
 %define majmin                  %{major}.%{minor}
-%define micro                   2
+%define micro                   0
 %define eclipse_base            %{_libdir}/eclipse
-%define build_id		201002161416
+%define build_id		201006141710
 
 
 # All arches line up except i386 -> x86
@@ -22,7 +22,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        5%{?dist}
+Release:        1%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -33,13 +33,13 @@ Requires:       eclipse-platform
 # script.  Note that the optional c99 and upc parsers plus the optional
 # xlc support features have been removed.
 
-Source0: %{name}-fetched-src-v%{build_id}.tar.bz2
+Source0: %{name}-fetched-src-CDT_7_0_0.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: %{name}-fetched-src-autotools-R0_5_1.tar.gz
+Source1: %{name}-fetched-src-autotools-R0_6_0.tar.gz
 Source14: make-autotools-tarball.sh
 
-Source2: %{name}-fetched-src-libhover-R0_5_1.tar.gz
+Source2: %{name}-fetched-src-libhover-R0_6_0.tar.gz
 Source15: make-libhover-tarball.sh
 
 ## The following tarball was generated thusly:
@@ -81,11 +81,6 @@ Source13: ammacros-1.9.6.xml
 ## been removed in CDT 4.0.
 #Patch11: %{name}-cppunit-env-tab.patch
 
-# Remove include of stropts.h in openpty.c as it is no longer included 
-# in glibc-headers package
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=272373
-Patch12: %{name}-openpty.patch
-
 # Add XML -> HTML generation after running tests
 Patch13: %{name}-testaggregation.patch
 
@@ -108,16 +103,10 @@ Patch17: %{name}-ppc64-add_xopen_source-
 # in the plugin.
 Patch19: %{name}-autotools-local.patch
 
-# Disable mylyn bridge compiling. Should be removed when CDT 7.0 is out.
-Patch20: %{name}-disable-mylyn.patch
-
-# Add new setTargets interface to MakeTargetManager for use by Autotools.
-# This can be removed for CDT 7.0.
-Patch21: %{name}-maketargets.patch
-
 BuildRequires: eclipse-pde
 BuildRequires: eclipse-rse >= 3.0
 BuildRequires:  java-devel >= 1.4.2
+BuildRequires: objectweb-asm >= 3.2
 BuildRequires: lpg-java-compat
 %if %{run_tests}
 BuildRequires:  vnc-server
@@ -127,6 +116,7 @@ BuildRequires:  w3m
 Requires:       gdb make gcc-c++ autoconf automake libtool
 Requires:       eclipse-platform >= 1:3.5.0
 Requires:	eclipse-rse >= 3.0
+Requires:	objectweb-asm >= 3.2
 
 ExclusiveArch: %{ix86} x86_64 ppc ia64 ppc64
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -167,17 +157,9 @@ Test suite for Eclipse C/C++ Development
 
 pushd "org.eclipse.cdt.releng"
 
-# Following patches a C file to remove reference to stropts.h which is
-# not needed and is missing in latest glibc
-pushd results/plugins/org.eclipse.cdt.core.linux/library
-%patch12 -p0
-popd
 pushd results/plugins
 %patch13
 popd
-pushd results/plugins/org.eclipse.cdt.make.core
-%patch21 -p0
-popd
 #pushd results/plugins/org.eclipse.cdt.core.tests
 #rm parser/org/eclipse/cdt/core/parser/tests/scanner/LexerTests.java
 #%patch14
@@ -282,10 +264,6 @@ 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
@@ -589,6 +567,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Jul 14 2010 Jeff Johnston  <jjohnstn at redhat.com> 1:7.0.0-1
+- Rebase CDT to Helios (7.0.0)
+- Rebase Autotools/Libhover to Linux tools R0.6.0
+
 * Tue May 18 2010 Jeff Johnston  <jjohnstn at redhat.com> 1:6.0.2-5
 - Rebase Autotools/Libhover to Linux tools R0.5.1.
 - Remove addbuilder patch which is already part of R0_5_1.


Index: fetch-cdt.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/fetch-cdt.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- fetch-cdt.sh	15 Jun 2010 18:44:59 -0000	1.10
+++ fetch-cdt.sh	14 Jul 2010 21:31:41 -0000	1.11
@@ -1,43 +1,72 @@
-#!/bin/sh
+#!/bin/sh -x
 
-CDTTAG=v201002161416
-ECLIPSEBASE=$(rpm --eval %{_libdir})/eclipse
+CDTTAG=CDT_7_0_0
+#ECLIPSEBASE=$(rpm --eval %{_libdir})/eclipse
+
+if test x`uname -i` = 'xi386'; then export plat=""; else export plat=-`uname -i`; fi
+
+# eclipse -nosplash -consolelog -application org.eclipse.equinox.p2.director -repository http://download.eclipse.org/technology/subversive/0.7/pde-update-site/ -installIU org.eclipse.team.svn.pde.build.feature.group
 
 mkdir -p temp && cd temp
+TEMPDIR=$(pwd)
 mkdir -p home
 mkdir -p ws
+# we need to use a special svn pde extension to fetch some parts for the cdt build so we unzip a fresh 3.6 SDK and add the
+# special plug-in via the p2 director
+mkdir -p sdk
+pushd sdk
+wget http://download.eclipse.org/eclipse/downloads/drops/R-3.6-201006080911/eclipse-SDK-3.6-linux-gtk${plat}.tar.gz
+tar -xzvf eclipse-SDK-3.6-linux-gtk${plat}.tar.gz
+ECLIPSEBASE=$TEMPDIR/sdk/eclipse
+pushd eclipse
+./eclipse -nosplash -consolelog -application org.eclipse.equinox.p2.director -repository http://download.eclipse.org/technology/subversive/0.7/pde-update-site/ -installIU org.eclipse.team.svn.pde.build.feature.group
+popd
+popd
+
 rm -rf org.eclipse.cdt-releng
 cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r $CDTTAG org.eclipse.cdt-releng/org.eclipse.cdt.releng
+
 cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
 
 # The build.xml doesn't fetch master or testing features so we must add this ourselves.
-sed --in-place -e'91,91i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
-sed --in-place -e'91,91i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
+sed --in-place -e'94,94i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
+sed --in-place -e'94,94i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
 sed --in-place -e'71,71i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/master"/>\n\t\t</ant>' build.xml
 sed --in-place -e'71,71i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/testing"/>\n\t\t</ant>' build.xml
+sed --in-place -e'71,71i\\t\t<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">\n\t\t\t<property name="builder" value="${basedir}/codan"/>\n\t\t</ant>' build.xml
 
 # Remove copying of binary jar in build.xml.  We remove this jar so this operation will fail.
 sed --in-place -e "/copy file=\"\${buildDirectory}.*net\.sourceforge\.lpg/,/\/>/"d build.xml 
 
+pushd codan
+# the feature id does not match what is found in the customTargets.xml which causes pdebuild to stop so make it the same
+sed --in-place -e "s,value=\"org.eclipse.cdt.codan\",value=\"org.eclipse.cdt.codan.feature\",g" customTargets.xml
+popd
+
 pushd maps
-sed --in-place -e "s,eclipse.cdt/mylyn,eclipse.cdt-old/mylyn,g" cdt.map
+# fix the CVS locations to use pserver rather than expecting to be on the actual eclipse.org build machine
+sed --in-place -e "s,/cvsroot/tools,:pserver:anonymous at dev.eclipse.org/cvsroot/tools,g" cdt.map
+sed --in-place -e "s,/cvsroot/eclipse,:pserver:anonymous at dev.eclipse.org/cvsroot/eclipse,g" cdt.map
+# never use HEAD...specify a tag
+sed --in-place -e "s,HEAD,R3_6,g" cdt.map
 popd
 
-PDEBUILDVERSION=$(ls $ECLIPSEBASE/dropins/sdk/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
-java -cp /usr/lib/eclipse/startup.jar \
+PDEBUILDVERSION=$(ls $ECLIPSEBASE/plugins | grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
+$ECLIPSEBASE/eclipse -nosplash \
      -Duser.home=../../home \
+      -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=$TEMPDIR/dropins \
 -XX:CompileCommand="exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" \
 -XX:CompileCommand="exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>" \
 -XX:CompileCommand="exclude,org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates,instantiateTemplate" \
 -XX:CompileCommand="exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding" \
      org.eclipse.core.launcher.Main             \
-  -Dpde.build.scripts=$ECLIPSEBASE/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_$PDEBUILDVERSION/scripts \
+  -Dpde.build.scripts=$ECLIPSEBASE/plugins/org.eclipse.pde.build_$PDEBUILDVERSION/scripts \
   -application org.eclipse.ant.core.antRunner \
   -buildfile build.xml -DbaseLocation=$ECLIPSEBASE \
-  -Dpde.build.scripts=$ECLIPSEBASE/dropins/sdk/plugins/org.eclipse.pde.build_$PDEBUILDVERSION/scripts \
+  -Dpde.build.scripts=$ECLIPSEBASE/plugins/org.eclipse.pde.build_$PDEBUILDVERSION/scripts \
+  -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=$TEMPDIR/dropins \
   -DcdtTag=$CDTTAG \
   -DdontUnzip=true fetch
-#eclipse -nosplash -console
 
 find . -name net.*.jar -exec rm {} \;
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sources	18 May 2010 20:50:53 -0000	1.61
+++ sources	14 Jul 2010 21:31:41 -0000	1.62
@@ -8,8 +8,6 @@
 4404043432f7f30300139ce39288ba93  ammacros-1.4-p6.xml
 f6edf5299e6f0d89017bd295a296c2cd  ammacros-1.9.5.xml
 f5c671311f49cdb33eaaa64ab6d781fa  ammacros-1.9.6.xml
-c42f55b60cdb4410b6c5a5201357e7b8  eclipse-cdt-fetched-src-v201002161416.tar.bz2
-b521cd872ec5776d743a38318a4cbe3e  eclipse-cdt-fetched-src-autotools-R0_5_0.tar.gz
-6a21a7b465d9abce8064186f1ba601c6  eclipse-cdt-fetched-src-libhover-R0_5_0.tar.gz
-dc6dec7fa6a435d7f441b2e4e41f6a4a  eclipse-cdt-fetched-src-autotools-R0_5_1.tar.gz
-b683c120c1c13b56e6992e6b2fc6083c  eclipse-cdt-fetched-src-libhover-R0_5_1.tar.gz
+4585396f689035cae620c202437aa8af  eclipse-cdt-fetched-src-CDT_7_0_0.tar.bz2
+0e664e90fc9b65e1e428a1ef28ade7c7  eclipse-cdt-fetched-src-libhover-R0_6_0.tar.gz
+baf5d75e1edf754438c2163b454558f6  eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz

More information about the scm-commits mailing list