projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Argeo Build
[gpl/argeo-suite.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 318a122389ca23e0d15884608bd22320fb7501c9..e724f9bd67d837362d9e34d3d1027319845897a6 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,5
@@
include sdk.mk
include sdk.mk
-.PHONY: clean all osgi
+.PHONY: clean all osgi
web
all: web osgi
all: web osgi
@@
-14,7
+14,6
@@
org.argeo.app.api \
org.argeo.app.core \
org.argeo.app.jcr \
org.argeo.app.geo \
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.servlet.odk \
org.argeo.app.servlet.publish \
org.argeo.app.theme.default \
@@
-28,8
+27,11
@@
swt/org.argeo.app.ui \
DEP_CATEGORIES = \
org.argeo.tp \
org.argeo.tp.httpd \
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.jcr \
org.argeo.tp.utils \
+org.argeo.tp.img \
org.argeo.tp.publish \
org.argeo.tp.math \
org.argeo.tp.earth \
org.argeo.tp.publish \
org.argeo.tp.math \
org.argeo.tp.earth \
@@
-45,13
+47,13
@@
swt/rap/org.argeo.cms \
clean:
rm -rf $(BUILD_BASE)
clean:
rm -rf $(BUILD_BASE)
+ make -C js clean
+
+native-deps-debian:
+ sudo apt install npm
## WEB
web:
## WEB
web:
- cd org.argeo.app.geo.js && npm run build-prod
-
-npm-install:
- cd org.argeo.app.geo.js && npm install
-
+ 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