X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=ad5bd8b73da21e60c8a93677da404c8e7de359b9;hb=03c171b5d502b461c534816c3c11cae889aef3c1;hp=092541769fb3a9b741ca56c673e15072fc76cda4;hpb=fc0e6e51c8167a19e76dbaf4fe60a13fe4f4215e;p=gpl%2Fargeo-suite.git diff --git a/Makefile b/Makefile index 0925417..ad5bd8b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ include sdk.mk -.PHONY: clean all osgi +.PHONY: clean all osgi web all: web osgi @@ -14,7 +14,6 @@ org.argeo.app.api \ org.argeo.app.core \ org.argeo.app.jcr \ org.argeo.app.geo \ -org.argeo.app.geo.js \ org.argeo.app.servlet.odk \ org.argeo.app.servlet.publish \ org.argeo.app.theme.default \ @@ -45,17 +44,13 @@ swt/rap/org.argeo.cms \ clean: rm -rf $(BUILD_BASE) + make -C js clean + +native-deps-debian: + sudo apt install npm ## WEB web: - cd org.argeo.app.geo.js && npm run build-prod - -npm-install: - cd org.argeo.app.geo.js && npm install - -jsdoc: - org.argeo.app.geo.js/node_modules/.bin/jsdoc -r org.argeo.app.geo.js/src/org.argeo.app.geo.js \ - -d $(SDK_BUILD_BASE)/jsdoc/org.argeo.app.geo.js - + make -C js all -include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk \ No newline at end of file +include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk