[eclipse-cdt] Rebase CDT to 8.0.0 Rebase Libhover and Autotools to 0.8 versions Use org.eclipse.equinox.p2.publish

Jeff Johnston jjohnstn at fedoraproject.org
Fri Jun 24 15:53:55 UTC 2011 

commit 993da43aafbd7406bc94df202bc4b95519af4143
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Fri Jun 24 11:52:35 2011 -0400

    Rebase CDT to 8.0.0
    Rebase Libhover and Autotools to 0.8 versions
    Use org.eclipse.equinox.p2.publisher.EclipseGenerator
    Switch to use org.eclipse.equinox.launcher instead of startup.jar
    Use Eclipse 3.7
    
    Add additional patch so glibc and libstdc++ libhover plug-ins reference
    local location for their libhover data.

 .gitignore                                 |    3 +
 eclipse-cdt-libhover-libstdcxx.patch       |   15 +++++
 eclipse-cdt-libhover-local-libstdcxx.patch |   23 +++++++
 eclipse-cdt-remove-shared-license.patch    |   84 +++++++++++++++++++++++++
 eclipse-cdt.spec                           |   93 +++++++++++++++-------------
 fetch-cdt.sh                               |   32 +++++-----
 make-autotools-tarball.sh                  |   13 +++-
 make-libhover-tarball.sh                   |    9 +--
 sources                                    |    9 +--
 9 files changed, 208 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 833f5bb..35a7f39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,6 @@ eclipse-cdt-fetched-src-autotools-R0_6_0.tar.gz
 /eclipse-cdt-fetched-src-cdt_7_0_1.tar.bz2
 /eclipse-cdt-fetched-src-autotools-R0_6_1.tar.gz
 /eclipse-cdt-fetched-src-libhover-R0_6_1.tar.gz
+/eclipse-cdt-fetched-src-v201106081058.tar.bz2
+/eclipse-cdt-fetched-src-autotools-dd3a8b8286575cba53fa95fff290fb708f843edd.tar.gz
+/eclipse-cdt-fetched-src-libhover-dd3a8b8286575cba53fa95fff290fb708f843edd.tar.gz
diff --git a/eclipse-cdt-libhover-libstdcxx.patch b/eclipse-cdt-libhover-libstdcxx.patch
new file mode 100644
index 0000000..8464c41
--- /dev/null
+++ b/eclipse-cdt-libhover-libstdcxx.patch
@@ -0,0 +1,15 @@
+diff -up ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml.fix ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml
+--- ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml.fix	2011-04-12 18:02:28.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover-feature/feature.xml	2011-04-12 18:02:50.000000000 -0400
+@@ -50,4 +50,11 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
++   <plugin
++         id="org.eclipse.linuxtools.cdt.libhover.libstdcxx"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/>
++
+ </feature>
diff --git a/eclipse-cdt-libhover-local-libstdcxx.patch b/eclipse-cdt-libhover-local-libstdcxx.patch
new file mode 100644
index 0000000..74ce78a
--- /dev/null
+++ b/eclipse-cdt-libhover-local-libstdcxx.patch
@@ -0,0 +1,23 @@
+diff -up ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties.fix ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties
+--- ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties.fix	2011-04-12 16:08:32.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/build.properties	2011-04-12 16:08:42.000000000 -0400
+@@ -1,6 +1,7 @@
+ bin.includes = META-INF/,\
+                plugin.xml,\
+                toc.xml,\
++               data/,\
+ 	       about.html,\
+                plugin.properties
+ src.includes = about.html,\
+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	2011-04-12 16:06:05.000000000 -0400
++++ ./org.eclipse.linuxtools.cdt.libhover.libstdcxx/plugin.xml	2011-04-12 16:06:27.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="./data/libstdc++-v3.libhover"
+             name="libstdc++ library"
+             type="C++">
+       </library>
diff --git a/eclipse-cdt-remove-shared-license.patch b/eclipse-cdt-remove-shared-license.patch
new file mode 100644
index 0000000..6ba3419
--- /dev/null
+++ b/eclipse-cdt-remove-shared-license.patch
@@ -0,0 +1,84 @@
+diff -up ./org.eclipse.cdt.build.crossgcc/feature.xml.fix ./org.eclipse.cdt.build.crossgcc/feature.xml
+--- ./org.eclipse.cdt.build.crossgcc/feature.xml.fix	2011-06-23 16:04:26.000000000 -0400
++++ ./org.eclipse.cdt.build.crossgcc/feature.xml	2011-06-23 16:04:33.000000000 -0400
+@@ -4,9 +4,7 @@
+       label="%featureName"
+       version="1.0.0.qualifier"
+       provider-name="%providerName"
+-      plugin="org.eclipse.cdt.build.crossgcc"
+-      license-feature="org.eclipse.cdt.license"
+-      license-feature-version="1.0.0.qualifier">
++      plugin="org.eclipse.cdt.build.crossgcc">
+ 
+    <description>
+       %description
+diff -up ./org.eclipse.cdt.bupc/feature.xml.fix ./org.eclipse.cdt.bupc/feature.xml
+--- ./org.eclipse.cdt.bupc/feature.xml.fix	2011-06-23 16:02:15.000000000 -0400
++++ ./org.eclipse.cdt.bupc/feature.xml	2011-06-23 16:02:46.000000000 -0400
+@@ -4,9 +4,7 @@
+       label="%featureName"
+       version="1.0.3.qualifier"
+       provider-name="%providerName"
+-      plugin="org.eclipse.cdt.managedbuilder.bupc.ui"
+-      license-feature="org.eclipse.cdt.license"
+-      license-feature-version="1.0.0.qualifier">
++      plugin="org.eclipse.cdt.managedbuilder.bupc.ui">
+ 
+    <description>
+       %description
+diff -up ./org.eclipse.cdt.debug.edc/feature.xml.fix ./org.eclipse.cdt.debug.edc/feature.xml
+--- ./org.eclipse.cdt.debug.edc/feature.xml.fix	2011-06-23 16:04:03.000000000 -0400
++++ ./org.eclipse.cdt.debug.edc/feature.xml	2011-06-23 16:04:10.000000000 -0400
+@@ -4,9 +4,7 @@
+       label="%featureName"
+       version="2.0.0.qualifier"
+       provider-name="%providerName"
+-      plugin="org.eclipse.cdt.debug.edc"
+-      license-feature="org.eclipse.cdt.license"
+-      license-feature-version="1.0.0.qualifier">
++      plugin="org.eclipse.cdt.debug.edc">
+ 
+    <description>
+       %description
+diff -up ./org.eclipse.cdt.debug.gdbjtag/feature.xml.fix ./org.eclipse.cdt.debug.gdbjtag/feature.xml
+--- ./org.eclipse.cdt.debug.gdbjtag/feature.xml.fix	2011-06-23 16:03:07.000000000 -0400
++++ ./org.eclipse.cdt.debug.gdbjtag/feature.xml	2011-06-23 16:03:15.000000000 -0400
+@@ -4,9 +4,7 @@
+       label="%featureName"
+       version="7.0.0.qualifier"
+       provider-name="%providerName"
+-      image="eclipse_update_120.jpg"
+-      license-feature="org.eclipse.cdt.license"
+-      license-feature-version="1.0.0.qualifier">
++      image="eclipse_update_120.jpg">
+ 
+    <description>
+       %description
+diff -up ./org.eclipse.cdt.launch.remote/feature.xml.fix ./org.eclipse.cdt.launch.remote/feature.xml
+--- ./org.eclipse.cdt.launch.remote/feature.xml.fix	2011-06-23 16:04:52.000000000 -0400
++++ ./org.eclipse.cdt.launch.remote/feature.xml	2011-06-23 16:04:58.000000000 -0400
+@@ -3,9 +3,7 @@
+       id="org.eclipse.cdt.launch.remote"
+       label="%featureName"
+       version="6.0.0.qualifier"
+-      provider-name="%providerName"
+-      license-feature="org.eclipse.cdt.license"
+-      license-feature-version="1.0.0.qualifier">
++      provider-name="%providerName">
+ 
+    <description>
+       %description
+diff -up ./org.eclipse.cdt.msw/feature.xml.fix ./org.eclipse.cdt.msw/feature.xml
+--- ./org.eclipse.cdt.msw/feature.xml.fix	2011-06-23 16:03:31.000000000 -0400
++++ ./org.eclipse.cdt.msw/feature.xml	2011-06-23 16:03:41.000000000 -0400
+@@ -3,9 +3,7 @@
+       id="org.eclipse.cdt.msw"
+       label="CDT Visual C++ Support"
+       version="1.0.0.qualifier"
+-      provider-name="Eclipse CDT"
+-      license-feature="org.eclipse.cdt.license"
+-      license-feature-version="1.0.0.qualifier">
++      provider-name="Eclipse CDT">
+ 
+    <description>
+       %description
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index cb90ce3..5a274d2 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -4,12 +4,12 @@ Epoch: 1
 
 %define run_tests               0
 %define ship_tests              0
-%define major                   7
+%define major                   8
 %define minor                   0       
 %define majmin                  %{major}.%{minor}
-%define micro                   1
+%define micro                   0
 %define eclipse_base            %{_libdir}/eclipse
-%define build_id		201009241320
+%define build_id		201106081058
 
 
 # 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-cdt_7_0_1.tar.bz2
+Source0: %{name}-fetched-src-v201106081058.tar.bz2
 Source4: fetch-cdt.sh
 
-Source1: %{name}-fetched-src-autotools-R0_6_1.tar.gz
+Source1: %{name}-fetched-src-autotools-dd3a8b8286575cba53fa95fff290fb708f843edd.tar.gz
 Source14: make-autotools-tarball.sh
 
-Source2: %{name}-fetched-src-libhover-R0_6_1.tar.gz
+Source2: %{name}-fetched-src-libhover-dd3a8b8286575cba53fa95fff290fb708f843edd.tar.gz
 Source15: make-libhover-tarball.sh
 
 ## The following tarball was generated thusly:
@@ -57,7 +57,6 @@ Source15: make-libhover-tarball.sh
 Source5: %{name}-runtests.sh
 
 # Libhover docs to place locally
-Source6: glibc-2.7-2.libhover
 Source7: libstdc++-v3.libhover
 
 # Autotools docs to place locally
@@ -81,13 +80,17 @@ Source13: ammacros-1.9.6.xml
 ## been removed in CDT 4.0.
 #Patch11: %{name}-cppunit-env-tab.patch
 
+# Remove extraneous shared license statements that point to non-existent
+# feature and were meant to be deleted.
+Patch12: %{name}-remove-shared-license.patch
+
 # Add XML -> HTML generation after running tests
 Patch13: %{name}-testaggregation.patch
 
-# Following are patches to supply libhover docs directory from the libhover
-# plugin and not require html to access them.
-Patch14: %{name}-libhover-local.patch
-Patch15: %{name}-libhover-local2.patch
+# Following are patches to build libhover libstdcxx plug-in and to supply
+# binary libhover data directly in the plug-in itself.
+Patch14: %{name}-libhover-local-libstdcxx.patch
+Patch15: %{name}-libhover-libstdcxx.patch
 
 # Patches for ppc64
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=272380
@@ -100,15 +103,12 @@ Patch16: %{name}-ppc64-add_ldflags.patch
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=272370
 Patch17: %{name}-ppc64-add_xopen_source-include.patch
 
-# Fix for bug 286162 - debug core logs spawner I/O exception
-Patch18: %{name}-debugSpawnerBug.patch
-
 # Following is a patch to autotools to supply macro hover docs locally
 # in the plugin.
 Patch19: %{name}-autotools-local.patch
 
-BuildRequires: eclipse-pde >= 3.6.0
-BuildRequires: eclipse-rse >= 3.1.1
+BuildRequires: eclipse-pde >= 1:3.7.0
+BuildRequires: eclipse-rse >= 3.2
 BuildRequires:  java-devel >= 1.4.2
 BuildRequires: objectweb-asm >= 3.2
 BuildRequires: lpg-java-compat
@@ -118,8 +118,8 @@ BuildRequires:  w3m
 %endif
 
 Requires:       gdb make gcc-c++ autoconf automake libtool
-Requires:       eclipse-platform >= 1:3.6.0
-Requires:	eclipse-rse >= 3.1.1
+Requires:       eclipse-platform >= 1:3.7.0
+Requires:	eclipse-rse >= 3.2.1
 Requires:	objectweb-asm >= 3.2
 
 ExclusiveArch: %{ix86} x86_64 ppc ia64 ppc64
@@ -164,13 +164,10 @@ pushd "org.eclipse.cdt.releng"
 pushd results/plugins
 %patch13
 popd
-pushd results/plugins/org.eclipse.cdt.core
-%patch18
+
+pushd results/features
+%patch12
 popd
-#pushd results/plugins/org.eclipse.cdt.core.tests
-#rm parser/org/eclipse/cdt/core/parser/tests/scanner/LexerTests.java
-#%patch14
-#popd
 
 # Only build the sdk
 offset=0; 
@@ -227,10 +224,9 @@ rm -rf org.eclipse.linuxtools.cdt.libhover.newlib
 rm -rf org.eclipse.linuxtools.cdt.libhover.newlib-feature
 %patch14 -p0
 %patch15 -p0
-pushd org.eclipse.linuxtools.cdt.libhover
-mkdir libhoverdocs
-pushd libhoverdocs
-cp %{SOURCE6} .
+pushd org.eclipse.linuxtools.cdt.libhover.libstdcxx
+mkdir data
+pushd data
 cp %{SOURCE7} .
 popd
 popd
@@ -294,9 +290,15 @@ PDEBUILDVERSION=$(ls %{eclipse_base}/dropins/sdk/plugins \
   | grep org.eclipse.pde.build_ | \
   sed 's/org.eclipse.pde.build_//')
 PDEDIR=%{eclipse_base}/dropins/sdk/plugins/org.eclipse.pde.build_$PDEBUILDVERSION
+
+
+LAUNCHERJAR=$(ls %{eclipse_base}/plugins \
+  | grep org.eclipse.equinox.launcher_)
+LAUNCHER=%{eclipse_base}/plugins/$LAUNCHERJAR
+
 # Call eclipse headless to process CDT releng build scripts
 pushd org.eclipse.cdt.releng 
-java -cp $SDK/startup.jar \
+java -jar $LAUNCHER \
      -Duser.home=$homedir                        \
      -DbuildId=%{build_id} \
      -DbranchVersion=%{version} \
@@ -324,7 +326,7 @@ unzip -o org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{bu
 
 ## Autotools build
 pushd autotools
-java -cp $SDK/startup.jar \
+java -jar $LAUNCHER \
      -Duser.home=$homedir                        \
      -XX:CompileCommand="exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" \
      -XX:CompileCommand="exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>" \
@@ -345,7 +347,7 @@ popd
 
 ## Libhover build
 pushd libhover
-java -cp $SDK/startup.jar \
+java -jar $LAUNCHER \
      -Duser.home=$homedir                        \
      -XX:CompileCommand="exclude,org/eclipse/core/internal/dtree/DataTreeNode,forwardDeltaWith" \
      -XX:CompileCommand="exclude,org/eclipse/jdt/internal/compiler/lookup/ParameterizedMethodBinding,<init>" \
@@ -383,10 +385,6 @@ rm -rf ${RPM_BUILD_ROOT}
 mkdir -p home
 homedir=$(cd home > /dev/null && pwd)
 
-LAUNCHERJAR=$(ls %{eclipse_base}/plugins \
-  | grep org.eclipse.equinox.launcher_)
-LAUNCHER=%{eclipse_base}/plugins/$LAUNCHERJAR
-
 installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
 parsersInstallDir=${installDir}-parsers
 sdkInstallDir=${installDir}-sdk
@@ -447,11 +445,15 @@ rm -rf $installDir/eclipse/plugins/net.sourceforge.*
 #unzip -qq -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/cdt build/rpmBuild/org.eclipse.cdt.cppunit.zip
 #popd
 
+P2LAUNCHERJAR=$(ls %{eclipse_base}/plugins \
+  | grep org.eclipse.equinox.launcher_)
+P2LAUNCHER=%{eclipse_base}/plugins/$P2LAUNCHERJAR
+
 # Generate p2 metadata for CDT
 pushd $installDir/eclipse
-java -jar $LAUNCHER \
+java -jar $P2LAUNCHER \
 -application \
-org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
+org.eclipse.equinox.p2.publisher.EclipseGenerator \
 -metadataRepository file:`pwd`/repo \
 -artifactRepository file:`pwd`/repo \
 -source `pwd` \
@@ -470,9 +472,9 @@ popd
 
 # Generate p2 metadata for CDT Parsers
 pushd $parsersInstallDir/eclipse
-java -jar $LAUNCHER \
+java -jar $P2LAUNCHER \
 -application \
-org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
+org.eclipse.equinox.p2.publisher.EclipseGenerator \
 -metadataRepository file:`pwd`/repo \
 -artifactRepository file:`pwd`/repo \
 -source `pwd` \
@@ -491,9 +493,9 @@ popd
 
 # Generate p2 metadata for CDT SDK
 pushd $sdkInstallDir/eclipse
-java -jar $LAUNCHER \
+java -jar $P2LAUNCHER \
 -application \
-org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
+org.eclipse.equinox.p2.publisher.EclipseGenerator \
 -metadataRepository file:`pwd`/repo \
 -artifactRepository file:`pwd`/repo \
 -source `pwd` \
@@ -575,6 +577,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Jun 23 2011 Jeff Johnston  <jjohnstn at redhat.com> 1:8.0.0-1
+- Rebase CDT to 8.0.0
+- Rebase Libhover and Autotools to 0.8 versions
+- Use org.eclipse.equinox.p2.publisher.EclipseGenerator
+- Switch to use org.eclipse.equinox.launcher instead of startup.jar
+- Use Eclipse 3.7
+ 
 * Wed Feb 16 2011 Jeff Johnston  <jjohnstn at redhat.com> 1:7.0.1-5
 - Add additional patch so glibc and libstdc++ libhover plug-ins reference
   local location for their libhover data.
diff --git a/fetch-cdt.sh b/fetch-cdt.sh
index 1b0f0ed..c5ba728 100755
--- a/fetch-cdt.sh
+++ b/fetch-cdt.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -x
 
-CDTTAG=cdt_7_0_1
+CDTTAG=v201106081058
 #ECLIPSEBASE=$(rpm --eval %{_libdir})/eclipse
 
 if test x`uname -i` = 'xi386'; then export plat=""; else export plat=-`uname -i`; fi
@@ -16,28 +16,28 @@ mkdir -p ws
 rm -rf sdk
 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
+#wget http://download.eclipse.org/eclipse/downloads/drops/S-3.7RC3-201105261708/eclipse-SDK-3.7RC3-linux-gtk${plat}.tar.gz
+cp ../../eclipse-SDK-3.7RC3-linux-gtk${plat}.tar.gz .
+tar -xzvf eclipse-SDK-3.7RC3-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
-pushd eclipse/plugins
-wget http://download.eclipse.org/technology/subversive/0.7/pde-update-site/plugins/org.eclipse.team.svn.pde.build_0.7.8.I20090525-1500.jar
+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
+#pushd eclipse/plugins
+#wget http://download.eclipse.org/technology/subversive/0.7/pde-update-site/plugins/org.eclipse.team.svn.pde.build_0.7.8.I20090525-1500.jar
+#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
+cvs -d:pserver:anonymous:guest:@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'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
+sed --in-place -e'99,99i\\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'99,99i\\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'61,61i\\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'61,61i\\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
 
 # 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 
@@ -49,8 +49,8 @@ popd
 
 pushd maps
 # 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
+sed --in-place -e "s,/cvsroot/tools,:pserver:anonymous:guest:@dev.eclipse.org/cvsroot/tools,g" cdt.map
+sed --in-place -e "s,/cvsroot/eclipse,:pserver:anonymous:guest:@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
diff --git a/make-autotools-tarball.sh b/make-autotools-tarball.sh
index b79121c..c4e1b82 100755
--- a/make-autotools-tarball.sh
+++ b/make-autotools-tarball.sh
@@ -5,10 +5,15 @@ echo $tag
 mkdir -p temp
 pushd temp
 rm -rf autotools
-svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/tags/$rel autotools
+git clone git://git.eclipse.org/gitroot/linuxtools/org.eclipse.linuxtools.git autotools
 pushd autotools
-pwd
-rm -rf org.eclipse.linuxtools.cdt.autotools.tests
-tar -czvf eclipse-cdt-fetched-src-autotools-$tag.tar.gz org.eclipse.linuxtools.cdt.autotools*
+git checkout -b local-branch $tag
+pushd autotools
+git rm -r org.eclipse.linuxtools.cdt.autotools.tests
+git rm -r org.eclipse.linuxtools.cdt.autotools.ui.tests
+git commit -m"Removing only in this branch"
+popd
+git archive --format=tar HEAD:autotools | gzip >eclipse-cdt-fetched-src-autotools-$tag.tar.gz
+cp eclipse-cdt-fetched-src-autotools-$tag.tar.gz ../..
 popd
 popd
diff --git a/make-libhover-tarball.sh b/make-libhover-tarball.sh
index 6a89008..52de27b 100755
--- a/make-libhover-tarball.sh
+++ b/make-libhover-tarball.sh
@@ -5,11 +5,10 @@ echo $tag
 mkdir -p temp
 pushd temp
 rm -rf libhover
-svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/libhover/tags/$rel libhover
+git clone git://git.eclipse.org/gitroot/linuxtools/org.eclipse.linuxtools.git libhover
 pushd libhover
-pwd
-# We don't want newlib libhover shipped unconditionally
-rm -rf org.eclipse.linuxtools.cdt.libhover.newlib*
-tar -czvf eclipse-cdt-fetched-src-libhover-$tag.tar.gz org.eclipse.linuxtools.cdt.libhover*
+git checkout -b local-branch $tag
+git archive --format=tar HEAD:libhover | gzip >eclipse-cdt-fetched-src-libhover-$tag.tar.gz
+cp eclipse-cdt-fetched-src-libhover-$tag.tar.gz ../..
 popd
 popd
diff --git a/sources b/sources
index d717a8e..1b42738 100644
--- a/sources
+++ b/sources
@@ -8,9 +8,6 @@
 4404043432f7f30300139ce39288ba93  ammacros-1.4-p6.xml
 f6edf5299e6f0d89017bd295a296c2cd  ammacros-1.9.5.xml
 f5c671311f49cdb33eaaa64ab6d781fa  ammacros-1.9.6.xml
-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
-e210eb0600d81609199667c2958c9983  eclipse-cdt-fetched-src-cdt_7_0_1.tar.bz2
-33d4062715041077b511bd94acc31e11  eclipse-cdt-fetched-src-autotools-R0_6_1.tar.gz
-8fc4a567257a8c001639f85ccd01f024  eclipse-cdt-fetched-src-libhover-R0_6_1.tar.gz
+38a2f459d5add216bed45c1ce951f9d2  eclipse-cdt-fetched-src-v201106081058.tar.bz2
+51fb443dfad61833f1ede2c69480c048  eclipse-cdt-fetched-src-autotools-dd3a8b8286575cba53fa95fff290fb708f843edd.tar.gz
+cc0494ab3381b994e7e584b372203c7f  eclipse-cdt-fetched-src-libhover-dd3a8b8286575cba53fa95fff290fb708f843edd.tar.gz

More information about the scm-commits mailing list