Commit 6b5ee5b
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,14 +1,15 @@ | |||
| 1 | - /node_modules/ | ||
| 2 | 1 | /build/ | |
| 3 | - /test/coverage/ | ||
| 4 | - /test/repos/ | ||
| 5 | - /test/test/ | ||
| 6 | - /test/home/ | ||
| 7 | - /src/ | ||
| 2 | + /coverage/ | ||
| 3 | + /dist/ | ||
| 8 | 4 | /include/ | |
| 9 | 5 | /lib/enums.js | |
| 10 | 6 | /lib/nodegit.js | |
| 11 | - /coverage/ | ||
| 7 | + /node_modules/ | ||
| 8 | + /src/ | ||
| 9 | + /test/coverage/ | ||
| 10 | + /test/home/ | ||
| 11 | + /test/repos/ | ||
| 12 | + /test/test/ | ||
| 12 | 13 | ||
| 13 | 14 | /generate/output | |
| 14 | 15 | /generate/**/*.json | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,7 @@ | |||
| 1 | 1 | /build/ | |
| 2 | 2 | /example/ | |
| 3 | 3 | /examples/ | |
| 4 | + /lib/ | ||
| 4 | 5 | /test/ | |
| 5 | 6 | /vendor/Release/ | |
| 6 | 7 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,6 +12,7 @@ var fromRegistry; | |||
| 12 | 12 | try { | |
| 13 | 13 | fs.statSync(path.join(__dirname, "..", "include")); | |
| 14 | 14 | fs.statSync(path.join(__dirname, "..", "src")); | |
| 15 | + fs.statSync(path.join(__dirname, "..", "dist")); | ||
| 15 | 16 | fromRegistry = true; | |
| 16 | 17 | } | |
| 17 | 18 | catch(e) { | |
@@ -63,7 +64,45 @@ function prepareAndBuild() { | |||
| 63 | 64 | return prepareForBuild() | |
| 64 | 65 | .then(function() { | |
| 65 | 66 | return build(); | |
| 67 | + }) | ||
| 68 | + .then(function() { | ||
| 69 | + return transpileJavascript(); | ||
| 70 | + }); | ||
| 71 | + } | ||
| 72 | + | ||
| 73 | + function transpileJavascript() { | ||
| 74 | + var cmd = pathForTool("babel"); | ||
| 75 | + var args = [ | ||
| 76 | + "--presets", | ||
| 77 | + "es2015", | ||
| 78 | + "-d", | ||
| 79 | + "./dist", | ||
| 80 | + "./lib" | ||
| 81 | + ]; | ||
| 82 | + var opts = { | ||
| 83 | + cwd: ".", | ||
| 84 | + maxBuffer: Number.MAX_VALUE, | ||
| 85 | + env: process.env, | ||
| 86 | + stdio: "inherit" | ||
| 87 | + }; | ||
| 88 | + var home = process.platform == "win32" ? | ||
| 89 | + process.env.USERPROFILE : process.env.HOME; | ||
| 90 | + | ||
| 91 | + opts.env.HOME = path.join(home, ".nodegit-gyp"); | ||
| 92 | + | ||
| 93 | + return new Promise(function(resolve, reject) { | ||
| 94 | + var child = cp.spawn(cmd, args, opts); | ||
| 95 | + child.on("close", function(code) { | ||
| 96 | + console.log(code); | ||
| 97 | + if (code) { | ||
| 98 | + reject(code); | ||
| 99 | + process.exitCode = 13; | ||
| 100 | + } | ||
| 101 | + else { | ||
| 102 | + resolve(); | ||
| 103 | + } | ||
| 66 | 104 | }); | |
| 105 | + }); | ||
| 67 | 106 | } | |
| 68 | 107 | ||
| 69 | 108 | function build() { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -21,7 +21,7 @@ | |||
| 21 | 21 | "email": "maxkorp@8bytealchemy.com" | |
| 22 | 22 | } | |
| 23 | 23 | ], | |
| 24 | - "main": "lib/nodegit.js", | ||
| 24 | + "main": "dist/nodegit.js", | ||
| 25 | 25 | "repository": { | |
| 26 | 26 | "type": "git", | |
| 27 | 27 | "url": "git://github.com/nodegit/nodegit.git" | |
@@ -42,6 +42,8 @@ | |||
| 42 | 42 | "promisify-node": "~0.3.0" | |
| 43 | 43 | }, | |
| 44 | 44 | "devDependencies": { | |
| 45 | + "babel-cli": "^6.7.7", | ||
| 46 | + "babel-preset-es2015": "^6.6.0", | ||
| 45 | 47 | "clean-for-publish": "~1.0.2", | |
| 46 | 48 | "combyne": "~0.8.1", | |
| 47 | 49 | "coveralls": "~2.11.4", | |
@@ -68,6 +70,7 @@ | |||
| 68 | 70 | "host": "https://nodegit.s3.amazonaws.com/nodegit/nodegit/" | |
| 69 | 71 | }, | |
| 70 | 72 | "scripts": { | |
| 73 | + "babel": "babel --presets es2015 -d ./dist ./lib", | ||
| 71 | 74 | "cov": "npm run cppcov && npm run filtercov && npm run mergecov", | |
| 72 | 75 | "coveralls": "cat ./test/coverage/merged.lcov | coveralls", | |
| 73 | 76 | "cppcov": "mkdir -p test/coverage/cpp && ./lcov-1.10/bin/lcov --gcov-tool /usr/bin/gcov-4.9 --capture --directory build/Release/obj.target/nodegit/src --output-file test/coverage/cpp/lcov_full.info", | |
@@ -82,9 +85,9 @@ | |||
| 82 | 85 | "mocha": "mocha test/runner test/tests --timeout 15000", | |
| 83 | 86 | "mochaDebug": "mocha --debug-brk test/runner test/tests --timeout 15000", | |
| 84 | 87 | "postinstall": "node postinstall.js", | |
| 85 | - "prepublish": "node lifecycleScripts/prepareForBuild.js", | ||
| 86 | - "rebuild": "node generate && node-gyp configure build", | ||
| 87 | - "rebuildDebug": "node generate && node-gyp configure --debug build", | ||
| 88 | + "prepublish": "node lifecycleScripts/prepareForBuild.js && npm run babel", | ||
| 89 | + "rebuild": "node generate && npm run babel && node-gyp configure build", | ||
| 90 | + "rebuildDebug": "node generate && npm run babel && node-gyp configure --debug build", | ||
| 88 | 91 | "recompile": "node-gyp configure build", | |
| 89 | 92 | "recompileDebug": "node-gyp configure --debug build", | |
| 90 | 93 | "test": "npm run lint && node --expose-gc test", | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -7,7 +7,7 @@ if (process.platform !== "linux") { | |||
| 7 | 7 | return; | |
| 8 | 8 | } | |
| 9 | 9 | ||
| 10 | - child_process.exec("node lib/nodegit.js", function(error, stdout, stderr) { | ||
| 10 | + child_process.exec("node dist/nodegit.js", function(error, stdout, stderr) { | ||
| 11 | 11 | if (stderr && ~stderr.indexOf("libstdc++")) { | |
| 12 | 12 | console.log("[ERROR] Seems like the latest libstdc++ is missing on your system!"); | |
| 13 | 13 | console.log(""); | |
0 commit comments