From 9c4af4ea60e0c7cfe76f139f336534701791bd48 Mon Sep 17 00:00:00 2001 From: kali Date: Mon, 23 Jul 2012 10:47:31 -0700 Subject: add todo in compile resource stuff --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8f50f561..3ddcb0a5 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,9 @@ # ################################ # Makefile for compiling resources # files. +# TODO move to setup scripts +# and implement it in python +# http://die-offenbachs.homelinux.org:48888/hg/eric5/file/5072605ad4dd/compileUiFiles.py ###### EDIT ###################### #Directory with ui and resource files RESOURCE_DIR = data/resources -- cgit v1.2.3 From 247a0aff2f75b012feede58cda3049d68f783208 Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 9 Aug 2012 22:04:43 +0900 Subject: added packaging feature to Makefile --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3ddcb0a5..59343dfc 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,10 @@ PYRCC = pyrcc4 COMPILED_UI = $(UI_FILES:%.ui=$(COMPILED_DIR)/ui_%.py) COMPILED_RESOURCES = $(RESOURCES:%.qrc=$(COMPILED_DIR)/%_rc.py) + +DEBVER = $(shell dpkg-parsechangelog | sed -ne 's,Version: ,,p') + +# all : resources ui @@ -39,6 +43,10 @@ $(COMPILED_DIR)/ui_%.py : $(RESOURCE_DIR)/%.ui $(COMPILED_DIR)/%_rc.py : $(RESOURCE_DIR)/%.qrc $(PYRCC) $< -o $@ - + +deb: + @git tag -a debian/$(DEBVER) -m "..." + @debuild -us -uc -i.git + clean : $(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc) -- cgit v1.2.3 From d04c93134ad3daaee0ca280824ab3288bfc5029c Mon Sep 17 00:00:00 2001 From: kali Date: Fri, 16 Nov 2012 22:59:16 +0900 Subject: initial translation example. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 59343dfc..d36c5601 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ COMPILED_DIR = src/leap/gui UI_FILES = #Qt resource files to compile #images.qrc -RESOURCES = mainwindow.qrc +RESOURCES = mainwindow.qrc locale.qrc #pyuic4 and pyrcc4 binaries PYUIC = pyuic4 -- cgit v1.2.3 From 06bccc52c84a93407ab4699a2749b24f55fe3061 Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 20 Dec 2012 08:19:55 +0900 Subject: working transifex workflow Closes #666 --- Makefile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d36c5601..5bdf9c36 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,19 @@ # TODO move to setup scripts # and implement it in python # http://die-offenbachs.homelinux.org:48888/hg/eric5/file/5072605ad4dd/compileUiFiles.py -###### EDIT ###################### +###### EDIT ###################### + #Directory with ui and resource files RESOURCE_DIR = data/resources #Directory for compiled resources COMPILED_DIR = src/leap/gui + +#Directory for (finished) translations +TRANSLAT_DIR = data/translations + +#Project file, used for translations +PROJFILE = data/leap_client.pro #UI files to compile # UI_FILES = foo.ui @@ -21,6 +28,9 @@ RESOURCES = mainwindow.qrc locale.qrc #pyuic4 and pyrcc4 binaries PYUIC = pyuic4 PYRCC = pyrcc4 +PYLUP = pylupdate4 +LRELE = lrelease + ################################# # DO NOT EDIT FOLLOWING @@ -37,6 +47,10 @@ all : resources ui resources : $(COMPILED_RESOURCES) ui : $(COMPILED_UI) + +translations: + $(PYLUP) $(PROJFILE) + $(LRELE) $(TRANSLAT_DIR)/*.ts $(COMPILED_DIR)/ui_%.py : $(RESOURCE_DIR)/%.ui $(PYUIC) $< -o $@ -- cgit v1.2.3 From ea4a3b3396caeeaa2be4dc46aecf386a56a522c9 Mon Sep 17 00:00:00 2001 From: kali Date: Fri, 21 Dec 2012 08:11:18 +0900 Subject: included api docs --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5bdf9c36..a8859725 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +SHELL := /bin/zsh # ################################ # Makefile for compiling resources # files. @@ -62,5 +63,8 @@ deb: @git tag -a debian/$(DEBVER) -m "..." @debuild -us -uc -i.git +apidocs: + @sphinx-apidoc -o docs/api src/leap + clean : $(RM) $(COMPILED_UI) $(COMPILED_RESOURCES) $(COMPILED_UI:.py=.pyc) $(COMPILED_RESOURCES:.py=.pyc) -- cgit v1.2.3 From 32b9b16db7dfff461f4b60d668f7d21c10fe51e8 Mon Sep 17 00:00:00 2001 From: kali Date: Wed, 30 Jan 2013 05:26:00 +0900 Subject: add manpage in rst format --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a8859725..cfcd47a1 100644 --- a/Makefile +++ b/Makefile @@ -59,9 +59,8 @@ $(COMPILED_DIR)/ui_%.py : $(RESOURCE_DIR)/%.ui $(COMPILED_DIR)/%_rc.py : $(RESOURCE_DIR)/%.qrc $(PYRCC) $< -o $@ -deb: - @git tag -a debian/$(DEBVER) -m "..." - @debuild -us -uc -i.git +manpages: + rst2man docs/man/leap.1.rst docs/man/leap.1 apidocs: @sphinx-apidoc -o docs/api src/leap -- cgit v1.2.3 From 15e8cf89db0ba3f4921a9ffcae72a0bc4cbf4b69 Mon Sep 17 00:00:00 2001 From: kali Date: Wed, 30 Jan 2013 14:46:56 +0900 Subject: rename manpage I am also commiting the manpage itself temporarily, we should leave only the .rst in the repo! --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cfcd47a1..8d63232f 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ $(COMPILED_DIR)/%_rc.py : $(RESOURCE_DIR)/%.qrc $(PYRCC) $< -o $@ manpages: - rst2man docs/man/leap.1.rst docs/man/leap.1 + rst2man docs/man/leap-client.1.rst docs/man/leap-client.1 apidocs: @sphinx-apidoc -o docs/api src/leap -- cgit v1.2.3