Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivian Kong2009-05-12 10:59:49 -0400
committerVivian Kong2009-05-12 10:59:49 -0400
commit689a5b183f2a008e96ba0359326596aa75ba350a (patch)
tree1a5451ea49d372196aa404d1deabed029b266eb1
parent5a151486c543e6fef8cfbf73b921d29c0cb7e6e9 (diff)
downloadorg.eclipse.cdt-689a5b183f2a008e96ba0359326596aa75ba350a.tar.gz
org.eclipse.cdt-689a5b183f2a008e96ba0359326596aa75ba350a.tar.xz
org.eclipse.cdt-689a5b183f2a008e96ba0359326596aa75ba350a.zip
bug 268840
-rw-r--r--build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCDMakefileGenerator.java20
1 files changed, 10 insertions, 10 deletions
diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCDMakefileGenerator.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCDMakefileGenerator.java
index 3a9b53c23b..aee6dfd21b 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCDMakefileGenerator.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCDMakefileGenerator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -36,7 +36,7 @@ import org.eclipse.core.runtime.Path;
public class SCDMakefileGenerator extends DefaultRunSIProvider {
private static final String ENDL = System.getProperty("line.separator"); //$NON-NLS-1$
private static final String DENDL = ENDL+ENDL;
- private String fMakeCommand = "-f ${project_name}_scd.mk "; //$NON-NLS-1$
+ private String fMakeCommand = "-f ${project_name}_scd.mk ";
/* (non-Javadoc)
* @see org.eclipse.cdt.make.internal.core.scannerconfig2.DefaultRunSIProvider#initialize()
@@ -44,7 +44,7 @@ public class SCDMakefileGenerator extends DefaultRunSIProvider {
protected boolean initialize() {
String args = buildInfo.getProviderRunArguments(providerId);
if (null == args)
- args = " -E -P -v -dD "; //$NON-NLS-1$
+ args = " -E -P -v -dD ";
else {
int nPos = args.indexOf('|');
if(nPos > 0) {
@@ -106,7 +106,7 @@ public class SCDMakefileGenerator extends DefaultRunSIProvider {
buffer.append(DENDL);
}
- File makefile = new File(fWorkingDirectory.toFile(), getMakeFileName(projectName));
+ File makefile = new File(fWorkingDirectory.toFile(), getMakeFileName(projectName)); //$NON-NLS-1$
try {
PrintStream ps = new PrintStream(new FileOutputStream(makefile));
ps.println(buffer.toString());
@@ -128,10 +128,10 @@ public class SCDMakefileGenerator extends DefaultRunSIProvider {
for(String arg : makeArgs) {
if(found)
return arg;
- if(arg.equals("-f")) //$NON-NLS-1$
+ if(arg.equals("-f"))
found = true;
}
- return projectName+"_scd.mk"; //$NON-NLS-1$
+ return projectName+"_scd.mk";
}
@@ -143,18 +143,18 @@ public class SCDMakefileGenerator extends DefaultRunSIProvider {
resource.getProject().getName());
string = string.replaceAll("\\$\\{plugin_state_location\\}", //$NON-NLS-1$
MakeCorePlugin.getWorkingDirectory().toString());
- string = string.replaceAll("\\$\\{specs_file\\}", //$NON-NLS-1$
- GCCScannerConfigUtil.C_SPECS_FILE );
+ string = string.replaceAll("\\$\\{specs_file\\}",
+ GCCScannerConfigUtil.C_SPECS_FILE ); //$NON-NLS-1$
return string;
}
@Override
protected String[] getCommandLineOptions() {
- return ScannerConfigUtil.tokenizeStringWithQuotes(fMakeCommand, "\""); //$NON-NLS-1$
+ return ScannerConfigUtil.tokenizeStringWithQuotes(fMakeCommand, "\"");
}
@Override
protected IPath getCommandToLaunch() {
- return new Path("make"); //$NON-NLS-1$
+ return new Path("make");
}
}

Back to the top