rpms/eclipse-cdt/devel .cvsignore, 1.37, 1.38 eclipse-cdt.spec, 1.98, 1.99 fetch-cdt.sh, 1.1, 1.2 sources, 1.46, 1.47
Jeff Johnston (jjohnstn)
fedora-extras-commits at redhat.com
Fri Aug 8 22:07:46 UTC 2008
- Previous message (by thread): rpms/gcompris/devel .cvsignore, 1.14, 1.15 gcompris.spec, 1.35, 1.36 sources, 1.15, 1.16 gcompris-8.4.5-prefix.patch, 1.1, NONE
- Next message (by thread): rpms/rpmlint/EL-5 rpmlint.spec,1.36,1.37
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jjohnstn
Update of /cvs/extras/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2075
Modified Files:
.cvsignore eclipse-cdt.spec fetch-cdt.sh sources
Log Message:
* Fri Aug 08 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-2
- Add autotools 1.0.0 which supports CDT 5.0.
- Use java -cp to build cdt and autotools instead of eclipse -nosplash.
- Replace fetched source with CDT_5_0_0 tagged sources.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore 1 Aug 2008 20:13:45 -0000 1.37
+++ .cvsignore 8 Aug 2008 22:07:16 -0000 1.38
@@ -13,3 +13,5 @@
eclipse-cdt-fetched-src-autotools-0_9_5_3.tar.gz
eclipse-cdt-fetched-src-autotools-0_9_6.tar.gz
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
Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- eclipse-cdt.spec 6 Aug 2008 21:56:49 -0000 1.98
+++ eclipse-cdt.spec 8 Aug 2008 22:07:16 -0000 1.99
@@ -6,7 +6,7 @@
%define majmin %{major}.%{minor}
%define micro 0
%define eclipse_base %{_libdir}/eclipse
-%define build_id 200806171202
+%define build_id 200808081650
# All arches line up except i386 -> x86
%ifarch %{ix86}
@@ -18,7 +18,7 @@
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: EPL and CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
@@ -29,10 +29,10 @@
# script. Note that the optional c99 and upc parsers plus the optional
# xlc support features have been removed.
-Source0: %{name}-fetched-src-cdt_5_0.tar.bz2
+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-0_9_6.tar.gz
+Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-1_0_0.tar.gz
## The following tarball was generated thusly:
##
@@ -70,7 +70,7 @@
Patch12: %{name}-openpty.patch
BuildRequires: eclipse-pde
-BuildRequires: eclipse-mylyn
+BuildRequires: eclipse-mylyn >= 3.0
%if %{gcj_support}
BuildRequires: gcc-java >= 4.0.2
BuildRequires: java-gcj-compat-devel >= 1.0.64
@@ -99,7 +99,7 @@
Summary: Eclipse C/C++ Development Tools (CDT) SDK plugin
Group: Text Editors/Integrated Development Environments (IDE)
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: eclipse-mylyn
+Requires: eclipse-mylyn >= 3.0
%description mylyn
Mylyn integration for CDT.
@@ -161,10 +161,10 @@
popd
## Autotools stuff
-#mkdir autotools
-#pushd autotools
-#tar -xzf %{SOURCE1}
-#popd
+mkdir autotools
+pushd autotools
+tar -xzf %{SOURCE1}
+popd
## Cppunit stuff
#
@@ -207,12 +207,18 @@
PDEDIR=%{eclipse_base}/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_$PDEBUILDVERSION
# Call eclipse headless to process CDT releng build scripts
pushd org.eclipse.cdt.releng
-eclipse -nosplash\
+java -cp $SDK/startup.jar \
-Duser.home=$homedir \
-DbuildId=%{build_id} \
-DbranchVersion=%{version} \
-DforceContextQualifier=%{build_id} \
+-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 \
+ -consolelog \
-DbuildId=%{build_id} \
-DbranchVersion=%{version} \
-DforceContextQualifier=%{build_id} \
@@ -225,23 +231,27 @@
popd
## Autotools has dependencies on CDT so we must add these to the SDK directory
-#unzip -o org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{build_id}.zip -d $SDK
+unzip -o org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{build_id}.zip -d $SDK
## Autotools build
-#pushd autotools
-#java -cp $SDK/startup.jar \
-# -Duser.home=$homedir \
-# org.eclipse.core.launcher.Main \
-# -application org.eclipse.ant.core.antRunner \
-# -Duser.home=$homedir \
-# -Dtype=feature \
-# -Did=com.redhat.eclipse.cdt.autotools.feature \
-# -DsourceDirectory=$(pwd) \
-# -DbaseLocation=$SDK \
-# -Dbuilder=$PDEDIR/templates/package-build \
-# -f $PDEDIR/scripts/build.xml
-#
-#popd
+pushd autotools
+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=com.redhat.eclipse.cdt.autotools.feature \
+ -DsourceDirectory=$(pwd) \
+ -DbaseLocation=$SDK \
+ -Dbuilder=$PDEDIR/templates/package-build \
+ -f $PDEDIR/scripts/build.xml
+
+popd
## Cppunit build
#pushd cppunit
@@ -282,9 +292,9 @@
done
## Autotools install
-#pushd autotools
-#unzip -qq -d $installDir build/rpmBuild/com.redhat.eclipse.cdt.autotools.feature.zip
-#popd
+pushd autotools
+unzip -qq -d $installDir/eclipse build/rpmBuild/com.redhat.eclipse.cdt.autotools.feature.zip
+popd
mkdir -p $mylynInstallDir/eclipse/features $mylynInstallDir/eclipse/plugins
mv $installDir/eclipse/features/*mylyn* $mylynInstallDir/eclipse/features
@@ -408,6 +418,11 @@
%{eclipse_base}/dropins/cdt-mylyn
%changelog
+* Fri Aug 08 2008 Jeff Johnston <jjohnstn at redhat.com> 5.0.0-2
+- Add autotools 1.0.0 which supports CDT 5.0.
+- Use java -cp to build cdt and autotools instead of eclipse -nosplash.
+- Replace fetched source with CDT_5_0_0 tagged sources.
+
* Wed Aug 06 2008 Andrew Overholt <overholt at redhat.com> 5.0.0-1
- Remove master and testing features
- Move files to dropins/cdt{,-mylyn,-sdk}/eclipse
Index: fetch-cdt.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/fetch-cdt.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fetch-cdt.sh 8 Aug 2008 13:15:51 -0000 1.1
+++ fetch-cdt.sh 8 Aug 2008 22:07:16 -0000 1.2
@@ -1,10 +1,11 @@
#!/bin/sh
-CDTTAG=cdt_5_0
+CDTTAG=CDT_5_0_0
ECLIPSEBASE=$(rpm --eval %{_libdir})/eclipse
mkdir -p temp && cd temp
mkdir -p home
+mkdir -p ws
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/
@@ -18,11 +19,17 @@
# Remove copying of binary jar in build.xml. We remove this jar so this operation will fail.
sed --in-place -e'143,145d' build.xml
-PDEBUILDVERSION=$(ls $ECLIPSEBASE/dropins/sdk/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
-eclipse -nosplash -Duser.home=../../home \
+PDEBUILDVERSION=$(ls $ECLIPSEBASE/dropins/sdk/eclipse/plugins | grep pde.build_ | sed 's/org.eclipse.pde.build_//')
+java -cp /usr/lib/eclipse/startup.jar \
+ -Duser.home=../../home \
+-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 \
-application org.eclipse.ant.core.antRunner \
-buildfile build.xml -DbaseLocation=$ECLIPSEBASE \
- -Dpde.build.scripts=$ECLIPSEBASE/dropins/sdk/plugins/org.eclipse.pde.build_$PDEBUILDVERSION/scripts \
-DcdtTag=$CDTTAG \
-DdontUnzip=true fetch
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources 1 Aug 2008 20:13:45 -0000 1.46
+++ sources 8 Aug 2008 22:07:16 -0000 1.47
@@ -1,4 +1,4 @@
5c470fb0777d27541edbfa31443d91f7 eclipse-cdt-cppunit-20061102.tar.gz
2d4ae0a2131ba1efc896d981072cc091 eclipse-cdt-target_filter.gif.gz
-57431d9bcdd58de7de3ef3560a0bf911 eclipse-cdt-fetched-src-autotools-0_9_6.tar.gz
-d4d38c52dc74a0d5bdaceada1f723165 eclipse-cdt-fetched-src-cdt_5_0.tar.bz2
+c1fb4f28bd7cd3e4873229a94b8ee5fa eclipse-cdt-fetched-src-autotools-1_0_0.tar.gz
+8958a138a5d96c9c1fa892e895b29bcd eclipse-cdt-fetched-src-CDT_5_0_0.tar.bz2
- Previous message (by thread): rpms/gcompris/devel .cvsignore, 1.14, 1.15 gcompris.spec, 1.35, 1.36 sources, 1.15, 1.16 gcompris-8.4.5-prefix.patch, 1.1, NONE
- Next message (by thread): rpms/rpmlint/EL-5 rpmlint.spec,1.36,1.37
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list