aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2020-08-11 19:22:48 +0530
committerFlorian Dold <florian.dold@gmail.com>2020-08-11 19:29:27 +0530
commit0050bf005a40cab3b4fdc43f2960025e8d52e176 (patch)
treeb7e6e7e5a8be84e22af5fc89914b572786b814a5
parent2e56a22f6b192600e8ec662b01ad436cbd1a5e65 (diff)
adjust path
-rw-r--r--build-system/Makefile8
-rwxr-xr-xcontrib/devrelease.sh6
2 files changed, 5 insertions, 9 deletions
diff --git a/build-system/Makefile b/build-system/Makefile
index 82c32c4f2..f04461959 100644
--- a/build-system/Makefile
+++ b/build-system/Makefile
@@ -36,8 +36,8 @@ check: compile
pnpm run check
.PHONY: webextensions
-webextensions: rollup
- ./webextension/pack.sh
+webextension: compile
+ cd ./packages/taler-wallet-webextension/ && ./pack.sh
.PHONY: integrationtests
integrationtests: compile
@@ -84,10 +84,6 @@ install: compile
ln -sft $(prefix)/bin $(install_target)/node_modules/taler-wallet-cli/bin/taler-wallet-cli
endif
-.PHONY: rollup
-rollup: compile
- ./node_modules/.bin/rollup -c
-
.PHONY: lint
lint:
./node_modules/.bin/eslint --ext '.js,.ts,.tsx' 'src'
diff --git a/contrib/devrelease.sh b/contrib/devrelease.sh
index 734722568..72b059a01 100755
--- a/contrib/devrelease.sh
+++ b/contrib/devrelease.sh
@@ -8,15 +8,15 @@ devtag=$1
git tag $devtag || true
-make rollup
+make compile
if [[ ! -d prebuilt ]]; then
- git worktree add prebuilt
+ git worktree add -f prebuilt prebuilt
fi
mkdir -p prebuilt/$devtag
-cp dist/standalone/taler-wallet-android.js prebuilt/$devtag/
+cp packages/taler-wallet-android/dist/taler-wallet-android.js prebuilt/$devtag/
cd prebuilt
git add -A $devtag
git commit -m "prebuilt files for $devtag" || true