removing dependency on less... (not done yet)

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2023-05-10 19:17:23 +03:00
parent 214c8d62c0
commit 12adbfbbdd
2 changed files with 3 additions and 20 deletions

View File

@ -354,22 +354,15 @@ BUILD_INFO = $(BUILD_DIR)/INFO
PROJECT_FILES = package.json PROJECT_FILES = package.json
HTML_FILES := $(wildcard *.html) HTML_FILES := $(wildcard *.html)
# NOTE: these must be explicitly included in all other categories as they
# will not be matched by wildcard if they are not generated yet
# resulting in them not being copied to the build...
GENERATED_CSS_FILES := \
$(patsubst %.less,%.css,$(wildcard css/*.less))
# XXX should this be a wildcard??? # XXX should this be a wildcard???
GENERATED_JS_FILES := \ GENERATED_JS_FILES := \
version.js version.js
GENERATED_FILES := \ GENERATED_FILES := \
$(GENERATED_JS_FILES) \ $(GENERATED_JS_FILES) \
$(GENERATED_CSS_FILES) \
$(APP_NAME).desktop $(APP_NAME).desktop
CSS_FILES := \ CSS_FILES := \
$(wildcard css/*.css) \ $(wildcard css/*.css)
$(GENERATED_CSS_FILES)
ROOT_JS_FILES := \ ROOT_JS_FILES := \
$(wildcard *.js) \ $(wildcard *.js) \
version.js version.js
@ -514,11 +507,11 @@ doc: $(DOC_FILES)
.PHONY: dev .PHONY: dev
dev: ## Build the development environment dev: ## Build the development environment
dev: $(JS_FILES) $(NODE_DIR) $(PATCHES) css dev: $(JS_FILES) $(NODE_DIR) $(PATCHES)
.PHONY: dev-npm .PHONY: dev-npm
dev-npm: ## Install the npm global dev package (might need sudo) dev-npm: ## Install the npm global dev package (might need sudo)
dev-npm: $(JS_FILES) $(PATCHES) css dev-npm: $(JS_FILES) $(PATCHES)
npm install -g . npm install -g .
.PHONY: dist .PHONY: dist
@ -585,11 +578,6 @@ clean-all: clean clean-dist
##---------------------------------------------- Generic components --- ##---------------------------------------------- Generic components ---
.PHONY: css
css: ## Build CSS
css: $(GENERATED_CSS_FILES)
.PHONY: js .PHONY: js
js: ## Build JS modules js: ## Build JS modules
js: $(GENERATED_JS_FILES) js: $(GENERATED_JS_FILES)
@ -742,10 +730,6 @@ $(BUILD_INFO): $(CSS_FILES) $(NODE_DIR) $(PROJECT_FILES) \
> $@ > $@
%.css: %.less
$(LESSC) $< > $@
$(APP_NAME).desktop: App.desktop $(APP_NAME).desktop: App.desktop
mv $< $@ mv $< $@

View File

@ -61,7 +61,6 @@
"devDependencies": { "devDependencies": {
"asar": "^3.0.1", "asar": "^3.0.1",
"electron-rebuild": "*", "electron-rebuild": "*",
"less": "*",
"rcedit": "^3.0.0" "rcedit": "^3.0.0"
}, },
"-devDependencies": {}, "-devDependencies": {},