From dbab58c3cd06ae861653f1bd8e664525fbfdb2c2 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 12 Feb 2022 12:43:46 +0100
Subject: [PATCH] CMS target platforms

---
 sdk/argeo-suite-rcp.properties | 20 ++++++++++++++------
 sdk/osgi.mk                    |  2 +-
 sdk/output-cms-rap.target      | 15 +++++++++++++++
 sdk/output-cms-rcp.target      | 15 +++++++++++++++
 4 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 sdk/output-cms-rap.target
 create mode 100644 sdk/output-cms-rcp.target

diff --git a/sdk/argeo-suite-rcp.properties b/sdk/argeo-suite-rcp.properties
index 4cc7c87..a2d3be7 100644
--- a/sdk/argeo-suite-rcp.properties
+++ b/sdk/argeo-suite-rcp.properties
@@ -2,18 +2,26 @@ argeo.osgi.start.2.node=\
 org.eclipse.equinox.http.servlet,\
 org.eclipse.equinox.metatype,\
 org.eclipse.equinox.cm,\
-org.eclipse.rap.rwt.osgi
+org.eclipse.rap.rwt.osgi,\
+org.argeo.init
 
 argeo.osgi.start.2.suite=\
 org.apache.tika.parsers
 
 argeo.osgi.start.3.node=\
-org.argeo.cms
+org.argeo.cms,\
+org.argeo.cms.jcr,\
+org.argeo.cms.ui.rcp
 
 argeo.osgi.start.5.suite=\
-org.argeo.suite.ui,\
-org.argeo.suite.theme.default,\
-org.argeo.cms.ui.rcp
+org.argeo.app.core,\
+org.argeo.app.ui,\
+org.argeo.app.theme.default,\
+
+argeo.osgi.start.6.suite=\
+org.argeo.app.servlet.publish,\
+org.argeo.app.servlet.odk
+
 
 # Local
 argeo.node.repo.type=h2
@@ -30,7 +38,7 @@ argeo.i18n.defaultLocale=en
 #tika.config=/home/mbaudier/dev/git/gpl/argeo-suite/sdk/exec/argeo-office-e4-rap/data/indexes/node/tika-config.xml
 
 # Logging
-log4j.configuration=file:../../log4j.properties
+log.org.argeo=DEBUG
 
 # DON'T CHANGE BELOW
 org.eclipse.equinox.http.jetty.autostart=false
diff --git a/sdk/osgi.mk b/sdk/osgi.mk
index a97a937..25491f5 100644
--- a/sdk/osgi.mk
+++ b/sdk/osgi.mk
@@ -35,7 +35,7 @@ $(BUILD_BASE)/cnf/%.bnd: cnf/%.bnd
 	mkdir -p $(dir $@)
 	cp $< $@
 	
-$(SDK_BUILD_BASE)/a2/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%.jar
+$(A2_OUTPUT)/$(A2_CATEGORY)/%.$(MAJOR).$(MINOR).jar : $(BUILD_BASE)/%.jar
 	mkdir -p $(dir $@)
 	cp $< $@
 
diff --git a/sdk/output-cms-rap.target b/sdk/output-cms-rap.target
new file mode 100644
index 0000000..d2db7a9
--- /dev/null
+++ b/sdk/output-cms-rap.target
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="(output) CMS RAP">
+	<locations>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms.rap" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+	</locations>
+</target>
\ No newline at end of file
diff --git a/sdk/output-cms-rcp.target b/sdk/output-cms-rcp.target
new file mode 100644
index 0000000..b480838
--- /dev/null
+++ b/sdk/output-cms-rcp.target
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="(output) CMS RCP">
+	<locations>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.cms.rcp" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.eclipse.rcp" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
+		<location path="${project_loc:argeo-suite-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
+	</locations>
+</target>
\ No newline at end of file
-- 
2.30.2