Skip to content

Commit

Permalink
Move tobject2json module to main dir (#253)
Browse files Browse the repository at this point in the history
* Move tobject2json module to main dir

* Drop ignore scripts

* Remove postinstall line from package.json when on Travis
  • Loading branch information
awegrzyn committed Jan 24, 2019
1 parent 602c4c2 commit 4afc1bb
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,3 +2,4 @@
.DS_Store
node_modules
build
tobject2json.node
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -34,7 +34,7 @@ before_install:
install:
- if [[ -f "$TRAVIS_BUILD_DIR/Framework/_TEST" ]]; then cd $TRAVIS_BUILD_DIR/Framework; npm install; fi
- if [[ -f "$TRAVIS_BUILD_DIR/Control/_TEST" ]]; then cd $TRAVIS_BUILD_DIR/Control; npm install; fi
- if [[ -f "$TRAVIS_BUILD_DIR/QualityControl/_TEST" ]]; then cd $TRAVIS_BUILD_DIR/QualityControl; rm -f binding.gyp; npm install; fi
- if [[ -f "$TRAVIS_BUILD_DIR/QualityControl/_TEST" ]]; then cd $TRAVIS_BUILD_DIR/QualityControl; rm -f binding.gyp; sed -i.bak -e '12d' package.json; npm install; fi
- if [[ -f "$TRAVIS_BUILD_DIR/InfoLogger/_TEST" ]]; then cd $TRAVIS_BUILD_DIR/InfoLogger; npm install; fi
before_script:
- npm install -g codecov nyc jsdoc-to-markdown
Expand Down
2 changes: 1 addition & 1 deletion QualityControl/lib/TObject2JsonClient.js
@@ -1,4 +1,4 @@
const tobject2json = require('../build/Release/tobject2json.node');
const tobject2json = require('../tobject2json.node');

/**
* Connect to a TObject2Json server and send requests though TCP/IP
Expand Down
3 changes: 2 additions & 1 deletion QualityControl/package.json
Expand Up @@ -8,7 +8,8 @@
"test": "npm run eslint && npm run mocha",
"dev": "nodemon --watch index.js --watch lib --watch config.js index.js",
"eslint": "./node_modules/.bin/eslint --config ../.eslintrc.js *.js lib/ public/",
"mocha": "mocha --exit test/mocha-*"
"mocha": "mocha --exit test/mocha-*",
"postinstall": "mv build/Release/tobject2json.node ."
},
"author": "Vladimir Kosmala",
"license": "GPL-3.0",
Expand Down

0 comments on commit 4afc1bb

Please sign in to comment.