From c910642f3f6a0a93cddc7207a32c8bffc8503724 Mon Sep 17 00:00:00 2001
From: Philipp Stadler <a51820432@unet.univie.ac.at>
Date: Sat, 13 Jul 2024 20:28:03 +0200
Subject: [PATCH] chore: inherit build prefix in anki transformer build
---
Makefile | 1 +
make/defs.mk | 4 ++--
make/html.mk | 2 --
transformer-anki-tags/Makefile | 12 +++++++++---
transformer-anki-tags/package.json | 4 +++-
5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 8a98a4e..a9d7ddc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
.DELETE_ON_ERROR:
include \
make/defs.mk \
+make/transformer-anki-tags.mk \
make/src-common.mk \
make/pipenv.mk \
make/node.mk \
diff --git a/make/defs.mk b/make/defs.mk
index fe0c93c..939cd31 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -6,7 +6,7 @@ K := $(foreach exec,$(REQUIRED_ON_PATH), \
# root like in CI, otherwise all generated files are in artifacts/
# note that using . and ./ behave the same as the empty string and the filename
# targets will not start with .
-BUILD_PREFIX ?= artifacts
+BUILD_PREFIX ?= $(PWD)/artifacts
BUILD_PREFIX := $(and $(filter-out . ./,$(BUILD_PREFIX)),$(BUILD_PREFIX)/)
# some build subprocesses need this, e.g. the JS proxy for parcel needs to
# know where to load the chardata from
@@ -21,4 +21,4 @@ GITLAB_REPO ?= kartenaale/sinologie-anki-pack
PACK_TITLE ?= Sinologie Anki Pack
# part before the npm version in the release directory name
RELEASE_DIR_STEM ?= sinologie-anki-pack
-VERSION ?= $(shell grep '"version":' package.json -m 1 | cut -d '"' -f 4)
\ No newline at end of file
+VERSION ?= $(shell grep '"version":' package.json -m 1 | cut -d '"' -f 4)
diff --git a/make/html.mk b/make/html.mk
index 9148160..ca14e2d 100644
--- a/make/html.mk
+++ b/make/html.mk
@@ -1,7 +1,6 @@
TEMPLATE_SPEC_FILENAME := .template-spec.yaml
PARCEL_DEV_ENTRY_HTMLS := src/templates/index.html
-PARCEL_PLUGIN_SRC_DIR := transformer-anki-tags
PARCEL_DEV_CONFIG := parcel-dev-config.json
TEMPLATE_FILES := $(shell find src -type f '(' -name '*.html' -o -name '*.css' -o -name '*.js' -o -name '*.ts' -o -name $(TEMPLATE_SPEC_FILENAME) ')')
@@ -27,7 +26,6 @@ html: $(BUILT_TEMPLATE_HTMLS) $(BUILT_TEMPLATE_SPECS)
.PHONY: dev
dev: $(PARCEL) $(HANZI_DATA) $(PARCEL_PLUGIN_INSTALLED_DIR)
- cd $(PARCEL_PLUGIN_SRC_DIR) && $(MAKE)
$(PARCEL) serve $(PARCEL_DEV_ENTRY_HTMLS) --config=./$(PARCEL_DEV_CONFIG)
.PHONY: test-html
diff --git a/transformer-anki-tags/Makefile b/transformer-anki-tags/Makefile
index 3816262..0981129 100644
--- a/transformer-anki-tags/Makefile
+++ b/transformer-anki-tags/Makefile
@@ -1,9 +1,15 @@
TSC := node_modules/.bin/tsc
+BUILD_PREFIX := $(BUILD_PREFIX)transformer-anki-tags/
-index.cjs: index.ts $(TSC) tsconfig.json
+$(BUILD_PREFIX)index.cjs: index.ts $(TSC) tsconfig.json $(BUILD_PREFIX)package.json
$(TSC) --project .
- mv index.js index.cjs
+ @$(and $(BUILD_PREFIX),mkdir -p $(BUILD_PREFIX))
+ mv index.js $(BUILD_PREFIX)index.cjs
+
+$(BUILD_PREFIX)package.json: package.json
+ @$(and $(BUILD_PREFIX),mkdir -p $(BUILD_PREFIX))
+ cp $< $@
$(TSC): package.json yarn.lock
yarn install
- touch $@
\ No newline at end of file
+ touch $@
diff --git a/transformer-anki-tags/package.json b/transformer-anki-tags/package.json
index f9a476d..c82ed8a 100644
--- a/transformer-anki-tags/package.json
+++ b/transformer-anki-tags/package.json
@@ -2,8 +2,10 @@
"name": "@parcel/transformer-anki-tags",
"version": "0.0.1",
"license": "MIT",
+ "dependencies": {
+ "@parcel/plugin": "^2.11.0"
+ },
"devDependencies": {
- "@parcel/plugin": "^2.11.0",
"typescript": "*"
},
"main": "index.cjs",
--
GitLab