rpms/eclipse-cdt/devel .cvsignore, 1.36, 1.37 eclipse-cdt.spec, 1.93, 1.94 sources, 1.45, 1.46
Andrew Overholt (overholt)
fedora-extras-commits at redhat.com
Fri Aug 1 20:14:15 UTC 2008
Author: overholt
Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5524
Modified Files:
.cvsignore eclipse-cdt.spec sources
Log Message:
* Fri Aug 01 2008 Andrew Overholt <overholt at redhat.com> 5.0.0-1
- 5.0
- Add Mylyn sub-package
- Disable CPPUnit for now
- Disable autotools until a new snapshot is made that will build with 5.0
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore 7 Apr 2008 22:52:18 -0000 1.36
+++ .cvsignore 1 Aug 2008 20:13:45 -0000 1.37
@@ -12,4 +12,4 @@
eclipse-cdt-fetched-src-autotools-0_9_5_1.tar.gz
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_4_0_3.tar.bz2
+eclipse-cdt-fetched-src-cdt_5_0.tar.bz2
Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- eclipse-cdt.spec 17 Jul 2008 15:02:11 -0000 1.93
+++ eclipse-cdt.spec 1 Aug 2008 20:13:45 -0000 1.94
@@ -1,13 +1,15 @@
Epoch: 1
-%define gcj_support 1
-%define major 4
+%define gcj_support 0
+%define major 5
%define minor 0
%define majmin %{major}.%{minor}
-%define micro 3
-%define eclipse_base %{_datadir}/eclipse
-%define eclipse_lib_base %{_libdir}/eclipse
-%define build_id I200804041441
+%define micro 0
+%define eclipse_base %{_libdir}/eclipse
+%define build_id 200806171202
+
+# Prevent brp-java-repack-jars from being run.
+%define __jar_repack 0
# All arches line up except i386 -> x86
%ifarch %{ix86}
@@ -19,96 +21,59 @@
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 2%{?dist}
+Release: 1%{?dist}
License: EPL and CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
Requires: eclipse-platform
-# The following tarball was generated as follows. Note that the optional c99 and upc parsers plus the
-# optional xlc support features have been removed.
-#
-#mkdir -p temp && cd temp
-#mkdir -p home
-#rm -rf org.eclipse.cdt-releng
-#cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CDT_4_0_3 org.eclipse.cdt-releng/org.eclipse.cdt.releng
-#cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/
-#sed --in-place 's/home/cvsroot/' maps/cdt.map
-# The build.xml doesn't fetch master or testing features so we must add this ourselves.
-#sed --in-place -e'87,87i\\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'87,87i\\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'69,69i\\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'69,69i\\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'130,132d' build.xml
-#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 \
-# -DcdtTag=CDT_4_0_3 \
-# -DdontUnzip=true fetch
-#find . -name net.*.jar -exec rm {} \;
-# Unfortunately for us, bringing in the master feature also drags in the c99 and upc features. We must
-# remove them because they depend on the binary jar we just removed and build will note this, even if we
-# don't build those features.
-#pushd results/features
-#rm -rf *c99*
-#rm -rf *upc*
-#popd
-#pushd results/plugins
-#rm -rf *c99*
-#rm -rf *upc*
-#popd
-# Remove optional features: c99, upc, and xlc from the master feature list. We do not package them.
-#pushd results/features/org.eclipse.cdt.master
-#sed --in-place -e "44,47d" feature.xml
-#sed --in-place -e "24,31d" feature.xml
-#popd
-#cd .. && tar jcf eclipse-cdt-fetched-src-CDT_4_0_3.tar.bz2 org.eclipse.cdt.releng
-#
+# The following tarball was generated using the included fetch-cdt.sh
+# script. Note that the optional c99 and upc parsers plus the optional
+# xlc support features have been removed.
-Source0: %{name}-fetched-src-CDT_4_0_3.tar.bz2
+Source0: %{name}-fetched-src-cdt_5_0.tar.bz2
+Source4: fetch-cdt.sh
Source1: http://sources.redhat.com/eclipse/autotools/eclipse-cdt-fetched-src-autotools-0_9_6.tar.gz
-# The following tarball was generated thusly:
+## The following tarball was generated thusly:
+##
+## mkdir temp && cd temp
+## cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CPPUnit_20061102 \
+## org.eclipse.cdt-cppunit/org.eclipse.cdt.cppunit \
+## org.eclipse.cdt-cppunit/org.eclipse.cdt.cppunit-feature
+## cd org.eclipse.cdt-cppunit
+## tar -czvf eclipse-cdt-cppunit-20061102.tar.gz org.eclipse.cdt.cppunit*
#
-# mkdir temp && cd temp
-# cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/tools export -r CPPUnit_20061102 \
-# org.eclipse.cdt-cppunit/org.eclipse.cdt.cppunit \
-# org.eclipse.cdt-cppunit/org.eclipse.cdt.cppunit-feature
-# cd org.eclipse.cdt-cppunit
-# tar -czvf eclipse-cdt-cppunit-20061102.tar.gz org.eclipse.cdt.cppunit*
-
-Source2: %{name}-cppunit-20061102.tar.gz
+#Source2: %{name}-cppunit-20061102.tar.gz
# Binary gif file that is currently missing from the CDT. Since
# binary patches are not possible, the gif is included as a source file.
-
Source3: %{name}-target_filter.gif.gz
-# 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-4.0.3.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.
-Patch8: %{name}-cppunit-ui.patch
-# Patch to upgrade version number for cppunit feature.
-Patch9: %{name}-cppunit-feature.patch
-# Patch to fix default paths used by cppunit wizards to find header files and
-# libraries.
-Patch10: %{name}-cppunit-default-location.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
+Patch4: %{name}-no-tests-%{version}.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.
+#Patch8: %{name}-cppunit-ui.patch
+## Patch to upgrade version number for cppunit feature.
+#Patch9: %{name}-cppunit-feature.patch
+## Patch to fix default paths used by cppunit wizards to find header files and
+## libraries.
+#Patch10: %{name}-cppunit-default-location.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
+
# Remove include of stropts.h in openpty.c as it is no longer included
# in glibc-headers package
Patch12: %{name}-openpty.patch
BuildRequires: eclipse-pde
+BuildRequires: eclipse-mylyn
%if %{gcj_support}
BuildRequires: gcc-java >= 4.0.2
BuildRequires: java-gcj-compat-devel >= 1.0.64
@@ -119,8 +84,8 @@
BuildRequires: java-devel >= 1.4.2
%endif
-Requires: gdb make gcc-c++ autoconf automake eclipse-cvs-client
-Requires: eclipse-platform >= 1:3.3.0
+Requires: gdb make gcc-c++ autoconf automake
+Requires: eclipse-platform >= 1:3.4.0
# Currently, upstream CDT only supports building on the platforms listed here.
%if %{gcj_support}
@@ -130,22 +95,44 @@
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%package sdk
+%description
+Eclipse features and plugins that are useful for C and C++ development.
+
+%package mylyn
Summary: Eclipse C/C++ Development Tools (CDT) SDK plugin
Group: Text Editors/Integrated Development Environments (IDE)
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: eclipse-mylyn
-%description
-The eclipse-cdt package contains Eclipse features and plugins that are
-useful for C and C++ development.
+%description mylyn
+Mylyn integration for CDT.
+
+%package sdk
+Summary: Eclipse C/C++ Development Tools (CDT) SDK plugin
+Group: Text Editors/Integrated Development Environments (IDE)
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description sdk
Source for Eclipse CDT for use within Eclipse.
%prep
%setup -q -c
+
+%patch4
+
pushd "org.eclipse.cdt.releng"
-%patch1 -p0
+
+# Remove lpg-using lrparser feature
+sed -i "36,39d" results/features/org.eclipse.cdt.master/feature.xml
+
+# Remove lrparser plugin
+rm -rf results/plugins/org.eclipse.cdt.core.lrparser
+
+# 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
# Only build the sdk
offset=0;
for line in $(grep -no "value=.*platform" build.xml); do
@@ -167,190 +154,157 @@
sed --in-place -e "74,82d" build.properties
sed --in-place -e "s:configs=.*\\\:configs=linux,gtk,%{eclipse_arch}:" build.properties
popd
-%patch4 -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
tar -xzf %{SOURCE3}
popd
-# 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
-popd
-
-# Autotools stuff
-
-mkdir autotools
-pushd autotools
-tar -xzf %{SOURCE1}
popd
-# Cppunit stuff
+## Autotools stuff
+#mkdir autotools
+#pushd autotools
+#tar -xzf %{SOURCE1}
+#popd
-mkdir cppunit
-pushd cppunit
-tar -xzf %{SOURCE2}
-%patch8 -p0
-%patch9 -p0
-%patch10 -p0
-%patch11 -p0
-popd
+## Cppunit stuff
+#
+#mkdir cppunit
+#pushd cppunit
+#tar -xzf %{SOURCE2}
+#%patch8 -p0
+#%patch9 -p0
+#%patch10 -p0
+#%patch11 -p0
+#popd
# Upstream CVS includes random .so files. Let's remove them now.
# We actually remove the entire "os" directory since otherwise
# we wind up with some empty directories that we don't want.
#rm -r org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.linux/os
+find -name \*.so | xargs rm -rf
+
%build
export JAVA_HOME=%{java_home}
export PATH=%{java_bin}:/usr/bin:$PATH
# See comments in the script to understand this.
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
+/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK \
+ %{eclipse_base} mylyn xmlrpc codec httpclient lang
SDK=$(cd SDK >/dev/null && pwd)
# Eclipse may try to write to the home directory.
mkdir home
-
homedir=$(cd home > /dev/null && pwd)
pushd org.eclipse.cdt.releng/results/plugins/org.eclipse.cdt.core.linux/library
make JAVA_HOME="%{java_home}" ARCH=%{eclipse_arch} CC='gcc -D_GNU_SOURCE'
popd
+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
# Call eclipse headless to process CDT releng build scripts
pushd org.eclipse.cdt.releng
-java -cp $SDK/startup.jar \
- -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
- -Duser.home=$homedir \
- org.eclipse.core.launcher.Main \
+eclipse -nosplash\
+ -Duser.home=$homedir \
+ -DbuildId=%{build_id} \
+ -DbranchVersion=%{version} \
+ -DforceContextQualifier=%{build_id} \
-application org.eclipse.ant.core.antRunner \
+ -DbuildId=%{build_id} \
+ -DbranchVersion=%{version} \
+ -DforceContextQualifier=%{build_id} \
-DjavacFailOnError=true \
-DdontUnzip=true \
-DbaseLocation=$SDK \
- -Dpde.build.scripts=%{eclipse_base}/plugins/org.eclipse.pde.build/scripts \
+ -Dpde.build.scripts=$PDEDIR/scripts \
-DdontFetchAnything=true \
-DskipFetch=true
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
-
-# Autotools build
-pushd autotools
-java -cp $SDK/startup.jar \
- -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
- -Duser.home=$homedir \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Dtype=feature \
- -Did=com.redhat.eclipse.cdt.autotools.feature \
- -DsourceDirectory=$(pwd) \
- -DbaseLocation=$SDK \
- -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
- -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
+## 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
-popd
+## 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
-# Cppunit build
-pushd cppunit
-java -cp $SDK/startup.jar \
- -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
- -Duser.home=$homedir \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Dtype=feature \
- -Did=org.eclipse.cdt.cppunit \
- -DsourceDirectory=$(pwd) \
- -DbaseLocation=$SDK \
- -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \
- -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
+## Cppunit build
+#pushd cppunit
+#java -cp $SDK/startup.jar \
+# -Duser.home=$homedir \
+# org.eclipse.core.launcher.Main \
+# -application org.eclipse.ant.core.antRunner \
+# -Dtype=feature \
+# -Did=org.eclipse.cdt.cppunit \
+# -DsourceDirectory=$(pwd) \
+# -DbaseLocation=$SDK \
+# -Dbuilder=$PDEDIR/templates/package-build \
+# -f $PDEDIR/scripts/build.xml
+#popd
-popd
%install
rm -rf ${RPM_BUILD_ROOT}
-install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
+installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
+mylynInstallDir=${installDir}-mylyn
+sdkInstallDir=${installDir}-sdk
+install -d -m755 $installDir
+install -d -m755 $mylynInstallDir
+install -d -m755 $sdkInstallDir
unzip org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{build_id}.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*
-
-# Unpack all existing feature jars
-for x in ${RPM_BUILD_ROOT}/%{eclipse_base}/features/*.jar; do
- dirname=`echo $x | sed -e 's:\\(.*\\)\\.jar:\\1:g'`
- mkdir -p $dirname
- unzip $x -d $dirname
- rm $x
-done
-
-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.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.xlc*
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.make.xlc*
-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}/plugins/org.eclipse.cdt.errorparsers.xlc*
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.parser.c99*
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.parser.upc*
-# FIXME: figure out why these plugins are built despite our previous efforts.
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.aix*
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.macosx*
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.qnx*
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.solaris*
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.win32*
-# FIXME: kludge to remove linux arch plugins we don't want. Again, figure
-# out why they are being built and stop them.
-mkdir -p tempdir
-mv ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}_4* tempdir
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/plugins/org.eclipse.cdt.core.linux.*
-mv tempdir/* ${RPM_BUILD_ROOT}%{eclipse_base}/plugins
-rm -rf tempdir
-
-# Remove optional parser features that require lpgruntime binary jar we already
-# removed.
-rm -rf ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.core.parser.c99*
-rm -rf ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.core.parser.upc*
-rm -rf ${RPM_BUILD_ROOT}%{eclipse_base}/features/org.eclipse.cdt.xlc*
-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
-pushd ${RPM_BUILD_ROOT}
-mkdir -p .%{_libdir}/eclipse/plugins
-for archplugin in $(find .%{eclipse_base}/plugins -name \*%{eclipse_arch}_%{majmin}\*); do
- mv $archplugin .%{_libdir}/eclipse/plugins
- chmod -R 755 .%{_libdir}/eclipse/plugins/$(basename $archplugin)
-done
-popd
+-d $installDir
-# These are in the SDK packages
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/epl-v10.html
-rm ${RPM_BUILD_ROOT}%{eclipse_base}/notice.html
-
-# Autotools install
-pushd autotools
-unzip -qq -d $RPM_BUILD_ROOT%{eclipse_base}/.. build/rpmBuild/com.redhat.eclipse.cdt.autotools.feature.zip
-popd
+# FIXME: why were we doing this? why, if I do this, does my logfile
+# have entries like:
+# Error reading feature
+# file:/usr/lib64/eclipse/dropins/cdt/features/org.eclipse.cdt_5.0.0.200808011601.jar
+#
+## Unpack all existing feature jars
+#for x in $installDir/features/*.jar; do
+# dirname=`echo $x | sed -e 's:\\(.*\\)\\.jar:\\1:g'`
+# mkdir -p $dirname
+# unzip $x -d $dirname
+# rm $x
+#done
+
+## Autotools install
+#pushd autotools
+#unzip -qq -d $installDir build/rpmBuild/com.redhat.eclipse.cdt.autotools.feature.zip
+#popd
-# Cppunit install
-pushd cppunit
-unzip -qq -d $RPM_BUILD_ROOT%{eclipse_base}/.. build/rpmBuild/org.eclipse.cdt.cppunit.zip
-popd
+mkdir $mylynInstallDir/features $mylynInstallDir/plugins
+mv $installDir/features/*mylyn* $mylynInstallDir/features
+mv $installDir/plugins/*mylyn* $mylynInstallDir/plugins
+
+mkdir $sdkInstallDir/features $sdkInstallDir/plugins
+mv $installDir/features/*source* $sdkInstallDir/features
+mv $installDir/plugins/*source* $sdkInstallDir/plugins
+mv $installDir/features/*sdk* $sdkInstallDir/features
+mv $installDir/plugins/*sdk* $sdkInstallDir/plugins
+
+## Cppunit install
+#pushd cppunit
+#unzip -qq -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/cdt build/rpmBuild/org.eclipse.cdt.cppunit.zip
+#popd
%if %{gcj_support}
aot-compile-rpm
@@ -375,37 +329,26 @@
%files
%defattr(-,root,root)
-%{eclipse_base}/features/org.eclipse.cdt_*
-%{eclipse_base}/features/com.redhat.eclipse.cdt*
-%{eclipse_base}/features/org.eclipse.cdt.cppunit_*
-%{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.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*
-%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder*
-%{eclipse_base}/plugins/org.eclipse.cdt.refactoring*
-%{eclipse_base}/plugins/org.eclipse.cdt.ui*
-%{eclipse_base}/plugins/com.redhat.eclipse.cdt*
-%{_libdir}/eclipse/plugins/org.eclipse.cdt.core*
+%{eclipse_base}/dropins/cdt
%if %{gcj_support}
%{_libdir}/gcj/%{name}
%endif
-%doc %{eclipse_base}/features/org.eclipse.cdt.cppunit_*/cpl-v10.html
%files sdk
%defattr(-,root,root)
-%{eclipse_base}/features/org.eclipse.cdt.sdk*
-%{eclipse_base}/features/org.eclipse.cdt.source*
-%{eclipse_base}/plugins/org.eclipse.cdt.source*
-%{eclipse_base}/plugins/org.eclipse.cdt.sdk*
-%{_libdir}/eclipse/plugins/org.eclipse.cdt.source*
+%{eclipse_base}/dropins/cdt-sdk
+
+%files mylyn
+%defattr(-,root,root)
+%{eclipse_base}/dropins/cdt-mylyn
%changelog
+* Fri Aug 01 2008 Andrew Overholt <overholt at redhat.com> 5.0.0-1
+- 5.0
+- Add Mylyn sub-package
+- Disable CPPUnit for now
+- Disable autotools until a new snapshot is made that will build with 5.0
+
* Thu Jul 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> 4.0.3-2
- fix license tag
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources 7 Apr 2008 22:52:18 -0000 1.45
+++ sources 1 Aug 2008 20:13:45 -0000 1.46
@@ -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
-273aa5c2f1022a700f88d02b13d4e1ca eclipse-cdt-fetched-src-CDT_4_0_3.tar.bz2
+d4d38c52dc74a0d5bdaceada1f723165 eclipse-cdt-fetched-src-cdt_5_0.tar.bz2
More information about the fedora-extras-commits
mailing list