rpms/eclipse-cdt/devel eclipse-cdt-managedbuild-failcheck.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 eclipse-cdt.spec, 1.71, 1.72 sources, 1.29, 1.30
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 29 18:51:51 UTC 2007
Author: jjohnstn
Update of /cvs/dist/rpms/eclipse-cdt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22266
Modified Files:
.cvsignore eclipse-cdt.spec sources
Added Files:
eclipse-cdt-managedbuild-failcheck.patch
Log Message:
* Mon Jan 29 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.1-8
- Resolves: #214624, #224644
- Rebase autotools to 0.0.7 source.
eclipse-cdt-managedbuild-failcheck.patch:
GeneratedMakefileBuilder.java | 56 +++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 25 deletions(-)
--- NEW FILE eclipse-cdt-managedbuild-failcheck.patch ---
--- ./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)
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 19 Jan 2007 16:37:53 -0000 1.24
+++ .cvsignore 29 Jan 2007 18:51:49 -0000 1.25
@@ -3,3 +3,4 @@
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
Index: eclipse-cdt.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- eclipse-cdt.spec 19 Jan 2007 16:37:53 -0000 1.71
+++ eclipse-cdt.spec 29 Jan 2007 18:51:49 -0000 1.72
@@ -18,7 +18,7 @@
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 @@
# The following tarball was generated thusly:
#
# mkdir temp && cd temp
-# cvs -d:pserver:anonymous at sources.redhat.com:/cvs/eclipse export -r autotools-0_0_6_1 \
+# cvs -d:pserver:anonymous at 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 @@
# 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 @@
%patch5 -p0
%patch6 -p0
%patch7 -p0
+%patch11 -p0
popd
# Autotools stuff
@@ -310,6 +314,10 @@
%doc %{eclipse_base}/features/org.eclipse.cdt.sdk_*/epl-v10.html
%changelog
+* Mon Jan 29 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.1-8
+- Resolves: #214624, #224644
+- Rebase autotools to 0.0.7 source.
+
* Wed Jan 17 2007 Jeff Johnston <jjohnstn at redhat.com> 3.1.1-7
- Resolves: #222350
- Rebase autotools to 0.0.6.1 source.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/eclipse-cdt/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 19 Jan 2007 16:37:53 -0000 1.29
+++ sources 29 Jan 2007 18:51:49 -0000 1.30
@@ -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
More information about the fedora-cvs-commits
mailing list