Prepare next development cycle

[gpl/argeo-suite.git] / Makefile

diff --git a/Makefile b/Makefile
index 8c6d83c8dc4422a6a8b8b01c89f3f1bd1f064ae2..134414d126b21f0f2519c4426ca5ffcd2d560f1c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,44 +1,59 @@
 include sdk.mk
-.PHONY: clean all osgi move-swt
+.PHONY: clean all osgi web
 
-all: move-swt
+all: web osgi
+       
+install: osgi-install
 
-move-swt: osgi
-       mkdir -p $(A2_OUTPUT)/swt/$(A2_CATEGORY)
-       mv -v $(A2_OUTPUT)/$(A2_CATEGORY)/org.argeo.app*.ui.$(MAJOR).$(MINOR).jar $(A2_OUTPUT)/swt/$(A2_CATEGORY)
+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.swt \
-org.argeo.app.ui \
 org.argeo.app.theme.default \
 org.argeo.app.profile.acr.fs \
 org.argeo.app.profile.acr.jcr \
-
-A2_OUTPUT = $(SDK_BUILD_BASE)/a2
-A2_BASE = $(A2_OUTPUT)
+org.argeo.suite.knowledge \
+swt/org.argeo.app.swt \
+swt/org.argeo.app.geo.swt \
+swt/org.argeo.app.ui \
 
 DEP_CATEGORIES = \
 org.argeo.tp \
-org.argeo.tp.apache \
-org.argeo.tp.jetty \
-org.argeo.tp.eclipse \
-osgi/api/org.argeo.tp.osgi \
+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/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 \
+swt/org.argeo.cms.jcr \
 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