X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=Makefile;h=1a573a58ace6828bd7b23a408d53f2b48103ebed;hp=8c6d83c8dc4422a6a8b8b01c89f3f1bd1f064ae2;hb=302839c70d637be5a555290bd4542b9b1c63c17d;hpb=3304f8934e1dc5846fc6214997bc54faaa93bb39 diff --git a/Makefile b/Makefile index 8c6d83c..1a573a5 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,7 @@ 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 @@ -14,28 +10,29 @@ org.argeo.app.api \ org.argeo.app.core \ 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 \ +swt/org.argeo.app.swt \ +swt/org.argeo.app.ui \ A2_OUTPUT = $(SDK_BUILD_BASE)/a2 A2_BASE = $(A2_OUTPUT) DEP_CATEGORIES = \ org.argeo.tp \ -org.argeo.tp.apache \ org.argeo.tp.jetty \ -org.argeo.tp.eclipse \ +org.argeo.tp.jcr \ +org.argeo.tp.utils \ +org.argeo.tp.gis \ 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 \ +org.argeo.cms.jcr \ swt/org.argeo.cms \ +swt/org.argeo.cms.jcr \ swt/rap/org.argeo.cms \ clean: