From f99e553d989945e44f81bd56307cb9c9a049b3a2 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 20 Aug 2018 15:07:12 -0400 Subject: add mkdir -p inx bin/generate-inx-files target and gitignore entry --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4c31f17e..1cc223e4 100644 --- a/Makefile +++ b/Makefile @@ -23,11 +23,16 @@ dist: distclean locales distclean: rm -rf build dist *.spec *.tar.gz +.PHONY: inx +inx: + mkdir -p inx + bin/generate-inx-files + +.PHONY: messages.po messages.po: rm -f messages.po pybabel extract -o messages.po -F babel.conf --add-location=full --add-comments=l10n,L10n,L10N --sort-by-file --strip-comments . -.PHONY: messages.po .PHONY: locales locales: # message files will look like this: -- cgit v1.2.3 From f7f59efd7d5117c6b9b43b100df5fe646ea46bc3 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 20 Aug 2018 15:17:55 -0400 Subject: gettextify pyembroidery format descriptions --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1cc223e4..a91eabe1 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,9 @@ inx: .PHONY: messages.po messages.po: rm -f messages.po + bin/pyembroidery-gettext > pyembroidery-format-descriptions.py pybabel extract -o messages.po -F babel.conf --add-location=full --add-comments=l10n,L10n,L10N --sort-by-file --strip-comments . + rm pyembroidery-format-descriptions.py .PHONY: locales locales: -- cgit v1.2.3 From 871358d990d4a06b2eaaf0e405f2d18e26753d52 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 20 Aug 2018 15:49:19 -0400 Subject: gettextify INX templates --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a91eabe1..a7fd0e83 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ inx: messages.po: rm -f messages.po bin/pyembroidery-gettext > pyembroidery-format-descriptions.py - pybabel extract -o messages.po -F babel.conf --add-location=full --add-comments=l10n,L10n,L10N --sort-by-file --strip-comments . + pybabel extract -o messages.po -F babel.conf --add-location=full --add-comments=l10n,L10n,L10N --sort-by-file --strip-comments -k N_ . rm pyembroidery-format-descriptions.py .PHONY: locales -- cgit v1.2.3 From a2cad1f522074b84895897632ac69dcb5deda340 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 20 Aug 2018 20:42:02 -0400 Subject: generate INX files for all languages --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a7fd0e83..476a920d 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ distclean: rm -rf build dist *.spec *.tar.gz .PHONY: inx -inx: +inx: locales mkdir -p inx bin/generate-inx-files -- cgit v1.2.3 From c9f9d3ef79d84ba4db86227219c2ce511f344b86 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 20 Aug 2018 20:43:19 -0400 Subject: generate inx files during build --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 476a920d..94194bf5 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ VERSION:=$(subst /,-,$(TRAVIS_BRANCH)) OS:=$(TRAVIS_OS_NAME) ARCH:=$(shell uname -m) -dist: distclean locales +dist: distclean locales inx bin/build-dist $(EXTENSIONS) cp inx/*.inx dist cp -a images/examples dist/inkstitch -- cgit v1.2.3 From 9abb2f9799e9f4c075ac9686f2bfe5f5d567c681 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 20 Aug 2018 21:59:49 -0400 Subject: fix windows and mac --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 94194bf5..030ddd67 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,11 @@ distclean: .PHONY: inx inx: locales mkdir -p inx - bin/generate-inx-files + if [ "$$BUILD" = "windows" ]; then \ + wine c:\\Python\\python.exe bin/generate-inx-files; \ + else \ + bin/generate-inx-files; \ + fi .PHONY: messages.po messages.po: -- cgit v1.2.3 From 235fa2f7e67dea1ef20830ae658eb4f817a5caef Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Wed, 22 Aug 2018 14:54:14 -0400 Subject: add `make style` make target --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 030ddd67..24f33763 100644 --- a/Makefile +++ b/Makefile @@ -53,3 +53,7 @@ locales: else \ mkdir -p locales; \ fi + +.PHONY: style +style: + flake8 . --count --max-complexity=10 --max-line-length=150 --statistics --exclude=pyembroidery,__init__.py -- cgit v1.2.3 From adc0e3e43bb83f4608317293537309d8a53a496e Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Thu, 23 Aug 2018 21:47:27 -0400 Subject: TEMPORARY: ignore simulator.py and params.py in style check --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 24f33763..770fd585 100644 --- a/Makefile +++ b/Makefile @@ -56,4 +56,4 @@ locales: .PHONY: style style: - flake8 . --count --max-complexity=10 --max-line-length=150 --statistics --exclude=pyembroidery,__init__.py + flake8 . --count --max-complexity=10 --max-line-length=150 --statistics --exclude=pyembroidery,__init__.py,simulator.py,params.py -- cgit v1.2.3