fixed bug #11824.
authorwpaul
Fri, 10 Sep 2010 09:38:24 -0500
changeset 1982 22a3de59a31b
parent 1981 f465b1504220
child 1983 da7da111790d
fixed bug #11824.
builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ABLDCommandHandler.java
builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ProjectCommandHandler.java
--- a/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ABLDCommandHandler.java	Thu Sep 09 20:14:19 2010 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ABLDCommandHandler.java	Fri Sep 10 09:38:24 2010 -0500
@@ -94,7 +94,7 @@
 
 			Job buildJob = new Job("Invoking abld command") {
 				protected IStatus run(IProgressMonitor monitor) {
-					CarbideCommandLauncher launcher = new CarbideCommandLauncher(cpi.getProject(), new NullProgressMonitor(), null, cpi.getINFWorkingDirectory());
+					CarbideCommandLauncher launcher = new CarbideCommandLauncher(cpi.getProject(), monitor, null, cpi.getINFWorkingDirectory());
 					launcher.showCommand(true);
 					launcher.startTimingStats();
 
--- a/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ProjectCommandHandler.java	Thu Sep 09 20:14:19 2010 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ProjectCommandHandler.java	Fri Sep 10 09:38:24 2010 -0500
@@ -34,7 +34,6 @@
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.core.runtime.jobs.Job;
@@ -165,9 +164,6 @@
 		if (cpi != null) {
 			final List<ICarbideBuildConfiguration> buildConfigList = cpi.getBuildConfigurations();
 
-			final CarbideCommandLauncher launcher = new CarbideCommandLauncher(cpi.getProject(), new NullProgressMonitor(), null, cpi.getINFWorkingDirectory());
-			launcher.showCommand(true);
-
     		try {
     			CarbideCPPBuilder.removeAllMarkers(cpi.getProject());
     		} catch (CoreException e) {
@@ -177,6 +173,9 @@
     		Job buildJob = new Job("Building all configurations for project " + project.getName()) { //$NON-NLS-1$
 				protected IStatus run(IProgressMonitor monitor) {
 					try {
+						CarbideCommandLauncher launcher = new CarbideCommandLauncher(cpi.getProject(), monitor, null, cpi.getINFWorkingDirectory());
+						launcher.showCommand(true);
+
 						SubMonitor subMonitor = SubMonitor.convert(monitor, buildConfigList.size());
 						
 						for (final ICarbideBuildConfiguration currConfig : buildConfigList) {