← Back to branch summary

~ubuntu-branches/debian/sid/eclipse-cdt/sid

« back to all changes in this revision

Viewing changes to core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/BuildRunnerHelper.java

  • Committer: Package Import Robot
  • Author(s): Jakub Adam
  • Date: 2013-10-03 20:30:16 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20131003203016-d4ug6l0xgosasumq
Tags: 8.2.1-1
* New upstream release.
* Updated autotools documentation sources.

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/BuildRunnerHelper.java
227
227
                        if (workingDirectoryURI != null) {
228
228
                                pathFromURI = EFSExtensionManager.getDefault().getPathFromURI(workingDirectoryURI);
229
229
                        }
230
 
                        if(pathFromURI == null) {
 
230
                        if (pathFromURI == null) {
231
231
                                // fallback to CWD
232
232
                                pathFromURI = System.getProperty("user.dir"); //$NON-NLS-1$
233
233
                        }
234
234
                        IPath workingDirectory = new Path(pathFromURI);
235
235
 
236
236
                        String errMsg = null;
237
 
                        monitor.subTask(CCorePlugin.getFormattedString("BuildRunnerHelper.invokingCommand", launcher.getCommandLine())); //$NON-NLS-1$
 
237
                        monitor.subTask(CCorePlugin.getFormattedString("BuildRunnerHelper.invokingCommand", guessCommandLine(buildCommand.toString(), args))); //$NON-NLS-1$
238
238
                        Process p = launcher.execute(buildCommand, args, envp, workingDirectory, monitor);
239
239
                        monitor.worked(TICKS_EXECUTE_PROGRAM);
240
240
                        if (p != null) {
323
323
                        monitor = new NullProgressMonitor();
324
324
                }
325
325
                try {
326
 
                        monitor.beginTask(CCorePlugin.getResourceString("BuildRunnerHelper.updatingProject"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
 
326
                        monitor.beginTask(CCorePlugin.getFormattedString("BuildRunnerHelper.refreshingProject", project.getName()), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
 
327
                        monitor.subTask(""); //$NON-NLS-1$
327
328
 
328
329
                        // Do not allow the cancel of the refresh, since the builder is external
329
330
                        // to Eclipse, files may have been created/modified and we will be out-of-sync.
454
455
        }
455
456
 
456
457
        /**
 
458
         * Compose command line that presumably will be run by launcher.
 
459
         */
 
460
        private static String guessCommandLine(String command, String[] args) {
 
461
                StringBuffer buf = new StringBuffer(command + ' ');
 
462
                if (args != null) {
 
463
                        for (String arg : args) {
 
464
                                buf.append(arg);
 
465
                                buf.append(' ');
 
466
                        }
 
467
                }
 
468
                return buf.toString().trim();
 
469
        }
 
470
        /**
457
471
         * Print a message to the console info output. Note that this message is colored
458
472
         * with the color assigned to "Info" stream.
459
473
         * @param msg - message to print.