Prepare next development cycle

[gpl/argeo-suite.git] / Makefile

diff --git a/Makefile b/Makefile
index 092541769fb3a9b741ca56c673e15072fc76cda4..134414d126b21f0f2519c4426ca5ffcd2d560f1c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi web
 
 all: web osgi
        
@@ -10,11 +10,10 @@ uninstall: osgi-uninstall
 A2_CATEGORY = org.argeo.suite
 
 BUNDLES = \
-org.argeo.app.api \
+org.argeo.api.app \
 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 \
@@ -28,8 +27,11 @@ swt/org.argeo.app.ui \
 DEP_CATEGORIES = \
 org.argeo.tp \
 org.argeo.tp.httpd \
+org.argeo.tp.sys \
+org.argeo.tp.sdk \
 org.argeo.tp.jcr \
 org.argeo.tp.utils \
+org.argeo.tp.img \
 org.argeo.tp.publish \
 org.argeo.tp.math \
 org.argeo.tp.earth \
@@ -45,17 +47,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