summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2014-04-16 17:31:50 (EDT)
committerJeff Johnston2014-04-16 18:08:25 (EDT)
commit4a278f0d05460e342745123f5e832574271a6155 (patch)
tree3218f2be942a37f25c0e5e9d059e86777ddaea7c
parentfdba4b05b8fd7967ecac7e1a6b2f25ef31cae5c1 (diff)
downloadorg.eclipse.cdt-4a278f0d05460e342745123f5e832574271a6155.zip
org.eclipse.cdt-4a278f0d05460e342745123f5e832574271a6155.tar.gz
org.eclipse.cdt-4a278f0d05460e342745123f5e832574271a6155.tar.xz
- Autotools was not using the Builder build command to do "make" operations such as cleaning the source directory Change-Id: I7dfb44894a1204a5ce7eb83af07f5615526f5721 Reviewed-on: https://git.eclipse.org/r/25169 Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> Tested-by: Jeff Johnston <jjohnstn@redhat.com>
-rw-r--r--build/org.eclipse.cdt.autotools.core/.gitignore8
-rw-r--r--build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java9
2 files changed, 13 insertions, 4 deletions
diff --git a/build/org.eclipse.cdt.autotools.core/.gitignore b/build/org.eclipse.cdt.autotools.core/.gitignore
index 128a705..3d23946 100644
--- a/build/org.eclipse.cdt.autotools.core/.gitignore
+++ b/build/org.eclipse.cdt.autotools.core/.gitignore
@@ -46,3 +46,11 @@ target
/bin
/bin
/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
+/bin
diff --git a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
index fca9628..80b0e11 100644
--- a/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
+++ b/build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
@@ -127,6 +127,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
private ICConfigurationDescription cdesc;
private IAConfiguration toolsCfg;
private IBuilder builder;
+
public void generateDependencies() throws CoreException {
// TODO Auto-generated method stub
@@ -402,7 +403,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
// There is a make target for cleaning.
if (topMakefile != null && topMakefile.exists()) {
String[] makeargs = new String[1];
- IPath makeCmd = new Path("make"); //$NON-NLS-1$
+ IPath makeCmd = builder.getBuildCommand();
String target = null;
try {
target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
@@ -452,7 +453,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
// There is a make target for cleaning.
if (makefile != null && makefile.exists()) {
String[] makeargs = new String[1];
- IPath makeCmd = new Path("make"); //$NON-NLS-1$
+ IPath makeCmd = builder.getBuildCommand();
String target = null;
try {
target = getProject().getPersistentProperty(AutotoolsPropertyConstants.CLEAN_MAKE_TARGET);
@@ -579,7 +580,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
// If nothing this far, look for a Makefile.cvs file which needs to be run.
else if (makefileCvsExists()) {
String[] makeargs = new String[1];
- IPath makeCmd = new Path("make"); //$NON-NLS-1$
+ IPath makeCmd = builder.getBuildCommand();
makeargs[0] = "-f" + getMakefileCVSPath().toOSString(); //$NON-NLS-1$
rc = runCommand(makeCmd,
project.getLocation().append(buildDir),
@@ -1393,7 +1394,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
targetElem.setAttribute(TARGET_ATTR_ID, target.getTargetBuilderID());
targetElem.setAttribute(TARGET_ATTR_PATH, target.getContainer().getProjectRelativePath().toString());
ICStorageElement elem = targetElem.createChild(TARGET_COMMAND);
- elem.setValue(target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, "make")); //$NON-NLS-1$
+ elem.setValue(target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, builder.getBuildCommand().toOSString()));
String targetAttr = target.getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, null);
if ( targetAttr != null) {