Skip to content

Commit

Permalink
CB-7219 added platformVersion, removed cordova.version
Browse files Browse the repository at this point in the history
  • Loading branch information
stevengill committed Sep 24, 2014
1 parent 75c00aa commit 80df8eb
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ To compile the browserify version of the js for just one platform, run:

grunt compile-browserify:android --platformVersion=3.6.0


For integration, see the 'Integration' section below.

## Known Issues
Expand Down
2 changes: 1 addition & 1 deletion tasks/lib/bundle-browserify.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = function bundle(platform, debug, commitId, platformVersion) {
var b = browserify({debug: debug});
// XXX plugin_list is not present at this stage
b.ignore(path.join(root, 'src', 'common', 'plugin_list'));

b.transform(require_tr.transform);

b.add(path.join(root, 'src', platform, 'exec.js'));
Expand Down
3 changes: 2 additions & 1 deletion tasks/lib/bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = function bundle(platform, debug, commitId, platformVersion) {
var scripts = collectFiles(path.join('src', 'scripts'));
modules[''] = path.join('src', 'cordova.js');
copyProps(modules, collectFiles(path.join('src', platform)));

if (platform === 'test') {
// Add any platform-specific modules that have tests to the test bundle.
var testFilesPath = path.join('src', 'android', 'android');
Expand All @@ -46,6 +46,7 @@ module.exports = function bundle(platform, debug, commitId, platformVersion) {
// write header
output.push('/*', fs.readFileSync(licensePath, 'utf8'), '*/');
output.push(';(function() {');

output.push("var PLATFORM_VERSION_BUILD_LABEL = '" + platformVersion + "';");

// write initial scripts
Expand Down
1 change: 1 addition & 0 deletions tasks/lib/compute-commit-id.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ module.exports = function computeCommitId(callback, cachedGitVersion) {
var gitPath = 'git';
var args = 'rev-list HEAD --max-count=1';
childProcess.exec(gitPath + ' ' + args, {cwd:cordovaJSDir}, function(err, stdout, stderr) {

var isWindows = process.platform.slice(0, 3) == 'win';
if (err && isWindows) {
gitPath = '"' + path.join(process.env['ProgramFiles'], 'Git', 'bin', 'git.exe') + '"';
Expand Down

0 comments on commit 80df8eb

Please sign in to comment.