Fixes to previous commit
Require PEG only in the "parser" task -- it may not exist when executing the "build" task. Also don't make the "build" task dependent on the "parser" to break a dependency circle.
This commit is contained in:
parent
f3845726f2
commit
4c59bbfef9
5
Jakefile
5
Jakefile
|
@ -16,8 +16,6 @@ var PARSER_OUT_FILE = SRC_DIR + "/parser.js";
|
||||||
|
|
||||||
var PEGJS_VERSION = fs.readFileSync("VERSION", "utf8").trim();
|
var PEGJS_VERSION = fs.readFileSync("VERSION", "utf8").trim();
|
||||||
|
|
||||||
var PEG = require(PEGJS_OUT_FILE);
|
|
||||||
|
|
||||||
function exitFailure() {
|
function exitFailure() {
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
@ -29,6 +27,7 @@ function abort(message) {
|
||||||
|
|
||||||
desc("Generate the grammar parser");
|
desc("Generate the grammar parser");
|
||||||
task("parser", [], function() {
|
task("parser", [], function() {
|
||||||
|
var PEG = require(PEGJS_OUT_FILE);
|
||||||
var input = fs.readFileSync(PARSER_SRC_FILE, "utf8");
|
var input = fs.readFileSync(PARSER_SRC_FILE, "utf8");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
@ -45,7 +44,7 @@ task("parser", [], function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
desc("Build the peg.js file");
|
desc("Build the peg.js file");
|
||||||
task("build", ["parser"], function() {
|
task("build", [], function() {
|
||||||
function preprocess(file) {
|
function preprocess(file) {
|
||||||
var input = fs.readFileSync(file, "utf8").trim();
|
var input = fs.readFileSync(file, "utf8").trim();
|
||||||
return input.split("\n").map(function(line) {
|
return input.split("\n").map(function(line) {
|
||||||
|
|
Loading…
Reference in a new issue