From a6773b85d2a518c5bc636d889a20ee31bd809cc7 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 14 May 2018 19:32:32 +0200 Subject: Fix sol-compiler binary so it can be called directly from packages --- packages/contracts/package.json | 2 +- packages/metacoin/package.json | 2 +- packages/sol-compiler/bin/sol-compiler.js | 2 ++ packages/sol-compiler/package.json | 2 +- packages/sol-cov/package.json | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100755 packages/sol-compiler/bin/sol-compiler.js (limited to 'packages') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index ec41f951b..cdd5417c4 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -16,7 +16,7 @@ "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov", "run_mocha": "mocha 'lib/test/**/*.js' --timeout 100000 --bail --exit", "compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846", - "compile": "node ../sol-compiler/lib/src/cli.js", + "compile": "sol-compiler", "clean": "shx rm -rf lib src/contract_wrappers/generated", "generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'", "lint": "tslint --project .", diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index e000b8a56..387eeff50 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -18,7 +18,7 @@ "coverage:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", "test:circleci": "yarn test:coverage", - "compile": "node ../sol-compiler/lib/src/cli.js compile" + "compile": "sol-compiler compile" }, "author": "", "license": "Apache-2.0", diff --git a/packages/sol-compiler/bin/sol-compiler.js b/packages/sol-compiler/bin/sol-compiler.js new file mode 100755 index 000000000..0e5b69af0 --- /dev/null +++ b/packages/sol-compiler/bin/sol-compiler.js @@ -0,0 +1,2 @@ +#!/usr/bin/env node +require('../lib/src/cli.js') diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 6edec7800..30e9a47c8 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -33,7 +33,7 @@ } }, "bin": { - "sol-compiler": "lib/src/cli.js" + "sol-compiler": "bin/sol-compiler.js" }, "repository": { "type": "git", diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index 16d0330a6..cc513c1bd 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -14,7 +14,7 @@ "run_mocha": "mocha lib/test/**/*_test.js --exit", "clean": "shx rm -rf lib scripts test/fixtures/artifacts src/artifacts", "build": "copyfiles 'test/fixtures/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", - "compile_test": "node ../sol-compiler/lib/src/cli.js compile", + "compile_test": "sol-compiler compile", "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:stage": "node scripts/stage_docs.js", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES", -- cgit v1.2.3