CB-13877 First MSBuildTools.js work: Debug output, move misplaced method, comments (#255)
* notes on method usage
* move getLatestMSBuild over to MSBuildTools
* output path to used MSBuildTools in during build
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index 7710372..eb9d7f0 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -35,6 +35,7 @@
events.emit('log', '\tConfiguration : ' + buildType);
events.emit('log', '\tPlatform : ' + buildarch);
events.emit('log', '\tBuildflags : ' + buildFlags);
+ events.emit('log', '\tMSBuildTools : ' + this.path);
var checkWinSDK = function (target_platform) {
return require('./check_reqs').isWinSDKPresent(target_platform);
@@ -70,6 +71,7 @@
};
// returns full path to msbuild tools required to build the project and tools version
+// check_reqs.js -> run()
module.exports.findAvailableVersion = function () {
var versions = ['15.0', '14.0', '12.0', '4.0'];
@@ -92,6 +94,8 @@
});
}
+// build.js -> run()
+// check_reqs.js -> checkMSBuild()
module.exports.findAllAvailableVersions = function () {
// CB-11548 use VSINSTALLDIR environment if defined to find MSBuild. If VSINSTALLDIR
// is not specified or doesn't contain the MSBuild path we are looking for - fall back
@@ -155,7 +159,8 @@
});
}
-/// returns an array of available UAP Versions
+// returns an array of available UAP Versions
+// prepare.js
module.exports.getAvailableUAPVersions = function () {
var programFilesFolder = process.env['ProgramFiles(x86)'] || process.env['ProgramFiles'];
// No Program Files folder found, so we won't be able to find UAP SDK
@@ -229,3 +234,30 @@
});
return installations;
};
+
+// gets the latest MSBuild version from a list of versions
+module.exports.getLatestMSBuild = function (allMsBuildVersions) {
+ events.emit('verbose', 'getLatestMSBuild');
+
+ var availableVersions = allMsBuildVersions
+ .filter(function (buildTools) {
+ // Sanitize input - filter out tools w/ invalid versions
+ return Version.tryParse(buildTools.version);
+ }).sort(function (a, b) {
+ // Sort tools list - use parsed Version objects for that
+ // to respect both major and minor versions segments
+ var parsedA = Version.fromString(a.version);
+ var parsedB = Version.fromString(b.version);
+
+ if (parsedA.gt(parsedB)) return -1;
+ if (parsedA.eq(parsedB)) return 0;
+ return 1;
+ });
+
+ console.log('availableVersions', availableVersions);
+
+ if (availableVersions.length > 0) {
+ // After sorting the first item will be the highest version available
+ return availableVersions[0];
+ }
+};
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index 2683a1f..3006972 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -24,7 +24,6 @@
var utils = require('./utils');
var prepare = require('./prepare');
var pckage = require('./package');
-var Version = require('./Version');
var MSBuildTools = require('./MSBuildTools');
var AppxManifest = require('./AppxManifest');
var ConfigParser = require('./ConfigParser');
@@ -308,7 +307,7 @@
if (!config.publisherId) return;
var selectedBuildTargets = getBuildTargets(config.win, config.phone, config.projVerOverride, config);
- var msbuild = getLatestMSBuild(allMsBuildVersions);
+ var msbuild = MSBuildTools.getLatestMSBuild(allMsBuildVersions);
var myBuildTargets = filterSupportedTargets(selectedBuildTargets, msbuild);
var manifestFiles = myBuildTargets.map(function (proj) {
return projFilesToManifests[proj];
@@ -323,7 +322,7 @@
function buildTargets (allMsBuildVersions, config) {
// filter targets to make sure they are supported on this development machine
var selectedBuildTargets = getBuildTargets(config.win, config.phone, config.projVerOverride, config);
- var msbuild = getLatestMSBuild(allMsBuildVersions);
+ var msbuild = MSBuildTools.getLatestMSBuild(allMsBuildVersions);
if (!msbuild) {
return Q.reject(new CordovaError('No valid MSBuild was detected for the selected target.'));
}
@@ -440,28 +439,6 @@
return pckage.getPackageFileInfo(finalFile);
}
-function getLatestMSBuild (allMsBuildVersions) {
- var availableVersions = allMsBuildVersions
- .filter(function (buildTools) {
- // Sanitize input - filter out tools w/ invalid versions
- return Version.tryParse(buildTools.version);
- }).sort(function (a, b) {
- // Sort tools list - use parsed Version objects for that
- // to respect both major and minor versions segments
- var parsedA = Version.fromString(a.version);
- var parsedB = Version.fromString(b.version);
-
- if (parsedA.gt(parsedB)) return -1;
- if (parsedA.eq(parsedB)) return 0;
- return 1;
- });
-
- if (availableVersions.length > 0) {
- // After sorting the first item will be the highest version available
- return availableVersions[0];
- }
-}
-
// TODO: Fix this so that it outlines supported versions based on version criteria:
// - v14: Windows 8.1, Windows 10
// - v12: Windows 8.1
