projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use latest argeo-build
[gpl/argeo-suite.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 444b30085df0b529757137ad26bb871a61750e7a..7214fb6c60c338a339a145ee3f45c781cba0e141 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,11
+1,7
@@
include sdk.mk
include sdk.mk
-.PHONY: clean all osgi
move-swt
+.PHONY: clean all osgi
-all: move-swt
-
-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)
+all: osgi
A2_CATEGORY = org.argeo.suite
A2_CATEGORY = org.argeo.suite
@@
-14,11
+10,11
@@
org.argeo.app.api \
org.argeo.app.core \
org.argeo.app.servlet.odk \
org.argeo.app.servlet.publish \
org.argeo.app.core \
org.argeo.app.servlet.odk \
org.argeo.app.servlet.publish \
-org.argeo.app.ux \
-org.argeo.app.ui \
org.argeo.app.theme.default \
org.argeo.app.profile.acr.fs \
org.argeo.app.profile.acr.jcr \
org.argeo.app.theme.default \
org.argeo.app.profile.acr.fs \
org.argeo.app.profile.acr.jcr \
+swt/org.argeo.app.swt \
+swt/org.argeo.app.ui \
A2_OUTPUT = $(SDK_BUILD_BASE)/a2
A2_BASE = $(A2_OUTPUT)
A2_OUTPUT = $(SDK_BUILD_BASE)/a2
A2_BASE = $(A2_OUTPUT)
@@
-27,15
+23,17
@@
DEP_CATEGORIES = \
org.argeo.tp \
org.argeo.tp.apache \
org.argeo.tp.jetty \
org.argeo.tp \
org.argeo.tp.apache \
org.argeo.tp.jetty \
-org.argeo.tp.eclipse \
osgi/api/org.argeo.tp.osgi \
osgi/api/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 \
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 \
+swt/org.argeo.cms.jcr \
swt/rap/org.argeo.cms \
clean:
swt/rap/org.argeo.cms \
clean: