# HG changeset patch # User wpaul # Date 1284129504 18000 # Node ID 22a3de59a31b2a61799b4e9e6c43117f379ecc10 # Parent f465b1504220fb6334ab42da6c42afe240eb77a1 fixed bug #11824. diff -r f465b1504220 -r 22a3de59a31b builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ABLDCommandHandler.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(); diff -r f465b1504220 -r 22a3de59a31b 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/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 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) {