rpms/eclipse-cdt/devel eclipse-cdt.spec,1.97,1.98

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse-cdt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2123

Modified Files:
	eclipse-cdt.spec 
Log Message:
* 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
- Generate p2 metadata


Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- eclipse-cdt.spec	6 Aug 2008 17:31:57 -0000	1.97
+++ eclipse-cdt.spec	6 Aug 2008 21:56:49 -0000	1.98
@@ -267,17 +267,17 @@
 install -d -m755 $mylynInstallDir
 install -d -m755 $sdkInstallDir
 
-unzip org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{build_id}.zip \
--d $installDir
+unzip -q -o org.eclipse.cdt.releng/results/I.%{build_id}/cdt-master-%{version}-%{build_id}.zip \
+-d $installDir/eclipse
 
-rm $installDir/site.xml
-rm $installDir/pack.properties
+rm $installDir/eclipse/site.xml
+rm $installDir/eclipse/pack.properties
 
 # Unpack all existing feature jars
-for x in $installDir/features/*.jar; do
+for x in $installDir/eclipse/features/*.jar; do
   dirname=`echo $x | sed -e 's:\\(.*\\)\\.jar:\\1:g'`
   mkdir -p $dirname
-  unzip $x -d $dirname
+  unzip -q $x -d $dirname
   rm $x
 done 
 
@@ -286,28 +286,91 @@
 #unzip -qq -d $installDir build/rpmBuild/com.redhat.eclipse.cdt.autotools.feature.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/plugins/org.eclipse.cdt.doc.isv_* $sdkInstallDir/plugins
-mv $installDir/features/*sdk* $sdkInstallDir/features
-mv $installDir/plugins/*sdk* $sdkInstallDir/plugins
-
-rm -rf $installDir/features/org.eclipse.cdt.master_*
-rm -rf $installDir/features/org.eclipse.cdt.testing_*
-rm -rf $installDir/plugins/org.eclipse.cdt.testing_*
-rm -rf $installDir/plugins/org.eclipse.test_*
-rm -rf $installDir/plugins/org.eclipse.ant.optional.junit_*
+mkdir -p $mylynInstallDir/eclipse/features $mylynInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*mylyn* $mylynInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*mylyn* $mylynInstallDir/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
+mv $installDir/eclipse/plugins/org.eclipse.cdt.doc.isv_* $sdkInstallDir/eclipse/plugins
+mv $installDir/eclipse/features/*sdk* $sdkInstallDir/eclipse/features
+mv $installDir/eclipse/plugins/*sdk* $sdkInstallDir/eclipse/plugins
+
+rm -rf $installDir/eclipse/features/org.eclipse.cdt.master_*
+rm -rf $installDir/eclipse/features/org.eclipse.cdt.testing_*
+rm -rf $installDir/eclipse/plugins/org.eclipse.cdt.testing_*
+rm -rf $installDir/eclipse/plugins/org.eclipse.test_*
+rm -rf $installDir/eclipse/plugins/org.eclipse.ant.optional.junit_*
 
 ## Cppunit install
 #pushd cppunit
 #unzip -qq -d $RPM_BUILD_ROOT%{eclipse_base}/dropins/cdt build/rpmBuild/org.eclipse.cdt.cppunit.zip
 #popd
 
+# Generate p2 metadata for CDT
+pushd $installDir/eclipse
+eclipse \
+-nosplash \
+-application \
+org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
+-metadataRepository file:`pwd`/repo \
+-artifactRepository file:`pwd`/repo \
+-source `pwd` \
+-root "Eclipse CDT" \
+-rootVersion %{version} \
+-flavor tooling \
+-publishArtifacts \
+-append \
+-artifactRepositoryName "CDT" \
+-metadataRepositoryName "CDT"
+
+mv repo/content.xml .
+rm -rf repo
+popd
+
+# Generate p2 metadata for CDT Mylyn Bridge
+pushd $mylynInstallDir/eclipse
+eclipse \
+-nosplash \
+-application \
+org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \
+-metadataRepository file:`pwd`/repo \
+-artifactRepository file:`pwd`/repo \
+-source `pwd` \
+-root "CDT Mylyn Bridge" \
+-rootVersion %{version} \
+-flavor tooling \
+-publishArtifacts \
+-append \
+-artifactRepositoryName "CDT Mylyn" \
+-metadataRepositoryName "CDT Mylyn"
+
+mv repo/content.xml .
+rm -rf repo
+popd
+
+# Generate p2 metadata for CDT SDK
+pushd $sdkInstallDir/eclipse
+eclipse \
+-nosplash \
+-application \
+org.eclipse.equinox.p2.metadata.generator.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"
+
+mv repo/content.xml .
+rm -rf repo
+popd
+
 %if %{gcj_support}
 aot-compile-rpm
 %endif
@@ -347,6 +410,8 @@
 %changelog
 * 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
+- Generate p2 metadata
 
 * Fri Aug 01 2008 Andrew Overholt <overholt at redhat.com> 5.0.0-1
 - 5.0