Skip to content

Commit

Permalink
Merge pull request #5248 from cb1kenobi/timob-16161_3_2_X
Browse files Browse the repository at this point in the history
[TIMOB-16161] Fixed issue where the JavaScript AST parsing was being don...
  • Loading branch information
Michael Xia committed Jan 23, 2014
2 parents 57fc055 + cec4d4d commit 0984dca
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions android/cli/commands/_build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2466,13 +2466,13 @@ AndroidBuilder.prototype.copyResources = function copyResources(next) {
delete this.lastBuildFiles[to];

try {
// parse the AST
var r = jsanalyze.analyzeJsFile(from, { minify: this.minifyJS });
this.cli.createHook('build.android.copyResource', this, function (from, to, cb) {
// parse the AST
var r = jsanalyze.analyzeJsFile(from, { minify: this.minifyJS });

// we want to sort by the "to" filename so that we correctly handle file overwriting
this.tiSymbols[to] = r.symbols;
// we want to sort by the "to" filename so that we correctly handle file overwriting
this.tiSymbols[to] = r.symbols;

this.cli.createHook('build.android.copyResource', this, function (from, to, cb) {
var dir = path.dirname(to);
fs.existsSync(dir) || wrench.mkdirSyncRecursive(dir);

Expand Down
10 changes: 5 additions & 5 deletions iphone/cli/commands/_build.js
Original file line number Diff line number Diff line change
Expand Up @@ -2869,13 +2869,13 @@ iOSBuilder.prototype.copyResources = function copyResources(finished) {
}

try {
// parse the AST
var r = jsanalyze.analyzeJsFile(from, { minify: this.minifyJS });
this.cli.createHook('build.ios.copyResource', this, function (from, to, cb) {
// parse the AST
var r = jsanalyze.analyzeJsFile(from, { minify: this.minifyJS });

// we want to sort by the "to" filename so that we correctly handle file overwriting
this.tiSymbols[to] = r.symbols;
// we want to sort by the "to" filename so that we correctly handle file overwriting
this.tiSymbols[to] = r.symbols;

this.cli.createHook('build.ios.copyResource', this, function (from, to, cb) {
var dir = path.dirname(to);
fs.existsSync(dir) || wrench.mkdirSyncRecursive(dir);

Expand Down

0 comments on commit 0984dca

Please sign in to comment.