Repository: cordova-docs Updated Branches: refs/heads/master 0c172f251 -> 11ff3e8d1
Execute jekyll in the context of the bundle. This closes #477. Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/11ff3e8d Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/11ff3e8d Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/11ff3e8d Branch: refs/heads/master Commit: 11ff3e8d1d0782b5c42c8ae1732aeaff7e6fd4c9 Parents: 0c172f2 Author: zhangkaizhao <[email protected]> Authored: Tue Feb 2 03:52:33 2016 +0800 Committer: Dmitry Blotsky <[email protected]> Committed: Wed Feb 3 21:13:46 2016 -0800 ---------------------------------------------------------------------- Makefile | 4 ++-- gulpfile.js | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/11ff3e8d/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 5779aae..a1eeffe 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,11 @@ endif ifdef WINDOWS SHELL = cmd -JEKYLL = jekyll.bat +JEKYLL = bundle.bat exec jekyll MKDIRP = mkdir else SHELL = sh -JEKYLL = jekyll +JEKYLL = bundle exec jekyll MKDIRP = mkdir -p endif http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/11ff3e8d/gulpfile.js ---------------------------------------------------------------------- diff --git a/gulpfile.js b/gulpfile.js index 7729aa2..0537874 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -94,11 +94,11 @@ function remove(path) { fse.removeSync(path); } -function getJekyllExecutable() { +function getBundleExecutable() { if (process.platform === "win32") { - return "jekyll.bat"; + return "bundle.bat"; } else { - return "jekyll"; + return "bundle"; } } @@ -121,13 +121,13 @@ function getJekyllConfigs() { } function jekyllBuild(done) { - var jekyll = getJekyllExecutable(); + var bundle = getBundleExecutable(); var configs = getJekyllConfigs(); var flags = gutil.env.prod ? PROD_FLAGS : DEV_FLAGS; flags = flags.concat(["--config", configs.join(",")]); - exec(jekyll, ["build"].concat(flags), done); + exec(bundle, ["exec", "jekyll", "build"].concat(flags), done); } // tasks --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
