Updated Branches: refs/heads/master 9d6c304c8 -> 9814d1902
Updated Makefile to with target to install wkhtmltopdf version 0.9.9 by default (0.11.0_rc1 has perf problems) Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/9814d190 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/9814d190 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/9814d190 Branch: refs/heads/master Commit: 9814d1902a81274829da2b855363a6aa2f0d4a8a Parents: 9d6c304 Author: Shazron Abdullah <shaz...@apache.org> Authored: Thu May 24 15:36:20 2012 -0700 Committer: Shazron Abdullah <shaz...@apache.org> Committed: Thu May 24 15:36:20 2012 -0700 ---------------------------------------------------------------------- Makefile | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/9814d190/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 26709df..10ca21d 100644 --- a/Makefile +++ b/Makefile @@ -271,16 +271,11 @@ install-brew: check-wkhtmltopdf: check-brew @if [[ ! -e `which wkhtmltopdf` ]]; then \ - echo -e '\033[31mError: wkhtmltopdf was not found, or not on your path. To install wkhtmltopdf, Install it from homebrew: "brew install wkhtmltopdf" or "make install-wkhtmltopdf"\033[m'; \ - echo -e '\033[31mNOTE: Version 0.11.0_rc1 is really slow "brew versions wkhtmltopdf" to see how to install version 0.9.9\033[m'; exit 1; \ + echo -e '\033[31mError: wkhtmltopdf was not found, or not on your path. To install wkhtmltopdf, install v0.9.9 by running the command "make install-wkhtmltopdf"\033[m'; exit 1;\ fi install-wkhtmltopdf: check-brew - @echo -e '\033[31mNOTE: Version 0.11.0_rc1 is really slow. "brew versions wkhtmltopdf" to see how to install version 0.9.9, or "make downgrade-wkhtmltopdf"\033[m' - @brew install wkhtmltopdf - -downgrade-wkhtmltopdf: check-brew - @brew unlink wkhtmltopdf + @# note: only version 0.9.9 should be used, 0.11.0_rc1 has a perf issue @cd `brew --cellar`; git checkout 6e2d550 /usr/local/Library/Formula/wkhtmltopdf.rb @brew install wkhtmltopdf