Updated Branches: refs/heads/master 74f47a649 -> ce50b7263
Clean up build and testing - cordova.test.js will now regenerate when running 'jake test' - changed 'jake test' to not use the debug version of cordova.js (better stack traces) - updated building of debug versions to be put into a debug folder under pkg. Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/ce50b726 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/ce50b726 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/ce50b726 Branch: refs/heads/master Commit: ce50b72632cc861014a58db563becea48c426772 Parents: 74f47a6 Author: Gord Tanner <[email protected]> Authored: Tue Nov 13 14:29:13 2012 -0500 Committer: Gord Tanner <[email protected]> Committed: Tue Nov 13 14:29:13 2012 -0500 ---------------------------------------------------------------------- Jakefile | 3 ++- build/packager.js | 2 +- test/runner.js | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/ce50b726/Jakefile ---------------------------------------------------------------------- diff --git a/Jakefile b/Jakefile index dfe8c5c..9ec9282 100644 --- a/Jakefile +++ b/Jakefile @@ -69,7 +69,8 @@ task('clean', ['set-cwd'], function () { var DEPLOY = path.join(__dirname,"pkg"); var cmd = 'rm -rf ' + DEPLOY + ' && ' + - 'mkdir ' + DEPLOY; + 'mkdir ' + DEPLOY + ' && ' + + 'mkdir ' + DEPLOY + '/debug'; childProcess.exec(cmd,complete); }, true); http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/ce50b726/build/packager.js ---------------------------------------------------------------------- diff --git a/build/packager.js b/build/packager.js index 633ba2c..68e66c3 100644 --- a/build/packager.js +++ b/build/packager.js @@ -37,7 +37,7 @@ packager.generate = function(platform, commitId) { outFile = path.join('pkg', 'cordova.' + platform + '.js') fs.writeFileSync(outFile, libraryRelease, 'utf8') - outFile = path.join('pkg', 'cordova.' + platform + '-debug.js') + outFile = path.join('pkg/debug', 'cordova.' + platform + '-debug.js') fs.writeFileSync(outFile, libraryDebug, 'utf8') console.log('generated platform: ' + platform + ' in ' + time + 'ms') http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/ce50b726/test/runner.js ---------------------------------------------------------------------- diff --git a/test/runner.js b/test/runner.js index d854d86..2595d2b 100644 --- a/test/runner.js +++ b/test/runner.js @@ -62,8 +62,11 @@ module.exports = { this[key] = window[key] = global[key] = jas[key]; }); + //regenerate platform file + packager.generate('test'); + //load in our modules - var testLibName = _path.join(__dirname, '..', 'pkg', 'cordova.test-debug.js') + var testLibName = _path.join(__dirname, '..', 'pkg', 'cordova.test.js') var testLib = fs.readFileSync(testLibName, 'utf8') try { eval(testLib);
