Skip to content

Commit

Permalink
fixed targetdir
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffsu committed Apr 12, 2011
1 parent 70fcfee commit d95b2aa
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 15 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
0.3.17
* CORE: Adding counter to foreach "foreach (var item:i in items) { }"
* COMMAND: Fixing compile to use targetDir instead of outDir

0.3.16
* JSML: Support dashes in classes and id
Expand Down
3 changes: 1 addition & 2 deletions dist/browser/js2-full.js
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,6 @@ function mainFunction (arg) {
var collectionName = "_c" + n;
var l = "_l" + n;

console.log(brace.getValidateString());
var v = brace.validate(/(\()(\s*)(var)(\s+)(I)(\s*\:\s*(I))?(\s+)(in)(\s+)/);
if (!v) return '';
console.log(v[7], v[5], v[4], '<<');
Expand Down Expand Up @@ -1422,7 +1421,7 @@ JS2.Class.extend('Commander', function(KLASS, OO){

OO.addMember("getUpdater",function () {
var inDir = this.config.args[0] || this.config.sourceDir || '.';
var targetDir = this.config.args[1] || this.config.outDir || inDir;
var targetDir = this.config.args[1] || this.config.targetDir || inDir;
return new JS2.Updater(this.fs, inDir, targetDir, this.config.recursive);
});

Expand Down
3 changes: 3 additions & 0 deletions dist/gem/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
0.3.17
* CORE: Adding counter to foreach "foreach (var item:i in items) { }"
* COMMAND: Fixing compile to use targetDir instead of outDir

0.3.16
* JSML: Support dashes in classes and id
Expand Down
3 changes: 1 addition & 2 deletions dist/gem/lib/js2/js2.js
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,6 @@ function mainFunction (arg) {
var collectionName = "_c" + n;
var l = "_l" + n;

console.log(brace.getValidateString());
var v = brace.validate(/(\()(\s*)(var)(\s+)(I)(\s*\:\s*(I))?(\s+)(in)(\s+)/);
if (!v) return '';
console.log(v[7], v[5], v[4], '<<');
Expand Down Expand Up @@ -1418,7 +1417,7 @@ JS2.Class.extend('Commander', function(KLASS, OO){

OO.addMember("getUpdater",function () {
var inDir = this.config.args[0] || this.config.sourceDir || '.';
var targetDir = this.config.args[1] || this.config.outDir || inDir;
var targetDir = this.config.args[1] || this.config.targetDir || inDir;
return new JS2.Updater(this.fs, inDir, targetDir, this.config.recursive);
});

Expand Down
3 changes: 3 additions & 0 deletions dist/npm/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
0.3.17
* CORE: Adding counter to foreach "foreach (var item:i in items) { }"
* COMMAND: Fixing compile to use targetDir instead of outDir

0.3.16
* JSML: Support dashes in classes and id
Expand Down
3 changes: 1 addition & 2 deletions dist/npm/lib/js2.js
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,6 @@ function mainFunction (arg) {
var collectionName = "_c" + n;
var l = "_l" + n;

console.log(brace.getValidateString());
var v = brace.validate(/(\()(\s*)(var)(\s+)(I)(\s*\:\s*(I))?(\s+)(in)(\s+)/);
if (!v) return '';
console.log(v[7], v[5], v[4], '<<');
Expand Down Expand Up @@ -1418,7 +1417,7 @@ JS2.Class.extend('Commander', function(KLASS, OO){

OO.addMember("getUpdater",function () {
var inDir = this.config.args[0] || this.config.sourceDir || '.';
var targetDir = this.config.args[1] || this.config.outDir || inDir;
var targetDir = this.config.args[1] || this.config.targetDir || inDir;
return new JS2.Updater(this.fs, inDir, targetDir, this.config.recursive);
});

Expand Down
3 changes: 1 addition & 2 deletions flavors/browser-full.js
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,6 @@ function mainFunction (arg) {
var collectionName = "_c" + n;
var l = "_l" + n;

console.log(brace.getValidateString());
var v = brace.validate(/(\()(\s*)(var)(\s+)(I)(\s*\:\s*(I))?(\s+)(in)(\s+)/);
if (!v) return '';
console.log(v[7], v[5], v[4], '<<');
Expand Down Expand Up @@ -1422,7 +1421,7 @@ JS2.Class.extend('Commander', function(KLASS, OO){

OO.addMember("getUpdater",function () {
var inDir = this.config.args[0] || this.config.sourceDir || '.';
var targetDir = this.config.args[1] || this.config.outDir || inDir;
var targetDir = this.config.args[1] || this.config.targetDir || inDir;
return new JS2.Updater(this.fs, inDir, targetDir, this.config.recursive);
});

Expand Down
3 changes: 1 addition & 2 deletions flavors/node.js
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,6 @@ function mainFunction (arg) {
var collectionName = "_c" + n;
var l = "_l" + n;

console.log(brace.getValidateString());
var v = brace.validate(/(\()(\s*)(var)(\s+)(I)(\s*\:\s*(I))?(\s+)(in)(\s+)/);
if (!v) return '';
console.log(v[7], v[5], v[4], '<<');
Expand Down Expand Up @@ -1418,7 +1417,7 @@ JS2.Class.extend('Commander', function(KLASS, OO){

OO.addMember("getUpdater",function () {
var inDir = this.config.args[0] || this.config.sourceDir || '.';
var targetDir = this.config.args[1] || this.config.outDir || inDir;
var targetDir = this.config.args[1] || this.config.targetDir || inDir;
return new JS2.Updater(this.fs, inDir, targetDir, this.config.recursive);
});

Expand Down
3 changes: 1 addition & 2 deletions flavors/ringo-full.js
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,6 @@ function mainFunction (arg) {
var collectionName = "_c" + n;
var l = "_l" + n;

console.log(brace.getValidateString());
var v = brace.validate(/(\()(\s*)(var)(\s+)(I)(\s*\:\s*(I))?(\s+)(in)(\s+)/);
if (!v) return '';
console.log(v[7], v[5], v[4], '<<');
Expand Down Expand Up @@ -1420,7 +1419,7 @@ JS2.Class.extend('Commander', function(KLASS, OO){

OO.addMember("getUpdater",function () {
var inDir = this.config.args[0] || this.config.sourceDir || '.';
var targetDir = this.config.args[1] || this.config.outDir || inDir;
var targetDir = this.config.args[1] || this.config.targetDir || inDir;
return new JS2.Updater(this.fs, inDir, targetDir, this.config.recursive);
});

Expand Down
3 changes: 1 addition & 2 deletions flavors/ruby.js
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,6 @@ function mainFunction (arg) {
var collectionName = "_c" + n;
var l = "_l" + n;

console.log(brace.getValidateString());
var v = brace.validate(/(\()(\s*)(var)(\s+)(I)(\s*\:\s*(I))?(\s+)(in)(\s+)/);
if (!v) return '';
console.log(v[7], v[5], v[4], '<<');
Expand Down Expand Up @@ -1418,7 +1417,7 @@ JS2.Class.extend('Commander', function(KLASS, OO){

OO.addMember("getUpdater",function () {
var inDir = this.config.args[0] || this.config.sourceDir || '.';
var targetDir = this.config.args[1] || this.config.outDir || inDir;
var targetDir = this.config.args[1] || this.config.targetDir || inDir;
return new JS2.Updater(this.fs, inDir, targetDir, this.config.recursive);
});

Expand Down
2 changes: 1 addition & 1 deletion src/Common/Commander.js2
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Commander {

function getUpdater() {
var inDir = this.config.args[0] || this.config.sourceDir || '.';
var targetDir = this.config.args[1] || this.config.outDir || inDir;
var targetDir = this.config.args[1] || this.config.targetDir || inDir;
return new JS2.Updater(this.fs, inDir, targetDir, this.config.recursive);
}

Expand Down

0 comments on commit d95b2aa

Please sign in to comment.