Prepare next development cycle

[gpl/argeo-suite.git] / Makefile

diff --git a/Makefile b/Makefile
index da090e83baf34af5c597b63669032ba9fcc67574..134414d126b21f0f2519c4426ca5ffcd2d560f1c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi web
 
-all: osgi
+all: web osgi
        
 install: osgi-install
 
@@ -10,27 +10,32 @@ 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.servlet.odk \
 org.argeo.app.servlet.publish \
 org.argeo.app.theme.default \
 org.argeo.app.profile.acr.fs \
 org.argeo.app.profile.acr.jcr \
+org.argeo.suite.knowledge \
 swt/org.argeo.app.swt \
+swt/org.argeo.app.geo.swt \
 swt/org.argeo.app.ui \
-org.argeo.suite.knowledge \
 
 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 \
-osgi/api/org.argeo.tp.osgi \
+osgi/equinox/org.argeo.tp.osgi \
 osgi/equinox/org.argeo.tp.eclipse \
 swt/rap/org.argeo.tp.swt \
 swt/rap/org.argeo.tp.swt.workbench \
@@ -42,5 +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:
+       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