update configure/makefile

This commit is contained in:
Florian Dold 2016-11-23 01:29:34 +01:00
parent 899c0027f9
commit 8c5a794cc8
8 changed files with 26 additions and 21 deletions

View File

@ -6,18 +6,21 @@ gulp = node_modules/gulp/bin/gulp.js
tsc = node_modules/typescript/bin/tsc tsc = node_modules/typescript/bin/tsc
po2json = node_modules/po2json/bin/po2json po2json = node_modules/po2json/bin/po2json
.PHONY: pogen src/i18n/strings.js .PHONY: pogen src/i18n/strings.js yarn-install
package-stable: tsc i18n package-stable: tsc i18n yarn-install
$(gulp) package-stable $(gulp) package-stable
package-unstable: tsc i18n package-unstable: tsc i18n yarn-install
$(gulp) package-unstable $(gulp) package-unstable
tsc: tsconfig.json tsc: tsconfig.json yarn-install
$(tsc) $(tsc)
tsconfig.json: gulpfile.js yarn-install:
yarn install
tsconfig.json: gulpfile.js yarn-install
$(gulp) tsconfig $(gulp) tsconfig
i18n: pogen msgmerge src/i18n/strings.js i18n: pogen msgmerge src/i18n/strings.js
@ -25,7 +28,7 @@ i18n: pogen msgmerge src/i18n/strings.js
pogen/pogen.js: pogen/pogen.ts pogen/tsconfig.json pogen/pogen.js: pogen/pogen.ts pogen/tsconfig.json
cd pogen; ../$(tsc) cd pogen; ../$(tsc)
pogen: $(ts) pogen/pogen.js pogen: $(ts) pogen/pogen.js yarn-install
find $(src) \( -name '*.ts' -or -name '*.tsx' \) ! -name '*.d.ts' \ find $(src) \( -name '*.ts' -or -name '*.tsx' \) ! -name '*.d.ts' \
| xargs node pogen/pogen.js \ | xargs node pogen/pogen.js \
| msguniq \ | msguniq \
@ -41,9 +44,6 @@ msgmerge:
dist: dist:
$(gulp) srcdist $(gulp) srcdist
appdist:
$(gulp) appdist
src/i18n/strings.js: # $(ts) src/i18n/strings.js: # $(ts)
cp src/i18n/strings-prelude.js src/i18n/strings.js cp src/i18n/strings-prelude.js src/i18n/strings.js
for pofile in src/i18n/*.po; do \ for pofile in src/i18n/*.po; do \

4
configure vendored
View File

@ -16,8 +16,8 @@ if ! node -p 'process.exit(!(/v([0-9]+)/.exec(process.version)[1] >= 4))'; then
exit 1 exit 1
fi fi
if ! npm --version >/dev/null; then if ! yarn --version >/dev/null; then
echo 'Node Package Manager (npm) missing' echo 'yarn missing'
exit 1 exit 1
fi fi

View File

@ -66,12 +66,17 @@ const paths = {
"src/**/*-test*.ts", "src/**/*-test*.ts",
], ],
}, },
// distributed in the chrome extension
dist: [ dist: [
"img/icon.png", "img/icon.png",
"img/logo.png", "img/logo.png",
"src/**/*.{js,css,html}", "src/**/*.{js,css,html}",
"testlib/**/*.{js,ts,tsx,html}",
], ],
// for the source distribution
extra: [ extra: [
"scripts/prove-node",
"scripts/prove-selenium",
"src/i18n/*.po", "src/i18n/*.po",
"src/i18n/*.pot", "src/i18n/*.pot",
"decl/**/*.d.ts", "decl/**/*.d.ts",

View File

@ -51,8 +51,8 @@ msgstr ""
#, c-format #, c-format
msgid "" msgid ""
"You do not have any funds from an exchange that is accepted by this " "You do not have any funds from an exchange that is accepted by this "
"merchant. None of the exchanges accepted " "merchant. None of the exchanges accepted by the merchant is known to your "
"by the merchant is known to your wallet." "wallet."
msgstr "" msgstr ""
#: src/pages/confirm-create-reserve.tsx:105 #: src/pages/confirm-create-reserve.tsx:105

View File

@ -51,8 +51,8 @@ msgstr ""
#, c-format #, c-format
msgid "" msgid ""
"You do not have any funds from an exchange that is accepted by this " "You do not have any funds from an exchange that is accepted by this "
"merchant. None of the exchanges accepted " "merchant. None of the exchanges accepted by the merchant is known to your "
"by the merchant is known to your wallet." "wallet."
msgstr "" msgstr ""
#: src/pages/confirm-create-reserve.tsx:105 #: src/pages/confirm-create-reserve.tsx:105

View File

@ -51,8 +51,8 @@ msgstr ""
#, c-format #, c-format
msgid "" msgid ""
"You do not have any funds from an exchange that is accepted by this " "You do not have any funds from an exchange that is accepted by this "
"merchant. None of the exchanges accepted " "merchant. None of the exchanges accepted by the merchant is known to your "
"by the merchant is known to your wallet." "wallet."
msgstr "" msgstr ""
#: src/pages/confirm-create-reserve.tsx:105 #: src/pages/confirm-create-reserve.tsx:105

View File

@ -51,8 +51,8 @@ msgstr ""
#, c-format #, c-format
msgid "" msgid ""
"You do not have any funds from an exchange that is accepted by this " "You do not have any funds from an exchange that is accepted by this "
"merchant. None of the exchanges accepted " "merchant. None of the exchanges accepted by the merchant is known to your "
"by the merchant is known to your wallet." "wallet."
msgstr "" msgstr ""
#: src/pages/confirm-create-reserve.tsx:105 #: src/pages/confirm-create-reserve.tsx:105

View File

@ -51,8 +51,8 @@ msgstr ""
#, c-format #, c-format
msgid "" msgid ""
"You do not have any funds from an exchange that is accepted by this " "You do not have any funds from an exchange that is accepted by this "
"merchant. None of the exchanges accepted " "merchant. None of the exchanges accepted by the merchant is known to your "
"by the merchant is known to your wallet." "wallet."
msgstr "" msgstr ""
#: src/pages/confirm-create-reserve.tsx:105 #: src/pages/confirm-create-reserve.tsx:105