[eclipse-cdt/f17] Remove P2 generation section that is no longer needed. Add libhover.devhelp feature. Remove net.sour

[Jeff Johnston]

commit 54ea71534599cca71c853d434c7c76d52653b175
Author: Jeff Johnston <jjohnstn at redhat.com>
Date:   Fri Apr 20 17:33:18 2012 -0400

    Remove P2 generation section that is no longer needed.
    Add libhover.devhelp feature.
    Remove net.sourceforge.lpg.lpgjavaruntime.jar and only use link.
    Add org.eclipse.cdt.core.tests jar.

 eclipse-cdt.spec |   89 +++++++++++------------------------------------------
 1 files changed, 19 insertions(+), 70 deletions(-)
---
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 8e82c85..44a27c2 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -10,6 +10,7 @@ Epoch: 1
 %define cdt_snapshot		org.eclipse.cdt-dd069579ac0131db85c7673c43556ecbb9b7432b
 %define build_id		201203191015
 %define libhover_build_id	201203221532
+%define pdebuild		eclipse-pdebuild
 
 
 # All arches line up except i386 -> x86
@@ -22,7 +23,7 @@ Epoch: 1
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        %{majmin}.%{micro}
-Release:        0.4.junom6%{?dist}
+Release:        0.5.junom6%{?dist}
 License:        EPL and CPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/cdt
@@ -186,7 +187,10 @@ popd
 
 ## Libhover build
 pushd linuxtools-libhover-parent-0.10.0-src
-eclipse-pdebuild -f org.eclipse.linuxtools.cdt.libhover.feature  -a "-DbaseLocation=$SDK -DforceContextQualifier=%{libhover_build_id}"
+%{pdebuild} -f org.eclipse.linuxtools.cdt.libhover.feature  -a "-DbaseLocation=$SDK -DforceContextQualifier=%{libhover_build_id}"
+%{pdebuild} -f org.eclipse.linuxtools.cdt.libhover.devhelp.feature  \
+-a "-DbaseLocation=$SDK -DjavacSource=1.6 -DjavacTarget=1.6 \
+-DforceContextQualifier=%{libhover_build_id}"
 popd
 
 %install
@@ -213,11 +217,18 @@ for x in $installDir/eclipse/features/*.jar; do
   rm $x
 done 
 
+# Add CDT core tests plugin even though this isn't done upstream
+cp %{cdt_snapshot}/core/org.eclipse.cdt.core.tests/target/org.eclipse.cdt.core.tests-*-SNAPSHOT.jar $installDir/eclipse/plugins
+
 # Libhover install
 pushd linuxtools-libhover-parent-0.10.0-src
 unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.feature.zip
+unzip -qq -d $installDir build/rpmBuild/org.eclipse.linuxtools.cdt.libhover.devhelp.feature.zip
 popd
 
+# Remove lpgjavaruntime jar file
+rm -rf $installDir/eclipse/plugins/net.sourceforge.*
+
 # 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
@@ -240,74 +251,6 @@ mv $installDir/eclipse/plugins/*sdk* $sdkInstallDir/eclipse/plugins
 rm -rf $installDir/eclipse/features/org.eclipse.cdt.master_*
 rm -rf $installDir/eclipse/plugins/org.eclipse.ant.optional.junit_*
 rm -rf $installDir/eclipse/plugins/org.eclipse.test_*
-rm -rf $installDir/eclipse/plugins/net.sourceforge.*
-
-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 $P2LAUNCHER \
--application \
-org.eclipse.equinox.p2.publisher.EclipseGenerator \
--metadataRepository file:`pwd`/repo \
--artifactRepository file:`pwd`/repo \
--source `pwd` \
--root "Eclipse CDT" \
--rootVersion %{version} \
--flavor tooling \
--publishArtifacts \
--append \
--artifactRepositoryName "CDT" \
--metadataRepositoryName "CDT" \
--vmargs \
--Duser.home=$homedir
-
-rm -rf repo
-popd
-
-# Generate p2 metadata for CDT Parsers
-pushd $parsersInstallDir/eclipse
-java -jar $P2LAUNCHER \
--application \
-org.eclipse.equinox.p2.publisher.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 $P2LAUNCHER \
--application \
-org.eclipse.equinox.p2.publisher.EclipseGenerator \
--metadataRepository file:`pwd`/repo \
--artifactRepository file:`pwd`/repo \
--source `pwd` \
--root "Eclipse CDT SDK" \
--rootVersion %{version} \
--flavor tooling \
--publishArtifacts \
--append \
--artifactRepositoryName "CDT SDK" \
--metadataRepositoryName "CDT SDK" \
--vmargs \
--Duser.home=$homedir
-
-rm -rf repo
-popd
 
 # remove repo stuff that shouldn't be in dropins folder
 rm -rf $installDir/eclipse/artifacts.jar
@@ -330,6 +273,12 @@ rm -rf $installDir/eclipse/binary
 %doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
 
 %changelog
+* Fri Apr 20 2012 Jeff Johnston <jjohnstn at redhat.com> 1:8.1.0-0.5.junom6
+- Remove P2 generation section that is no longer needed.
+- Add libhover.devhelp feature.
+- Remove net.sourceforge.lpg.lpgjavaruntime.jar and only use link.
+- Add org.eclipse.cdt.core.tests jar.
+
 * Thu Apr 19 2012 Jeff Johnston <jjohnstn at redhat.com> 1:8.1.0-0.4.junom6
 - Clear out repo files that are added to the dropin folder.
 - Add doc files per standard method.