commit 8c5a794cc86270f89ab789c4d717c3e755f00b82
parent 899c0027f9c85bde1d807e777b38ebeaddec8f8a
Author: Florian Dold <florian.dold@gmail.com>
Date: Wed, 23 Nov 2016 01:29:34 +0100
update configure/makefile
Diffstat:
8 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/Makefile b/Makefile
@@ -6,18 +6,21 @@ gulp = node_modules/gulp/bin/gulp.js
tsc = node_modules/typescript/bin/tsc
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
-package-unstable: tsc i18n
+package-unstable: tsc i18n yarn-install
$(gulp) package-unstable
-tsc: tsconfig.json
+tsc: tsconfig.json yarn-install
$(tsc)
-tsconfig.json: gulpfile.js
+yarn-install:
+ yarn install
+
+tsconfig.json: gulpfile.js yarn-install
$(gulp) tsconfig
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
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' \
| xargs node pogen/pogen.js \
| msguniq \
@@ -41,9 +44,6 @@ msgmerge:
dist:
$(gulp) srcdist
-appdist:
- $(gulp) appdist
-
src/i18n/strings.js: # $(ts)
cp src/i18n/strings-prelude.js src/i18n/strings.js
for pofile in src/i18n/*.po; do \
diff --git a/configure b/configure
@@ -16,8 +16,8 @@ if ! node -p 'process.exit(!(/v([0-9]+)/.exec(process.version)[1] >= 4))'; then
exit 1
fi
-if ! npm --version >/dev/null; then
- echo 'Node Package Manager (npm) missing'
+if ! yarn --version >/dev/null; then
+ echo 'yarn missing'
exit 1
fi
diff --git a/gulpfile.js b/gulpfile.js
@@ -66,12 +66,17 @@ const paths = {
"src/**/*-test*.ts",
],
},
+ // distributed in the chrome extension
dist: [
"img/icon.png",
"img/logo.png",
"src/**/*.{js,css,html}",
+ "testlib/**/*.{js,ts,tsx,html}",
],
+ // for the source distribution
extra: [
+ "scripts/prove-node",
+ "scripts/prove-selenium",
"src/i18n/*.po",
"src/i18n/*.pot",
"decl/**/*.d.ts",
diff --git a/src/i18n/de.po b/src/i18n/de.po
@@ -51,8 +51,8 @@ msgstr ""
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
-"merchant. None of the exchanges accepted "
-"by the merchant is known to your wallet."
+"merchant. None of the exchanges accepted by the merchant is known to your "
+"wallet."
msgstr ""
#: src/pages/confirm-create-reserve.tsx:105
diff --git a/src/i18n/en-US.po b/src/i18n/en-US.po
@@ -51,8 +51,8 @@ msgstr ""
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
-"merchant. None of the exchanges accepted "
-"by the merchant is known to your wallet."
+"merchant. None of the exchanges accepted by the merchant is known to your "
+"wallet."
msgstr ""
#: src/pages/confirm-create-reserve.tsx:105
diff --git a/src/i18n/fr.po b/src/i18n/fr.po
@@ -51,8 +51,8 @@ msgstr ""
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
-"merchant. None of the exchanges accepted "
-"by the merchant is known to your wallet."
+"merchant. None of the exchanges accepted by the merchant is known to your "
+"wallet."
msgstr ""
#: src/pages/confirm-create-reserve.tsx:105
diff --git a/src/i18n/it.po b/src/i18n/it.po
@@ -51,8 +51,8 @@ msgstr ""
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
-"merchant. None of the exchanges accepted "
-"by the merchant is known to your wallet."
+"merchant. None of the exchanges accepted by the merchant is known to your "
+"wallet."
msgstr ""
#: src/pages/confirm-create-reserve.tsx:105
diff --git a/src/i18n/taler-wallet-webex.pot b/src/i18n/taler-wallet-webex.pot
@@ -51,8 +51,8 @@ msgstr ""
#, c-format
msgid ""
"You do not have any funds from an exchange that is accepted by this "
-"merchant. None of the exchanges accepted "
-"by the merchant is known to your wallet."
+"merchant. None of the exchanges accepted by the merchant is known to your "
+"wallet."
msgstr ""
#: src/pages/confirm-create-reserve.tsx:105
