X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=092541769fb3a9b741ca56c673e15072fc76cda4;hb=fc0e6e51c8167a19e76dbaf4fe60a13fe4f4215e;hp=da090e83baf34af5c597b63669032ba9fcc67574;hpb=3500c0714186bdc1b976201ed8b8f77ae7f0a95d;p=gpl%2Fargeo-suite.git

diff --git a/Makefile b/Makefile
index da090e8..0925417 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 include sdk.mk
 .PHONY: clean all osgi
 
-all: osgi
+all: web osgi
 	
 install: osgi-install
 
@@ -13,14 +13,17 @@ 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 \
-org.argeo.suite.knowledge \
 
 DEP_CATEGORIES = \
 org.argeo.tp \
@@ -30,7 +33,7 @@ org.argeo.tp.utils \
 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 \
@@ -43,4 +46,16 @@ swt/rap/org.argeo.cms \
 clean:
 	rm -rf $(BUILD_BASE)
 
+## 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
+
+
 include  $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk
\ No newline at end of file