From a148bb57d787d50bcc411b4f8f94e18a758118e4 Mon Sep 17 00:00:00 2001 From: Ramon Wijnands Date: Tue, 1 Sep 2015 17:20:43 +0200 Subject: [PATCH] remove the now unneeded misc scripts --- .travis.yml | 3 --- CONTRIBUTING.md | 2 -- misc/check.sh | 10 ---------- misc/install.sh | 18 ------------------ package.json | 3 +-- 5 files changed, 1 insertion(+), 35 deletions(-) delete mode 100755 misc/check.sh delete mode 100755 misc/install.sh diff --git a/.travis.yml b/.travis.yml index 60ae450fa..0694c5208 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,9 +27,6 @@ before_install: - npm install -g npm - npm install -g grunt-cli karma-cli - # install the dev packages we need - - ./misc/install.sh - # Set up Xfvb for Firefox headless testing - "export DISPLAY=:99.0" - "sh -e /etc/init.d/xvfb start" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 993ac3c35..da2b4e0f0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,8 +17,6 @@ roslibjs Build Setup $ cd /path/to/roslibjs/ $ [sudo] npm install ``` - 3.5. If that doesn't work, install the [Cairo](http://cairographics.org/) graphics library manually for your os and retry - - [System specific instructions](https://github.com/Automattic/node-canvas/wiki/_pages) ### Build with Grunt diff --git a/misc/check.sh b/misc/check.sh deleted file mode 100755 index 0a4650ca7..000000000 --- a/misc/check.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# check for libcairo2 -if [ -f /usr/include/cairo/cairo.h ] || [ -f /usr/local/include/cairo/cairo.h ]; then - echo libcairo2 dev files found. - exit 0 -else - echo "\033[31m"libcairo2 dev files not found. Please run misc/install.sh to install the necessary packages."\033[0m" >&2 - exit 1 -fi diff --git a/misc/install.sh b/misc/install.sh deleted file mode 100755 index f959f3051..000000000 --- a/misc/install.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -set -e -if type 'apt-get' > /dev/null; then - { - sudo apt-get install libcairo2-dev libjpeg8-dev libpango1.0-dev libgif-dev build-essential g++ -qq && - exit 0 - } -elif type 'yum' > /dev/null; then - { - sudo yum erase cairo && - sudo yum install cairo cairo-devel cairomm-devel libjpeg-turbo-devel pango pango-devel pangomm pangomm-devel giflib-devel && - exit 0 - } -fi - -# Build from source (official build steps) -curl https://raw.githubusercontent.com/Automattic/node-canvas/1.1.6/install | sh \ No newline at end of file diff --git a/package.json b/package.json index 87a3c3d98..2b4d0ad55 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,7 @@ "test": "grunt test", "test-examples": "grunt mochaTest:examples && karma start test/examples/karma.conf.js", "test-tcp": "grunt mochaTest:tcp", - "publish": "grunt build", - "preinstall": "sh misc/check.sh" + "publish": "grunt build" }, "repository": { "type": "git",