uNav

Merge lp:~osomon/unav/make-click into lp:unav

  1. make-click
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Merged at revision: 112
Proposed branch: lp:~osomon/unav/make-click
Merge into: lp:unav
Diff against target: 41 lines (+10/-6)
2 files modified
.bzrignore (+1/-0)
Makefile (+9/-6)
To merge this branch: bzr merge lp:~osomon/unav/make-click
Reviewer Review Type Date Requested Status
costales Approve
Review via email: mp+304970@code.launchpad.net

Commit message

Add a "click" rule to the Makefile to build a click package.

To post a comment you must log in.
Revision history for this message
costales (costales) wrote :

Looks great for me :) Thanks!!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2016-09-01 09:31:44 +0000
3+++ .bzrignore 2016-09-06 06:42:24 +0000
4@@ -2,3 +2,4 @@
5 nav/index.html.strings.h
6 nav/locales/mo/*
7 nav/locales/po/messages-*.json
8+*.click
9
10=== modified file 'Makefile'
11--- Makefile 2016-09-01 09:45:29 +0000
12+++ Makefile 2016-09-06 06:42:24 +0000
13@@ -1,13 +1,8 @@
14 #!/usr/bin/make -f
15 # -*- makefile -*-
16
17-#APP_ID needs to match the "name" field of the click manifest
18-APP_ID=costales.unav
19-
20 POT_FILE=po/unav.pot
21
22-all: $(POT_FILE)
23-
24 HTML_STRINGS_FILE=nav/index.html.strings
25 $(HTML_STRINGS_FILE): nav/index.html
26 grep -Po 'data-localize=([^>]*)' $< > $@
27@@ -51,6 +46,14 @@
28
29 translations: $(MO_FILES) $(JSON_FILES) $(FIXED_JSON_FILES)
30
31+APPNAME=$(shell grep -Po '"name":\s*"([^>]*)"' manifest.json | cut -d\" -f4)
32+APPVERSION=$(shell grep -Po '"version":\s*"([^>]*)"' manifest.json | cut -d\" -f4)
33+APPARCH=all
34+CLICKPKG=$(APPNAME)_$(APPVERSION)_$(APPARCH).click
35+$(CLICKPKG): translations
36+ click build -I Makefile -I "*.click" -I po -I 3rdparty -I README .
37+click: $(CLICKPKG)
38+
39 clean:
40- rm -rf $(HTML_STRINGS_FILE) $(HTML_STRINGS_FILE).h $(MO_ROOT)/* $(JSON_ROOT)/*
41+ rm -rf $(HTML_STRINGS_FILE) $(HTML_STRINGS_FILE).h $(MO_ROOT)/* $(JSON_ROOT)/* *.click
42

Subscribers

People subscribed via source and target branches