Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202051
Change subject: makefile: add "easy button" to install dependencies
......................................................................
makefile: add "easy button" to install dependencies
- Add "brew-install" goal which installs packages via Homebrew
- Added separate "get-*" goals for installing larger items like:
- Xcode CL Tools
- Homebrew
- Node
- Ruby
- Bundler
- Reintroduced "get-deps" goal for devs who are starting from scratch
- Bonus: added a "verify" goal which lints, analyzes, and tests
Bug: T94229
Change-Id: Ib3b0b480e3b21a812dd464fc8b775b729677ca04
---
M Makefile
1 file changed, 74 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/51/202051/1
diff --git a/Makefile b/Makefile
index 7714562..87df394 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
XCODE_VERSION = "$(shell xcodebuild -version 2>/dev/null)"
XC_WORKSPACE = Wikipedia.xcworkspace
+XC_PROJECT = Wikipedia.xcodeproj
XCODEBUILD_BASE_ARGS = -workspace $(XC_WORKSPACE)
XC_DEFAULT_SCHEME = Wikipedia
@@ -7,52 +8,93 @@
@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' |
sed -e 's/##//'
clean: ##Clean the Xcode workspace
+clean: xcode-cltools-check
xcodebuild clean $(XCODEBUILD_BASE_ARGS) -scheme $(XC_DEFAULT_SCHEME)
build: ##Fetch code dependencies and build the app for release
-build:
+build: xcode-cltools-check
xcodebuild build $(XCODEBUILD_BASE_ARGS) \
-scheme $(XC_DEFAULT_SCHEME) \
-sdk iphoneos \
-configuration Release
build-sim: ##Fetch code dependencies and build the app for debugging in the
simulator
-build-sim:
+build-sim: xcode-cltools-check
xcodebuild build $(XCODEBUILD_BASE_ARGS) \
-scheme $(XC_DEFAULT_SCHEME) \
-sdk iphonesimulator \
-configuration Debug
+# Only use the project, not workspace during analyze to prevent analysis of
the Pods
+analyze: ##Run static analysis
+analyze: xcode-cltools-check
+ xcodebuild analyze -project $(XC_PROJECT) \
+ -sdk iphonesimulator \
+ -target Wikipedia
+
test: ##Fetch code dependencies and run tests
-test:
+test: xcode-cltools-check
xcodebuild test $(XCODEBUILD_BASE_ARGS) \
-scheme $(XC_DEFAULT_SCHEME) \
-sdk iphonesimulator
+verify: ##Lint, anaylze, and run tests
+verify: lint analyze test
+
lint: ##Lint the native code, requires uncrustify
+lint:
@scripts/uncrustify_all.sh
check-deps: ##Make sure system prerequisites are installed
-check-deps: xcode-cltools exec-deps node bundler
+check-deps: xcode-cltools-check exec-check node-check
+
+bootstrap: ##Only recommended if starting from scratch! Attempts to install
all dependencies (Xcode command-line tools Homebrew, Ruby, Node, Bundler,
etc...)
+bootstrap: get-xcode-cltools get-homebrew get-node get-bundler brew-install
bundle-install
#!!!!!
#!!!!! Xcode dependencies
#!!!!!
-xcode-cltools: ##Make sure proper Xcode & command line tools are installed
+# Required so we (and other tools) can use command line tools, e.g. xcodebuild.
+xcode-cltools-check: ##Make sure proper Xcode & command line tools are
installed
@case $(XCODE_VERSION) in \
"Xcode 6"*) echo "Xcode 6 or higher is installed with command
line tools!" ;; \
*) echo "Missing Xcode 6 or higher and/or the command line
tools."; exit 1;; \
esac
+get-xcode-cltools: ##Install Xcode command-line tools
+ xcode-select --install
+
#!!!!!
#!!!!! Executable dependencies
#!!!!!
-# Append additional dependencies as quoted strings (i.e. EXEC_DEPS = "dep1"
"dep2" ...)
-EXEC_DEPS = "uncrustify" "convert" "gs"
+get-homebrew: ##Install Homebrew using the bootstrapping script from
http://brew.sh
+ @if [[ ! $$(brew -v 2>/dev/null) =~ "Homebrew" ]]; then \
+ ruby -e "$(curl -fsSL
https://raw.githubusercontent.com/Homebrew/install/master/install)"; \
+ fi
-exec-deps: ##Check that executable dependencies are installed
+brew-check: ##Check that Homebrew is installed
+ @if [[ $$(brew -v 2>/dev/null) =~ "Homebrew" ]]; then \
+ echo "Homebrew is installed!"; \
+ else \
+ echo "Please setup Homebrew by running `make get-homebrew` or
following instructions on http://brew.sh/";; \
+ exit 1; \
+ fi
+
+# Append additional dependencies as quoted strings (i.e. BREW_FORMULAE = "f1"
"f2" ...)
+BREW_FORMULAE = "uncrustify" "imagemagick" "gs" "xctool"
+
+brew-install: ##Install executable dependencies via Homebrew
+brew-install: brew-check
+ brew install $(BREW_FORMULAE)
+
+# Append additional dependencies as quoted strings (i.e. EXEC_DEPS = "dep1"
"dep2" ...)
+EXEC_DEPS = "uncrustify" "convert" "gs" "xctool"
+
+# Note: checking for specific executables instead of formula, since Homebrew
+# is just one of many ways to install them
+exec-check: ##Check that executable dependencies are installed
@for dep in $(EXEC_DEPS); do \
if [[ -x $$(which $${dep}) ]]; then \
echo "$${dep} is installed!"; \
@@ -63,40 +105,43 @@
done
#!!!!!
-#!!!!! Node dependencies
+#!!!!! Node dependency management
#!!!!!
-NODE_VERSION = "$(shell node -v)"
-NPM_VERSION = "$(shell npm -version)"
+NODE_VERSION = "$(shell node -v 2>/dev/null)"
+NPM_VERSION = "$(shell npm -version 2>/dev/null)"
npm: ##TODO, run npm install
-node: # Make sure node is installed
+get-node: ##Install node via Homebrew
+ brew install node
+
+node-check: ##Make sure node is installed
@if [[ $(NODE_VERSION) > "v0.10" && $(NPM_VERSION) > "1.4" ]]; then \
- echo "node and npm are installed!" ; \
+ echo "node and npm are installed and up to date!" ; \
else \
- echo "Missing node v0.10 and/or higher and npm 1.4 or higher."
; \
+ echo "node v0.10 or higher and npm 1.4 or higher are not installed. You
can use homebrew to install (brew install node) or upgrade if out of date (brew
upgrade node)" ; \
exit 1; \
fi
#!!!!!
-#!!!!! Ruby dependencies
+#!!!!! Ruby dependency management
#!!!!!
-RUBY_VERSION = "$(shell ruby -v)"
-BUNDLER = "$(shell which bundle)"
+RUBY_VERSION = "$(shell ruby -v 2>/dev/null)"
+BUNDLER = "$(shell which bundle 2/dev/null)"
pod: ##Install native dependencies via CocoaPods
pod: bundle-install
@$(BUNDLER) exec pod install
bundle-install: ##Install gems using Bundler
-bundle-install: bundler
+bundle-install: bundler-check
@$(BUNDLER) config build.nokogiri --use-system-libraries
@$(BUNDLER) install
-bundler: ##Make sure Bundler is installed
-bundler: ruby
+bundler-check: ##Make sure Bundler is installed
+bundler-check: ruby-check
@if [[ $(BUNDLER) == "" ]]; then \
echo "Missing the Bundler Ruby gem." ; \
exit 1 ; \
@@ -104,10 +149,18 @@
echo "Bundler is installed!" ; \
fi
-ruby: ##Make sure Ruby is installed
+get-bundler: ##Install Bundler, requires Ruby installed outside /usr/bin
+get-bundler: get-ruby
+ gem install bundler
+
+ruby-check: ##Make sure Ruby is installed
@if [[ $(RUBY_VERSION) == "" ]]; then \
echo "Ruby is missing!" ; \
exit 1 ; \
else \
echo "Ruby is installed!" ; \
fi
+
+get-ruby: ##Install Ruby via Homebrew (to remove need for sudo)
+ brew install ruby
+
--
To view, visit https://gerrit.wikimedia.org/r/202051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3b0b480e3b21a812dd464fc8b775b729677ca04
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Bgerstle <bgers...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
