From 08f9280c8f2f54bf7529df6c51f98b585d65d5b8 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Jan 29 2007 18:51:49 +0000 Subject: * Mon Jan 29 2007 Jeff Johnston 3.1.1-8 - Resolves: #214624, #224644 - Rebase autotools to 0.0.7 source. --- diff --git a/.cvsignore b/.cvsignore index d3a664b..5f25dac 100644 --- a/.cvsignore +++ b/.cvsignore @@ -3,3 +3,4 @@ eclipse-cdt-fetched-src-3.1.1.tar.bz2 eclipse-cdt-cppunit-20061102.tar.gz eclipse-cdt-autotools-0.0.6.tar.gz eclipse-cdt-autotools-0.0.6.1.tar.gz +eclipse-cdt-autotools-0.0.7.tar.gz diff --git a/eclipse-cdt-managedbuild-failcheck.patch b/eclipse-cdt-managedbuild-failcheck.patch new file mode 100644 index 0000000..dc3bb58 --- /dev/null +++ b/eclipse-cdt-managedbuild-failcheck.patch @@ -0,0 +1,68 @@ +--- ./results/plugins/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java.fix 2007-01-26 19:22:27.000000000 -0500 ++++ ./results/plugins/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java 2007-01-26 19:43:53.000000000 -0500 +@@ -700,34 +700,40 @@ public class GeneratedMakefileBuilder ex + } + } + } +- +- // Now call make +- checkCancel(monitor); +- statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.starting", getProject().getName()); //$NON-NLS-1$ +- monitor.subTask(statusMsg); +- IPath topBuildDir = generator.getBuildWorkingDir(); +- if (topBuildDir != null) { +- invokeMake(FULL_BUILD, topBuildDir, info, generator, monitor); ++ ++ if (result.getCode() != IStatus.ERROR) { ++ // Now call make ++ checkCancel(monitor); ++ statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.starting", getProject().getName()); //$NON-NLS-1$ ++ monitor.subTask(statusMsg); ++ IPath topBuildDir = generator.getBuildWorkingDir(); ++ if (topBuildDir != null) { ++ invokeMake(FULL_BUILD, topBuildDir, info, generator, monitor); ++ } else { ++ statusMsg = ManagedMakeMessages.getFormattedString(NOTHING_BUILT, getProject().getName()); //$NON-NLS-1$ ++ monitor.subTask(statusMsg); ++ return; ++ } ++ ++ // Now regenerate the dependencies ++ checkCancel(monitor); ++ statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.regen.deps", getProject().getName()); //$NON-NLS-1$ ++ monitor.subTask(statusMsg); ++ try { ++ generator.regenerateDependencies(false); ++ } catch (CoreException e) { ++ // Throw the exception back to the builder ++ throw e; ++ } ++ ++ // Build finished message ++ statusMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); //$NON-NLS-1$ ++ monitor.subTask(statusMsg); + } else { +- statusMsg = ManagedMakeMessages.getFormattedString(NOTHING_BUILT, getProject().getName()); //$NON-NLS-1$ ++ // Build finished message ++ statusMsg = ManagedMakeMessages.getFormattedString(BUILD_STOPPED_ERR, getProject().getName()); //$NON-NLS-1$ + monitor.subTask(statusMsg); +- return; +- } +- +- // Now regenerate the dependencies +- checkCancel(monitor); +- statusMsg = ManagedMakeMessages.getFormattedString("ManagedMakeBuilder.message.regen.deps", getProject().getName()); //$NON-NLS-1$ +- monitor.subTask(statusMsg); +- try { +- generator.regenerateDependencies(false); +- } catch (CoreException e) { +- // Throw the exception back to the builder +- throw e; + } +- +- // Build finished message +- statusMsg = ManagedMakeMessages.getFormattedString(BUILD_FINISHED, getProject().getName()); //$NON-NLS-1$ +- monitor.subTask(statusMsg); + } + + /* (non-Javadoc) diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 587ec2d..2d13a69 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -18,7 +18,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: %{majmin}.%{micro} -Release: 7%{?dist} +Release: 8%{?dist} License: Eclipse Public License / CPL Group: Development/Tools URL: http://www.eclipse.org/cdt @@ -45,13 +45,13 @@ Source0: %{name}-fetched-src-%{version}.tar.bz2 # The following tarball was generated thusly: # # mkdir temp && cd temp -# cvs -d:pserver:anonymous@sources.redhat.com:/cvs/eclipse export -r autotools-0_0_6_1 \ +# cvs -d:pserver:anonymous@sources.redhat.com:/cvs/eclipse export -r autotools-0_0_7 \ # autotools/com.redhat.eclipse.cdt.autotools autotools/com.redhat.eclipse.cdt.autotools-docs \ # autotools/com.redhat.eclipse.cdt.autotools.feature # cd autotools -# tar -czvf eclipse-cdt-autotools-0.0.6.1.tar.gz com.redhat.eclipse.cdt.autotools* +# tar -czvf eclipse-cdt-autotools-0.0.7.tar.gz com.redhat.eclipse.cdt.autotools* -Source1: %{name}-autotools-0.0.6.1.tar.gz +Source1: %{name}-autotools-0.0.7.tar.gz # The following tarball was generated thusly: # @@ -87,6 +87,9 @@ 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 ManagedMake builder to prevent running make after Makefile generation +# failure. +Patch11: %{name}-managedbuild-failcheck.patch BuildRequires: eclipse-pde %if %{gcj_support} @@ -141,6 +144,7 @@ popd %patch5 -p0 %patch6 -p0 %patch7 -p0 +%patch11 -p0 popd # Autotools stuff @@ -310,6 +314,10 @@ rm -rf ${RPM_BUILD_ROOT} %doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html %changelog +* Mon Jan 29 2007 Jeff Johnston 3.1.1-8 +- Resolves: #214624, #224644 +- Rebase autotools to 0.0.7 source. + * Wed Jan 17 2007 Jeff Johnston 3.1.1-7 - Resolves: #222350 - Rebase autotools to 0.0.6.1 source. diff --git a/sources b/sources index d0d843e..5bb75be 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -03800551796d05a68116ee0475240315 eclipse-cdt-autotools-0.0.6.1.tar.gz 922f65074113363570d0f5a0b56a1e70 eclipse-cdt-fetched-src-3.1.1.tar.bz2 5c470fb0777d27541edbfa31443d91f7 eclipse-cdt-cppunit-20061102.tar.gz +96b6a6542a4514832262c2fbd5b4cb09 eclipse-cdt-autotools-0.0.7.tar.gz