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

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
=== modified file '.bzrignore'
--- .bzrignore 2016-09-01 09:31:44 +0000
+++ .bzrignore 2016-09-06 06:42:24 +0000
@@ -2,3 +2,4 @@
2nav/index.html.strings.h2nav/index.html.strings.h
3nav/locales/mo/*3nav/locales/mo/*
4nav/locales/po/messages-*.json4nav/locales/po/messages-*.json
5*.click
56
=== modified file 'Makefile'
--- Makefile 2016-09-01 09:45:29 +0000
+++ Makefile 2016-09-06 06:42:24 +0000
@@ -1,13 +1,8 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2# -*- makefile -*-2# -*- makefile -*-
33
4#APP_ID needs to match the "name" field of the click manifest
5APP_ID=costales.unav
6
7POT_FILE=po/unav.pot4POT_FILE=po/unav.pot
85
9all: $(POT_FILE)
10
11HTML_STRINGS_FILE=nav/index.html.strings6HTML_STRINGS_FILE=nav/index.html.strings
12$(HTML_STRINGS_FILE): nav/index.html7$(HTML_STRINGS_FILE): nav/index.html
13 grep -Po 'data-localize=([^>]*)' $< > $@8 grep -Po 'data-localize=([^>]*)' $< > $@
@@ -51,6 +46,14 @@
5146
52translations: $(MO_FILES) $(JSON_FILES) $(FIXED_JSON_FILES)47translations: $(MO_FILES) $(JSON_FILES) $(FIXED_JSON_FILES)
5348
49APPNAME=$(shell grep -Po '"name":\s*"([^>]*)"' manifest.json | cut -d\" -f4)
50APPVERSION=$(shell grep -Po '"version":\s*"([^>]*)"' manifest.json | cut -d\" -f4)
51APPARCH=all
52CLICKPKG=$(APPNAME)_$(APPVERSION)_$(APPARCH).click
53$(CLICKPKG): translations
54 click build -I Makefile -I "*.click" -I po -I 3rdparty -I README .
55click: $(CLICKPKG)
56
54clean:57clean:
55 rm -rf $(HTML_STRINGS_FILE) $(HTML_STRINGS_FILE).h $(MO_ROOT)/* $(JSON_ROOT)/*58 rm -rf $(HTML_STRINGS_FILE) $(HTML_STRINGS_FILE).h $(MO_ROOT)/* $(JSON_ROOT)/* *.click
5659

Subscribers

People subscribed via source and target branches