Skip to content

Commit

Permalink
70: added new projects to the build
Browse files Browse the repository at this point in the history
  • Loading branch information
LorenzoBettini committed Jun 5, 2016
1 parent b45cd11 commit b40d619
Show file tree
Hide file tree
Showing 6 changed files with 215 additions and 80 deletions.
16 changes: 16 additions & 0 deletions javamm.ide/pom.xml
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../javamm.releng/pom.xml</relativePath>
<groupId>javamm</groupId>
<artifactId>javamm.releng</artifactId>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>javamm.ide</artifactId>
<packaging>eclipse-plugin</packaging>

</project>
17 changes: 17 additions & 0 deletions javamm.releng/launches/javamm.releng (No Findbugs).launch
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
<stringAttribute key="M2_GOALS" value="clean verify -Dfindbugs.skip=true"/>
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
<booleanAttribute key="M2_OFFLINE" value="false"/>
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES"/>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
<intAttribute key="M2_THREADS" value="1"/>
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
<stringAttribute key="M2_USER_SETTINGS" value=""/>
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -XX:MaxPermSize=256m"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/javamm.releng}"/>
</launchConfiguration>
3 changes: 3 additions & 0 deletions javamm.releng/pom.xml
Expand Up @@ -11,10 +11,12 @@
<module>../javamm.runtime</module>
<module>../javamm</module>
<module>../javamm.selfassessment.builder</module>
<module>../javamm.ide</module>
<module>../javamm.ui</module>
<module>../javamm.examples</module>
<module>../javamm.ui.examples</module>
<module>../javamm.tests</module>
<module>../javamm.ui.tests</module>
<module>../javamm.sdk</module>
<module>../javamm.site</module>
</modules>
Expand All @@ -32,6 +34,7 @@
<memoryArgs>-Xms256M -Xmx1024M -XX:PermSize=256M -XX:MaxPermSize=256M -XX:+HeapDumpOnOutOfMemoryError</memoryArgs>
<xtext.version>2.10.0</xtext.version>
<xtext-version>${xtext.version}</xtext-version>
<xtextVersion>${xtext.version}</xtextVersion>
<platform-version>[3.9,4.0)</platform-version>
<fornax-oaw-m2-plugin-version>3.5.1</fornax-oaw-m2-plugin-version>

Expand Down
60 changes: 0 additions & 60 deletions javamm.tests/pom.xml
Expand Up @@ -19,20 +19,6 @@
<sonar.tests>src,xtend-gen</sonar.tests>
</properties>

<profiles>
<profile>
<id>macosx-jvm-flags</id>
<activation>
<os>
<family>mac</family>
</os>
</activation>
<properties>
<os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
</properties>
</profile>
</profiles>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -64,54 +50,8 @@
<goal>test</goal>
</goals>
</execution>
<execution>
<id>TychoSurefirePluginUiTest</id>
<phase>integration-test</phase>
<configuration>
<skip>${swtbot.tests.only}</skip>
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
<!-- tycho.testArgLine repeated to re-use the configuration for argLine for jacoco agent -->
<argLine>${tycho.testArgLine} ${os-jvm-flags} ${memoryArgs} -DbuildingWithTycho=true</argLine>
<includes>
<include>**/javamm/ui/tests/*Test.java</include>
</includes>
</configuration>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<dependency-resolution>
<extraRequirements>
<!-- to get the org.eclipse.osgi.compatibility.state plugin iff
the targeted Eclipse version (e.g., Luna) has it
(backwards compatible with kepler and previous versions) -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!--
See
https://github.com/LorenzoBettini/jbase/issues/3
https://www.eclipse.org/forums/index.php/t/1073366/
-->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.jdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
</build>
</project>
98 changes: 98 additions & 0 deletions javamm.ui.tests/pom.xml
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../javamm.releng/pom.xml</relativePath>
<groupId>javamm</groupId>
<artifactId>javamm.releng</artifactId>
<version>1.4.0-SNAPSHOT</version>
</parent>

<artifactId>javamm.ui.tests</artifactId>
<packaging>eclipse-test-plugin</packaging>

<properties>
<!-- Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=397015 -->
<sonar.sources></sonar.sources>
<sonar.tests>src,xtend-gen</sonar.tests>
</properties>

<profiles>
<profile>
<id>macosx-jvm-flags</id>
<activation>
<os>
<family>mac</family>
</os>
</activation>
<properties>
<os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
</properties>
</profile>
</profiles>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>default-test</id>
<phase>integration-test</phase>
<configuration>
<skip>${swtbot.tests.only}</skip>
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
<!-- tycho.testArgLine repeated to re-use the configuration for argLine for jacoco agent -->
<argLine>${tycho.testArgLine} ${os-jvm-flags} ${memoryArgs} -DbuildingWithTycho=true</argLine>
<includes>
<include>**/javamm/ui/tests/*Test.java</include>
</includes>
</configuration>
<goals>
<goal>test</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
<dependency-resolution>
<extraRequirements>
<!-- to get the org.eclipse.osgi.compatibility.state plugin iff
the targeted Eclipse version (e.g., Luna) has it
(backwards compatible with kepler and previous versions) -->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.rcp</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!--
See
https://github.com/LorenzoBettini/jbase/issues/3
https://www.eclipse.org/forums/index.php/t/1073366/
-->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.jdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>
</configuration>
</plugin>
</plugins>
</build>
</project>
101 changes: 81 additions & 20 deletions javamm/pom.xml
Expand Up @@ -16,15 +16,15 @@
<build>
<!-- The following is required so that the mwe2 workflow finds the .xtext
grammar file -->
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<includes>
<include>**/*.xtext</include>
</includes>
</resource>
</resources>
<!-- <sourceDirectory>src</sourceDirectory> -->
<!-- <resources> -->
<!-- <resource> -->
<!-- <directory>src</directory> -->
<!-- <includes> -->
<!-- <include>**/*.xtext</include> -->
<!-- </includes> -->
<!-- </resource> -->
<!-- </resources> -->

<plugins>
<plugin>
Expand Down Expand Up @@ -107,30 +107,91 @@
<!-- </configuration> -->
<!-- </execution> -->
<!-- </executions> -->
<!-- </plugin> -->

<!-- <plugin> -->
<!-- <groupId>org.fornax.toolsupport</groupId> -->
<!-- <artifactId>fornax-oaw-m2-plugin</artifactId> -->
<!-- <version>${fornax-oaw-m2-plugin-version}</version> -->
<!-- <configuration> -->
<!-- <skip>${mwe2.skip}</skip> -->
<!-- <workflowEngine>mwe2</workflowEngine> -->
<!-- <workflowDescriptor>src/javamm/GenerateJavamm.mwe2</workflowDescriptor> -->
<!-- </configuration> -->
<!-- <executions> -->
<!-- <execution> -->
<!-- <phase>generate-sources</phase> -->
<!-- <goals> -->
<!-- <goal>run-workflow</goal> -->
<!-- </goals> -->
<!-- </execution> -->
<!-- </executions> -->
<!-- <dependencies> -->
<!-- <dependency> -->
<!-- <groupId>org.eclipse.xtext</groupId> -->
<!-- <artifactId>xtext-antlr-generator</artifactId> -->
<!-- <version>[2.1.1, 3.0)</version> -->
<!-- </dependency> -->
<!-- </dependencies> -->
<!-- </plugin> -->

<plugin>
<groupId>org.fornax.toolsupport</groupId>
<artifactId>fornax-oaw-m2-plugin</artifactId>
<version>${fornax-oaw-m2-plugin-version}</version>
<configuration>
<skip>${mwe2.skip}</skip>
<workflowEngine>mwe2</workflowEngine>
<workflowDescriptor>src/javamm/GenerateJavamm.mwe2</workflowDescriptor>
</configuration>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.4.0</version>
<executions>
<execution>
<id>generateEMFModel</id>
<phase>generate-sources</phase>
<goals>
<goal>java</goal>
</goals>
<configuration>
<mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
<arguments>
<argument>/${project.basedir}/src/javamm/GenerateJavammModelClasses.mwe2</argument>
<argument>-p</argument>
<argument>rootPath=/${project.basedir}/..</argument>
</arguments>
<classpathScope>compile</classpathScope>
<includePluginDependencies>true</includePluginDependencies>
<cleanupDaemonThreads>false</cleanupDaemonThreads><!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 -->
</configuration>
</execution>
<execution>
<id>mwe2Launcher</id>
<phase>generate-sources</phase>
<goals>
<goal>run-workflow</goal>
<goal>java</goal>
</goals>
<configuration>
<mainClass>org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher</mainClass>
<arguments>
<argument>/${project.basedir}/src/javamm/GenerateJavamm.mwe2</argument>
<argument>-p</argument>
<argument>rootPath=/${project.basedir}/..</argument>
</arguments>
<classpathScope>compile</classpathScope>
<includePluginDependencies>true</includePluginDependencies>
<cleanupDaemonThreads>false</cleanupDaemonThreads><!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=475098#c3 -->
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.mwe2.launch</artifactId>
<version>2.8.3</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xtext.generator</artifactId>
<version>${xtextVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>xtext-antlr-generator</artifactId>
<version>[2.1.1, 3.0)</version>
<artifactId>org.eclipse.xtext.xbase</artifactId>
<version>${xtextVersion}</version>
</dependency>
</dependencies>
</plugin>
Expand Down

0 comments on commit b40d619

Please sign in to comment.