X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=Makefile;h=861041c34b84bd85b1571dfe44cac4f1ba78e390;hb=be0d3b8c6d90256157ebf0ba9dd7a8703165ba6b;hp=b082fcf0ec9efb9ee3fb37b78d6cf1fcfb45fa24;hpb=e8720ece876be6702b694dd5a8aef4a9f961aefe;p=gpl%2Fargeo-suite.git diff --git a/Makefile b/Makefile index b082fcf..861041c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ include sdk.mk .PHONY: clean all osgi -all: osgi +all: web osgi install: osgi-install @@ -12,12 +12,17 @@ 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 \ DEP_CATEGORIES = \ @@ -28,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 \ @@ -41,4 +46,12 @@ 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 + + include $(SDK_SRC_BASE)/sdk/argeo-build/osgi.mk \ No newline at end of file