--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java Mon Apr 13 16:02:36 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/builder/CarbideCPPBuilder.java Tue Apr 14 10:18:48 2009 -0500
@@ -892,8 +892,8 @@
* @param launcher the Carbide launcher
* @return false if any makefile generation was necessary but failed, true otherwise
*/
- public static boolean generateAbldMakefilesIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, IProgressMonitor progress) {
- return generateAbldMakefilesIfNecessary(config, launcher, true, progress);
+ public static boolean generateAbldMakefilesIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher) {
+ return generateAbldMakefilesIfNecessary(config, launcher, true);
}
/**
@@ -910,6 +910,27 @@
* @param calculateComponentLists whether or not to calculate the list of makmake components
* @return false if any makefile generation was necessary but failed, true otherwise
* @since 2.0
+ * @deprecated Use {@link #generateAbldMakeFileIfNecessary(generateAbldMakefilesIfNecessary(ICarbideBuildConfiguration, CarbideCommandLauncher, boolean, IProgressMonitor)} instead
+ */
+ public static boolean generateAbldMakefilesIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, boolean calculateComponentLists) {
+ return generateAbldMakefilesIfNecessary(config, launcher, calculateComponentLists, new NullProgressMonitor());
+ }
+
+ /**
+ * Generates the abld makefiles if necessary.
+ * Loops through the mmp files to be built for the given build configuration and generates the makefile
+ * for the mmp if:
+ * 1) the makefile for the mmp does not exist
+ * 2) if the mmp or any of its includes is newer than the makefile
+ * 3) the makefile does not have the necessary Carbide changes
+ *
+ * The command used will be 'abld [test] makefile platform mmpname'
+ * @param config the build configuration context
+ * @param launcher the Carbide launcher
+ * @param calculateComponentLists whether or not to calculate the list of makmake components
+ * @param progress monitor to allow user to cancel
+ * @return false if any makefile generation was necessary but failed, true otherwise
+ * @since 2.0
*/
public static boolean generateAbldMakefilesIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, boolean calculateComponentLists, IProgressMonitor progress) {
@@ -932,7 +953,7 @@
return true;
}
-
+
/**
* Generates the abld makefile if necessary.
* Generates the makefile for the given mmp file if:
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Mon Apr 13 16:02:36 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv1Builder.java Tue Apr 14 10:18:48 2009 -0500
@@ -2199,6 +2199,11 @@
}
}
+ public boolean generateAbldMakefileIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, IPath componentPath, boolean isTest) {
+ return generateAbldMakefileIfNecessary(config, launcher, componentPath, isTest, new NullProgressMonitor());
+ }
+
+
public boolean generateAbldMakefileIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, IPath componentPath, boolean isTest, IProgressMonitor progress) {
// generate the makefile if necessary
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Mon Apr 13 16:02:36 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideSBSv2Builder.java Tue Apr 14 10:18:48 2009 -0500
@@ -453,6 +453,10 @@
public boolean generateAbldMakefileIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, IPath componentPath, boolean isTest, IProgressMonitor progress) {
return true;
}
+
+ public boolean generateAbldMakefileIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, IPath componentPath, boolean isTest) {
+ return true;
+ }
public IPath getMakefileDirectory(ICarbideBuildConfiguration buildConfig) {
// the makefile's are build config specific but are generated every time no
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ICarbideBuilder.java Mon Apr 13 16:02:36 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ICarbideBuilder.java Tue Apr 14 10:18:48 2009 -0500
@@ -58,8 +58,12 @@
public String [] getResolvedEnvVars(ICarbideBuildConfiguration config);
public boolean needsBldmakeMakefileGeneration(ICarbideBuildConfiguration config);
+
+ @Deprecated
+ public boolean generateAbldMakefileIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, IPath componentPath, boolean isTest);
+
+ public boolean generateAbldMakefileIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, IPath componentPath, boolean isTest, IProgressMonitor progress);
- public boolean generateAbldMakefileIfNecessary(ICarbideBuildConfiguration config, CarbideCommandLauncher launcher, IPath componentPath, boolean isTest, IProgressMonitor progress);
public IPath getMakefileDirectory(ICarbideBuildConfiguration config);
}
--- a/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ABLDCommandHandler.java Mon Apr 13 16:02:36 2009 -0500
+++ b/builder/com.nokia.carbide.cpp.builder.utils/src/com/nokia/carbide/cpp/internal/builder/utils/handlers/ABLDCommandHandler.java Tue Apr 14 10:18:48 2009 -0500
@@ -102,7 +102,7 @@
return new Status(IStatus.ERROR, "Carbide.c++ builder utils plugin", IStatus.ERROR, "Failed to generate bldmake makefiles", null);
}
- if (!CarbideCPPBuilder.generateAbldMakefilesIfNecessary(buildConfig, launcher, new NullProgressMonitor())) {
+ if (!CarbideCPPBuilder.generateAbldMakefilesIfNecessary(buildConfig, launcher)) {
return new Status(IStatus.ERROR, "Carbide.c++ builder utils plugin", IStatus.ERROR, "Failed to generate mmp makefiles", null);
}