From e9a6271ab46c991c3a8a6bb083970f9b8d36ba7b Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Jul 20 2006 21:10:56 +0000 Subject: * Thu Jul 20 2006 Jeff Johnston 3.1.0-1jpp_4fc - Add Autotools plug-ins via additional source tarball. --- diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index f7cd757..183b642 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -21,7 +21,7 @@ Epoch: 1 Summary: %{pkg_summary} Name: %{eclipse_name}-cdt Version: %{majmin}.%{micro} -Release: 1jpp_3fc +Release: 1jpp_4fc License: Eclipse Public License - v 1.0 (EPL) Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/cdt @@ -31,18 +31,19 @@ Requires: eclipse-platform # # mkdir temp && cd temp # mkdir home -# cvs -d:pserver:anonymous@dev.eclipse.org:/home/tools co \ +# cvs -d:pserver:anonymous@dev.eclipse.org:/home/tools co -r CDT_3_1_0 \ # org.eclipse.cdt-releng/org.eclipse.cdt.releng # cd org.eclipse.cdt-releng/org.eclipse.cdt.releng/ -# sed --in-place 's/@cdtTag@/cdt_3_1/' maps/cdt.map +# sed --in-place 's/@cdtTag@/CDT_3_1_0/' maps/cdt.map # java -cp /usr/share/eclipse/startup.jar -Duser.home=../../home \ # org.eclipse.core.launcher.Main \ # -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 \ # -DdontUnzip=true fetch -# cd .. && tar zcf eclipse-cdt-fetched-src-3.1.0.tar.bz2 org.eclipse.cdt.releng +# cd .. && tar jcf eclipse-cdt-fetched-src-3.1.0.tar.bz2 org.eclipse.cdt.releng Source0: %{name}-fetched-src-%{version}.tar.bz2 +Source1: %{name}-autotools-0.0.2.tar.gz Patch1: %{name}-no-cvs2-patch Patch2: %{name}-platform-build-linux.patch @@ -84,6 +85,13 @@ pushd "org.eclipse.cdt.releng" %patch5 -p0 popd +# Autotools stuff + +mkdir autotools +pushd autotools +tar -xzf %{SOURCE1} +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. @@ -129,6 +137,31 @@ else fi popd +# Autotools has dependencies on CDT so we must add these to the SDK directory +for file in $(pwd)/org.eclipse.cdt.releng/results/I.*/*.tar.gz; do + case $file in + */org.eclipse.cdt-*-linux.$buildArch.*) + # The ".." is needed since the zip files contain "eclipse/foo". + (cd $SDK && tar --strip-components=1 -zxvf $file) + ;; + esac +done + +# Autotools build +pushd autotools +java -cp %{eclipse_base}/startup.jar \ + -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 + +popd + %install rm -rf ${RPM_BUILD_ROOT} @@ -169,6 +202,11 @@ done rm $RPM_BUILD_ROOT/%{eclipse_base}/epl-v10.html rm $RPM_BUILD_ROOT/%{eclipse_base}/notice.html +# Autotools install +pushd autotools +unzip -q -d $RPM_BUILD_ROOT%{eclipse_base}/.. build/rpmBuild/com.redhat.eclipse.cdt.autotools.feature.zip +popd + %if %{gcj_support} aot-compile-rpm %endif @@ -187,53 +225,20 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) %{eclipse_base}/features/org.eclipse.cdt* +%{eclipse_base}/features/com.redhat.eclipse.cdt* %{eclipse_base}/plugins/org.eclipse.cdt* +%{eclipse_base}/plugins/com.redhat.eclipse.cdt* #%{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux.%{eclipse_arch}_%{version}/os/linux/%{eclipse_arch} %{_libdir}/eclipse/plugins/org.eclipse.cdt.core.linux* %if %{gcj_support} %{_libdir}/gcj/%{name} %endif -# Cannot get dir name org.eclipse.cdt.source.linux.*.x86_2.0.2 to glob -# properly. Will fix later -#%{eclipse_base}/features/org.eclipse.cdt.sdk_%{majmin}.%{micro} -#%{eclipse_base}/features/org.eclipse.cdt_%{majmin}.%{micro} -#%{eclipse_base}/features/org.eclipse.cdt.source_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.core_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.core.linux_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.debug.core_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.debug.mi.core_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.debug.mi.ui_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.debug.ui_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.doc.user_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.launch_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.make.core_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.make.ui_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.core_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.managedbuilder.ui_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.sdk_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.ui_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.source_%{majmin}.%{micro} -#%{eclipse_base}/plugins/org.eclipse.cdt.source.linux* -#%{eclipse_base}/plugins/org.eclipse.cdt.ui.libhover_1.0.0 -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.core.linux_%{majmin}.%{micro} -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.core_%{majmin}.%{micro} -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.debug.core_%{majmin}.%{micro} -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.debug.mi.core_%{majmin}.%{micro} -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.debug.mi.ui_%{majmin}.%{micro} -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.debug.ui_%{majmin}.%{micro} -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.launch_%{majmin}.%{micro} -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.make.core_%{majmin}.%{micro} -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.make.ui_%{majmin}.%{micro} -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.managedbuilder.core_%{majmin}.%{micro} -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.managedbuilder.ui_%{majmin}.%{micro} -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.ui.libhover_1.0.0 -#%{eclipse_lib_base}/plugins/org.eclipse.cdt.ui_%{majmin}.%{micro} - - %changelog -* Wed Jul 19 2006 Jeff Johnston 3.1.0-1jpp_3fc +* Thu Jul 20 2006 Jeff Johnston 3.1.0-1jpp_4fc +- Add Autotools plug-ins via additional source tarball. + +* Wed Jul 19 2006 Igor Foox 3.1.0-1jpp_3fc - Rebuild. * Wed Jul 12 2006 Jeff Johnston 3.1.0-1jpp_2fc diff --git a/sources b/sources index 8c672e9..6c10cf6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -25eebd7f854faf0bccf091afa8232118 eclipse-cdt-fetched-src-3.1.0.tar.bz2 +8ea0a06e13227728d3922bab3496509e eclipse-cdt-fetched-src-3.1.0.tar.bz2 +c21690f7f337db8e8aa39949ff136428 eclipse-cdt-autotools-0.0.2.tar.gz