rpms/eclipse-cdt/devel .cvsignore, 1.38, 1.39 eclipse-cdt.spec, 1.108, 1.109 make-autotools-tarball.sh, 1.2, 1.3 sources, 1.47, 1.48
Jeff Johnston
jjohnstn at fedoraproject.org
Wed Oct 15 23:09:18 UTC 2008
Author: jjohnstn
Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12466
Modified Files:
.cvsignore eclipse-cdt.spec make-autotools-tarball.sh sources
Log Message:
* Wed Oct 15 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-7
- Change to use new linuxtools version of autotools-1.0.1.
- Add build of libhover plugins again from linuxtools.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore 8 Aug 2008 22:07:16 -0000 1.38
+++ .cvsignore 15 Oct 2008 23:08:47 -0000 1.39
@@ -15,3 +15,5 @@
eclipse-cdt-fetched-src-cdt_5_0.tar.bz2
eclipse-cdt-fetched-src-autotools-1_0_0.tar.gz
eclipse-cdt-fetched-src-CDT_5_0_0.tar.bz2
+eclipse-cdt-fetched-src-autotools-1_0_1.tar.gz
+eclipse-cdt-fetched-src-libhover-1_0_0.tar.gz
Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- eclipse-cdt.spec 11 Sep 2008 20:12:01 -0000 1.108
+++ eclipse-cdt.spec 15 Oct 2008 23:08:47 -0000 1.109
@@ -20,7 +20,7 @@
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 6%{?dist}
+Release: 7%{?dist}
License: EPL and CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
@@ -34,7 +34,9 @@
Source0: %{name}-fetched-src-CDT_5_0_0.tar.bz2
Source4: fetch-cdt.sh
-Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-1_0_0.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-1_0_1.tar.gz
+
+Source2: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-libhover-1_0_0.tar.gz
## The following tarball was generated thusly:
##
@@ -57,12 +59,6 @@
# Don't run the tests as part of the build. We'll do this ourselves.
Patch4: %{name}-no-tests-%{version}.patch
-# Fix autotools plugin to reference correct project nature.
-Patch5: %{name}-autotools-plugin.patch
-
-# Fix for autotools property settings problem.
-Patch6: %{name}-autotools-bug461647.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.
@@ -206,13 +202,14 @@
## Autotools stuff
mkdir autotools
-
pushd autotools
tar -xzf %{SOURCE1}
-pushd com.redhat.eclipse.cdt.autotools
-%patch5
-%patch6
popd
+
+## Libhover stuff
+mkdir libhover
+pushd libhover
+tar -xzf %{SOURCE2}
popd
## Cppunit stuff
@@ -297,7 +294,26 @@
-application org.eclipse.ant.core.antRunner \
-Duser.home=$homedir \
-Dtype=feature \
- -Did=com.redhat.eclipse.cdt.autotools.feature \
+ -Did=org.eclipse.linuxtools.cdt.autotools.feature \
+ -DsourceDirectory=$(pwd) \
+ -DbaseLocation=$SDK \
+ -Dbuilder=$PDEDIR/templates/package-build \
+ -f $PDEDIR/scripts/build.xml
+popd
+
+## Libhover build
+pushd libhover
+java -cp $SDK/startup.jar \
+ -Duser.home=$homedir \
+ -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 \
+ -application org.eclipse.ant.core.antRunner \
+ -Duser.home=$homedir \
+ -Dtype=feature \
+ -Did=org.eclipse.linuxtools.cdt.libhover.feature \
-DsourceDirectory=$(pwd) \
-DbaseLocation=$SDK \
-Dbuilder=$PDEDIR/templates/package-build \
@@ -348,7 +364,12 @@
# Autotools install
pushd autotools
-unzip -qq -d $installDir build/rpmBuild/com.redhat.eclipse.cdt.autotools.feature.zip
+unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.autotools.feature.zip
+popd
+
+# Libhover install
+pushd libhover
+unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.feature.zip
popd
mkdir -p $mylynInstallDir/eclipse/features $mylynInstallDir/eclipse/plugins
@@ -528,6 +549,10 @@
%endif
%changelog
+* Wed Oct 15 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-7
+- Change to use new linuxtools version of autotools-1.0.1.
+- Add build of libhover plugins again from linuxtools.
+
* Tue Sep 09 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-6
- Fix for NPE during alteration of Autotools configuration settings.
- Resolves #461647
Index: make-autotools-tarball.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/make-autotools-tarball.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- make-autotools-tarball.sh 19 Jul 2007 22:18:29 -0000 1.2
+++ make-autotools-tarball.sh 15 Oct 2008 23:08:47 -0000 1.3
@@ -1,9 +1,12 @@
#!/bin/sh
rel=$1
tag=`echo $rel | sed -e 's/\./_/g'`
+echo $tag
mkdir -p temp && cd temp
rm -rf autotools
-cvs -d:pserver:anonymous at sources.redhat.com:/cvs/eclipse export -r $tag autotools/com.redhat.eclipse.cdt.autotools autotools/com.redhat.eclipse.cdt.autotools-docs autotools/com.redhat.eclipse.cdt.autotools.feature
+svn export svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/autotools/tags/$rel autotools
cd autotools
-tar -czvf eclipse-cdt-fetched-src-$tag.tar.gz com.redhat.eclipse.cdt.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*
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources 8 Aug 2008 22:07:16 -0000 1.47
+++ sources 15 Oct 2008 23:08:47 -0000 1.48
@@ -1,4 +1,5 @@
5c470fb0777d27541edbfa31443d91f7 eclipse-cdt-cppunit-20061102.tar.gz
2d4ae0a2131ba1efc896d981072cc091 eclipse-cdt-target_filter.gif.gz
-c1fb4f28bd7cd3e4873229a94b8ee5fa eclipse-cdt-fetched-src-autotools-1_0_0.tar.gz
8958a138a5d96c9c1fa892e895b29bcd eclipse-cdt-fetched-src-CDT_5_0_0.tar.bz2
+97035338f49f40212ad411ee43065939 eclipse-cdt-fetched-src-autotools-1_0_1.tar.gz
+3c0f7f6b7d1686e5aa360762b6c8b379 eclipse-cdt-fetched-src-libhover-1_0_0.tar.gz
More information about the scm-commits
mailing list