X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=c41b17e8ac563f5e4e3cb1f638a37a857cbea72f;hb=839673a30c7ff5fa99ef5849a05922643fe5124c;hp=7214fb6c60c338a339a145ee3f45c781cba0e141;hpb=4beb0ab261358fe4ccf8f3eec37753ff7a79fa71;p=gpl%2Fargeo-suite.git

diff --git a/Makefile b/Makefile
index 7214fb6..c41b17e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,42 @@
 include sdk.mk
 .PHONY: clean all osgi
 
-all: osgi
+all: web osgi
+	
+install: osgi-install
+
+uninstall: osgi-uninstall
 
 A2_CATEGORY = org.argeo.suite
 
 BUNDLES = \
 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 \
 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 \
 
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
-
 DEP_CATEGORIES = \
 org.argeo.tp \
-org.argeo.tp.apache \
-org.argeo.tp.jetty \
-osgi/api/org.argeo.tp.osgi \
+org.argeo.tp.httpd \
+org.argeo.tp.jcr \
+org.argeo.tp.utils \
+org.argeo.tp.publish \
+org.argeo.tp.math \
+org.argeo.tp.earth \
+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 \
-org.argeo.tp.jcr \
-org.argeo.tp.formats \
-org.argeo.tp.gis \
 org.argeo.cms \
 org.argeo.cms.jcr \
 swt/org.argeo.cms \
@@ -39,4 +46,16 @@ swt/rap/org.argeo.cms \
 clean:
 	rm -rf $(BUILD_BASE)
 
+## WEB
+web:
+	cd org.argeo.app.geo.js && npm run build
+
+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
+
+
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file