From cd19fc7c81980aa2204b5962df6ca2cb69ab8aef Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Wed, 16 Apr 2014 16:49:40 -0700 Subject: [PATCH] New: capp_lint is installed with jake install Previously we had to install capp_lint separately from Cappuccino. Now capp_lint will be installed with Cappuccino. Before capp_lint was installed in /urs/local/bin/, now it is in /usr/local/narwhal/bin/. --- Tools/Jakefile | 2 +- Tools/capp_lint/Jakefile | 12 ++++++++++++ Tools/capp_lint/install.sh | 6 +++--- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 Tools/capp_lint/Jakefile diff --git a/Tools/Jakefile b/Tools/Jakefile index 40a8a1fb9..d57ab7c6c 100644 --- a/Tools/Jakefile +++ b/Tools/Jakefile @@ -2,6 +2,6 @@ require("../common.jake"); // nib2cib uses fontinfo and imagesize and capp uses nib2cib -subtasks(["fontinfo", "imagesize", "nib2cib", "capp", "dump_theme", "NativeHost", "XcodeCapp"], ["build"/*, "clean", "clobber"*/]); +subtasks(["fontinfo", "imagesize", "nib2cib", "capp", "capp_lint", "dump_theme", "NativeHost", "XcodeCapp"], ["build"/*, "clean", "clobber"*/]); subtasks(["fontinfo", "imagesize"], ["clean", "clobber"]); diff --git a/Tools/capp_lint/Jakefile b/Tools/capp_lint/Jakefile new file mode 100644 index 000000000..fd6dd3750 --- /dev/null +++ b/Tools/capp_lint/Jakefile @@ -0,0 +1,12 @@ + +require ("../../common.jake"); + +var OS = require("os"), + task = require("jake").task; + +task ("build", function() +{ + sudo(["./install.sh"]); +}); + +task ("default", ["build"]); \ No newline at end of file diff --git a/Tools/capp_lint/install.sh b/Tools/capp_lint/install.sh index 40a90bb50..847b66630 100755 --- a/Tools/capp_lint/install.sh +++ b/Tools/capp_lint/install.sh @@ -2,11 +2,11 @@ chmod +x capp_lint -if [[ ! -d /usr/local/bin ]]; then - sudo mkdir -p /usr/local/bin +if [[ ! -d /usr/local/narwhal/bin ]]; then + sudo mkdir -p /usr/local/narwhal/bin fi -sudo cp capp_lint /usr/local/bin +sudo cp capp_lint /usr/local/narwhal/bin if [[ ! -d /usr/local/share/man/man1 ]]; then sudo mkdir -p /usr/local/share/man/man1