rpms/eclipse-cdt/F-12 eclipse-cdt.spec, 1.134, 1.135 fetch-cdt.sh, 1.6, 1.7 sources, 1.56, 1.57
Jeff Johnston
jjohnstn at fedoraproject.org
Wed Oct 14 19:34:07 UTC 2009
- Previous message (by thread): rpms/dnssec-conf/devel .cvsignore, 1.9, 1.10 dnssec-conf.spec, 1.17, 1.18 sources, 1.10, 1.11
- Next message (by thread): rpms/eclipse-cdt/devel eclipse-cdt.spec, 1.135, 1.136 fetch-cdt.sh, 1.7, 1.8 sources, 1.56, 1.57
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jjohnstn
Update of /cvs/extras/rpms/eclipse-cdt/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1122
Modified Files:
eclipse-cdt.spec fetch-cdt.sh sources
Log Message:
* Wed Oct 14 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.1-2
- Ship new parsers sub-package which includes xlc, upc, and lrparser plug-ins.
- Require lpg-java-compat for build.
Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/eclipse-cdt.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -p -r1.134 -r1.135
--- eclipse-cdt.spec 9 Oct 2009 21:27:43 -0000 1.134
+++ eclipse-cdt.spec 14 Oct 2009 19:34:06 -0000 1.135
@@ -22,7 +22,7 @@ Epoch: 1
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
@@ -106,6 +106,7 @@ BuildRequires: eclipse-pde
BuildRequires: eclipse-mylyn >= 3.0
BuildRequires: eclipse-rse >= 3.0
BuildRequires: java-devel >= 1.4.2
+BuildRequires: lpg-java-compat
%if %{run_tests}
BuildRequires: vnc-server
BuildRequires: w3m
@@ -130,6 +131,15 @@ Requires: eclipse-mylyn >= 3.0
%description mylyn
Mylyn integration for CDT.
+%package parsers
+Summary: Eclipse C/C++ Development Tools (CDT) SDK plugin
+Group: Text Editors/Integrated Development Environments (IDE)
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: lpg-java-compat
+
+%description parsers
+Optional language-variant parsers for the CDT.
+
%package sdk
Summary: Eclipse C/C++ Development Tools (CDT) SDK plugin
Group: Text Editors/Integrated Development Environments (IDE)
@@ -155,10 +165,10 @@ Test suite for Eclipse C/C++ Development
pushd "org.eclipse.cdt.releng"
# Remove lpg-using lrparser feature
-sed -i "36,39d" results/features/org.eclipse.cdt.master/feature.xml
+#sed -i "36,39d" results/features/org.eclipse.cdt.master/feature.xml
# Remove lrparser plugin
-rm -rf results/plugins/org.eclipse.cdt.core.lrparser
+#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
@@ -268,6 +278,8 @@ 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} mylyn xmlrpc codec httpclient lang rse
+# CDT parsers expect to find lpgjavaruntime jar as net.sourceforge jar
+ln -s %{_javadir}/lpgjavaruntime-1.1.0.jar SDK/plugins/net.sourceforge.lpg.lpgjavaruntime_1.1.0.jar
SDK=$(cd SDK >/dev/null && pwd)
# Eclipse may try to write to the home directory.
@@ -377,9 +389,11 @@ LAUNCHER=%{eclipse_base}/plugins/$LAUNCH
installDir=${RPM_BUILD_ROOT}/%{eclipse_base}/dropins/cdt
mylynInstallDir=${installDir}-mylyn
+parsersInstallDir=${installDir}-parsers
sdkInstallDir=${installDir}-sdk
install -d -m755 $installDir
install -d -m755 $mylynInstallDir
+install -d -m755 $parsersInstallDir
install -d -m755 $sdkInstallDir
unzip -q -o org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{build_id}.zip \
@@ -410,6 +424,15 @@ mkdir -p $mylynInstallDir/eclipse/featur
mv $installDir/eclipse/features/*mylyn* $mylynInstallDir/eclipse/features
mv $installDir/eclipse/plugins/*mylyn* $mylynInstallDir/eclipse/plugins
+# Move upc, xlc, and lrparser plugins/features to parsers install area.
+mkdir -p $parsersInstallDir/eclipse/features $parsersInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*xlc* $parsersInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*xlc* $parsersInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*lrparser* $parsersInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*lrparser* $parsersInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*upc* $parsersInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*upc* $parsersInstallDir/eclipse/plugins
+
mkdir -p $sdkInstallDir/eclipse/features $sdkInstallDir/eclipse/plugins
mv $installDir/eclipse/features/*source* $sdkInstallDir/eclipse/features
mv $installDir/eclipse/plugins/*source* $sdkInstallDir/eclipse/plugins
@@ -468,6 +491,27 @@ org.eclipse.equinox.p2.metadata.generato
rm -rf repo
popd
+# Generate p2 metadata for CDT Parsers
+pushd $parsersInstallDir/eclipse
+java -jar $LAUNCHER \
+-application \
+org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
+-metadataRepository file:`pwd`/repo \
+-artifactRepository file:`pwd`/repo \
+-source `pwd` \
+-root "CDT Parsers" \
+-rootVersion %{version} \
+-flavor tooling \
+-publishArtifacts \
+-append \
+-artifactRepositoryName "CDT Parsers" \
+-metadataRepositoryName "CDT Parsers" \
+-vmargs \
+-Duser.home=$homedir
+
+rm -rf repo
+popd
+
# Generate p2 metadata for CDT SDK
pushd $sdkInstallDir/eclipse
java -jar $LAUNCHER \
@@ -547,6 +591,10 @@ rm -rf ${RPM_BUILD_ROOT}
%defattr(-,root,root)
%{eclipse_base}/dropins/cdt-mylyn
+%files parsers
+%defattr(-,root,root)
+%{eclipse_base}/dropins/cdt-parsers
+
%if %{ship_tests}
%files tests
%defattr(-,root,root)
@@ -554,6 +602,10 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Wed Oct 14 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.1-2
+- Ship new parsers sub-package which includes xlc, upc, and lrparser plug-ins.
+- Require lpg-java-compat for build.
+
* Fri Oct 09 2009 Jeff Johnston <jjohnstn at redhat.com> 1:6.0.1-1
- Rebase CDT to 6.0.1.
Index: fetch-cdt.sh
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/fetch-cdt.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fetch-cdt.sh 18 Jun 2009 18:08:55 -0000 1.6
+++ fetch-cdt.sh 14 Oct 2009 19:34:06 -0000 1.7
@@ -1,6 +1,6 @@
#!/bin/sh
-CDTTAG=CDT_6_0_0
+CDTTAG=CDT_6_0_1
ECLIPSEBASE=$(rpm --eval %{_libdir})/eclipse
mkdir -p temp && cd temp
@@ -37,27 +37,4 @@ java -cp /usr/lib/eclipse/startup.jar \
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*
-rm -rf *lrparser*
-rm -rf *xlc*
-popd
-pushd results/plugins
-rm -rf *c99*
-rm -rf *upc*
-rm -rf *lrparser*
-rm -rf *xlc*
-popd
-
-# Remove optional features: c99, upc, lrparser, and xlc from the master
-# feature list. We do not package them.
-pushd results/features/org.eclipse.cdt.master
-sed --in-place -e "64,71d" feature.xml
-sed --in-place -e "36,51d" feature.xml
-popd
-
cd .. && tar jcf eclipse-cdt-fetched-src-$CDTTAG.tar.bz2 org.eclipse.cdt.releng
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eclipse-cdt/F-12/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- sources 9 Oct 2009 21:27:43 -0000 1.56
+++ sources 14 Oct 2009 19:34:07 -0000 1.57
@@ -1,8 +1,7 @@
5c470fb0777d27541edbfa31443d91f7 eclipse-cdt-cppunit-20061102.tar.gz
2d4ae0a2131ba1efc896d981072cc091 eclipse-cdt-target_filter.gif.gz
-d0b0b38accc5547e6209fda23c6c8d49 eclipse-cdt-fetched-src-CDT_6_0_0.tar.bz2
6cfdaee7d8ca1c14359225f7393e46ae eclipse-cdt-fetched-src-autotools-v200907241319.tar.gz
921f3464c4b5a284473ebdad634e5c2d libstdc++-v3.libhover
4bccad3ee92faaca4f8dc3ac6941434e glibc-2.7-2.libhover
2dbeff80a9c053b2888940a30f62d3f2 eclipse-cdt-fetched-src-libhover-R0_3_0.tar.gz
-b128891c69b669173abc21f5105e3a30 eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
+62e2dcbf8fb1f1b23cc71ae762b873b8 eclipse-cdt-fetched-src-CDT_6_0_1.tar.bz2
- Previous message (by thread): rpms/dnssec-conf/devel .cvsignore, 1.9, 1.10 dnssec-conf.spec, 1.17, 1.18 sources, 1.10, 1.11
- Next message (by thread): rpms/eclipse-cdt/devel eclipse-cdt.spec, 1.135, 1.136 fetch-cdt.sh, 1.7, 1.8 sources, 1.56, 1.57
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list