Commit 6477fbbf authored by Alexander Diewald's avatar Alexander Diewald

Use environment propertis over profiles directly

* Activate each profile with environment switches.
* Environment properties allow for more flexibility than pure profile
  definitions since they allow negation, querying values etc.

Issue-Ref: 3620
Issue-Url: https://af3-developer.fortiss.org/issues/3620Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parent 4242c07f
...@@ -22,12 +22,24 @@ ...@@ -22,12 +22,24 @@
<profiles> <profiles>
<profile> <profile>
<id>tooling</id> <id>tooling</id>
<activation>
<property>
<name>build.tooling</name>
<value>true</value>
</property>
</activation>
<properties> <properties>
<genmodel.searchpath>${basedir}/../kernel/</genmodel.searchpath> <genmodel.searchpath>${basedir}/../kernel/</genmodel.searchpath>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>af3</id> <id>af3</id>
<activation>
<property>
<name>build.af3</name>
<value>true</value>
</property>
</activation>
<!-- Here, we must include all ecores due to dependencies: The platform is <!-- Here, we must include all ecores due to dependencies: The platform is
the common folder of the af3 and the kernel repo. --> the common folder of the af3 and the kernel repo. -->
<properties> <properties>
......
...@@ -106,6 +106,12 @@ ...@@ -106,6 +106,12 @@
<profiles> <profiles>
<profile> <profile>
<id>emf-generation</id> <id>emf-generation</id>
<activation>
<property>
<name>build.emf</name>
<value>true</value>
</property>
</activation>
<modules> <modules>
<module>emf-generator</module> <module>emf-generator</module>
</modules> </modules>
...@@ -114,6 +120,12 @@ ...@@ -114,6 +120,12 @@
<!-- NOTE: tooling plugins are checked out for the build, but are not <!-- NOTE: tooling plugins are checked out for the build, but are not
compiled by maven. --> compiled by maven. -->
<id>tooling</id> <id>tooling</id>
<activation>
<property>
<name>build.tooling</name>
<value>true</value>
</property>
</activation>
<modules> <modules>
<module>kernel/org.fortiss.tooling.base</module> <module>kernel/org.fortiss.tooling.base</module>
<module>kernel/org.fortiss.tooling.base.ui</module> <module>kernel/org.fortiss.tooling.base.ui</module>
...@@ -128,6 +140,12 @@ ...@@ -128,6 +140,12 @@
</profile> </profile>
<profile> <profile>
<id>af3</id> <id>af3</id>
<activation>
<property>
<name>build.af3</name>
<value>true</value>
</property>
</activation>
<modules> <modules>
<module>af3/com.microsoft.z3</module> <module>af3/com.microsoft.z3</module>
<module>af3/eu.fbk.af3.tools.diagram</module> <module>af3/eu.fbk.af3.tools.diagram</module>
......
...@@ -18,7 +18,10 @@ ...@@ -18,7 +18,10 @@
<profile> <profile>
<id>af3</id> <id>af3</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <property>
<name>build.af3</name>
<value>true</value>
</property>
</activation> </activation>
<modules> <modules>
<module>org.fortiss.af3.phoenix.feature</module> <module>org.fortiss.af3.phoenix.feature</module>
...@@ -27,7 +30,10 @@ ...@@ -27,7 +30,10 @@
<profile> <profile>
<id>tooling</id> <id>tooling</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <property>
<name>build.tooling</name>
<value>true</value>
</property>
</activation> </activation>
<modules> <modules>
<module>org.fortiss.tooling.feature</module> <module>org.fortiss.tooling.feature</module>
......
...@@ -29,6 +29,12 @@ ...@@ -29,6 +29,12 @@
<profiles> <profiles>
<profile> <profile>
<id>af3</id> <id>af3</id>
<activation>
<property>
<name>build.af3</name>
<value>true</value>
</property>
</activation>
<modules> <modules>
<module>org.fortiss.af3.phoenix.product</module> <module>org.fortiss.af3.phoenix.product</module>
</modules> </modules>
......
...@@ -64,7 +64,12 @@ ...@@ -64,7 +64,12 @@
</profile> </profile>
<!-- Install the kernel p2 site for all af3 profiles --> <!-- Install the kernel p2 site for all af3 profiles -->
<profile> <profile>
<id>!tooling</id> <id>tooling-p2</id>
<activation>
<property>
<name>!build.tooling</name>
</property>
</activation>
<repositories> <repositories>
<repository> <repository>
<!-- Place more centrally and combine with af3 profile --> <!-- Place more centrally and combine with af3 profile -->
......
<project> <project>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.fortiss.af3</groupId> <groupId>org.fortiss.af3</groupId>
<artifactId>org.fortiss.af3.releng</artifactId> <artifactId>org.fortiss.af3.releng</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<parent> <parent>
<groupId>org.fortiss.af3</groupId> <groupId>org.fortiss.af3</groupId>
<artifactId>org.fortiss.af3.root</artifactId> <artifactId>org.fortiss.af3.root</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
</parent> </parent>
<!-- Always present modules --> <!-- Always present modules -->
<modules> <modules>
<!--module>org.fortiss.af3.product</module--> <!--module>org.fortiss.af3.product</module-->
<module>org.fortiss.af3.target</module> <module>org.fortiss.af3.target</module>
</modules> </modules>
<profiles> <profiles>
<profile> <profile>
<id>af3</id> <id>af3</id>
<modules> <activation>
<module>org.fortiss.af3.update</module> <property>
</modules> <name>build.af3</name>
</profile> <value>true</value>
<profile> </property>
<id>tooling</id> </activation>
<modules> <modules>
<module>org.fortiss.tooling.update</module> <module>org.fortiss.af3.update</module>
</modules> </modules>
</profile> </profile>
</profiles> <profile>
<id>tooling</id>
<activation>
<property>
<name>build.tooling</name>
<value>true</value>
</property>
</activation>
<modules>
<module>org.fortiss.tooling.update</module>
</modules>
</profile>
</profiles>
</project> </project>
\ No newline at end of file
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<id>af3-p2-local</id> <id>af3-p2-local</id>
<activation> <activation>
<property> <property>
<name>!af3</name> <name>!build.af3</name>
</property> </property>
</activation> </activation>
<repositories> <repositories>
...@@ -39,12 +39,24 @@ ...@@ -39,12 +39,24 @@
See the developer documentation about debugging maven integration tests locally. --> See the developer documentation about debugging maven integration tests locally. -->
<profile> <profile>
<id>af3</id> <id>af3</id>
<activation>
<property>
<name>build.af3</name>
<value>true</value>
</property>
</activation>
<modules> <modules>
<module>../bundles/af3</module> <module>../bundles/af3</module>
</modules> </modules>
</profile> </profile>
<profile> <profile>
<id>tooling</id> <id>tooling</id>
<activation>
<property>
<name>build.tooling</name>
<value>true</value>
</property>
</activation>
<modules> <modules>
<module>../bundles/kernel</module> <module>../bundles/kernel</module>
</modules> </modules>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment