Explorar o código

Activated xtext generator by mwe-workflow

benjamin.schwertfeger@googlemail.com %!s(int64=12) %!d(string=hai) anos
pai
achega
180744ddf7

+ 27 - 0
plugins/org.yakindu.sct.generator.genmodel/log4j.properties

@@ -0,0 +1,27 @@
+# Log configuration for Xtext logging.
+# This log configuration will be used for the UI parts of Xtext.
+#
+# For your convenience: valid log levels are (from least to most significant):
+# TRACE, DEBUG, INFO, WARN, ERROR and FATAL
+# Log4J manual: http://logging.apache.org/log4j/1.2/manual.html
+# Xtext log configuration info: http://wiki.eclipse.org/Xtext_Project_Plan/Features/Logging
+
+# Root logger configuration. Don't change this.
+log4j.rootLogger=DEBUG, default
+
+# This appender will write to the stdout console
+log4j.appender.default=org.apache.log4j.ConsoleAppender
+log4j.appender.default.layout=org.apache.log4j.PatternLayout
+log4j.appender.default.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+
+# This appender will write to the Eclipse error log. It will ONLY log ERROR and FATAL messages.
+log4j.appender.eclipse=org.eclipse.xtext.logging.EclipseLogAppender
+log4j.appender.eclipse.layout=org.apache.log4j.PatternLayout
+log4j.appender.eclipse.layout.ConversionPattern=%c %x - %m%n
+
+# Configure your log categories below:
+log4j.logger.org.eclipse=WARN
+log4j.logger.org.eclipse.xtext=WARN
+log4j.logger.org.eclipse.xtext.ui.editor.outline=WARN
+log4j.logger.org.eclipse.xtext.ui.editor.contentassist.antlr.internal=WARN
+

+ 108 - 0
plugins/org.yakindu.sct.generator.genmodel/pom.xml

@@ -13,7 +13,38 @@
 	<groupId>org.yakindu.sct.plugins</groupId>
 	<packaging>eclipse-plugin</packaging>
 	<build>
+		<resources>
+			<resource>
+				<directory>${project.build.directory}/xtext</directory>
+			</resource>
+		</resources>
 		<plugins>
+			<!-- Copy all Xtext related sources to seperate folder that is registered 
+				as resource folder -->
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/xtext</outputDirectory>
+							<resources>
+								<resource>
+									<directory>src</directory>
+									<includes>
+										<include>**/*.xtext</include>
+										<include>**/*.mwe2</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
@@ -31,19 +62,96 @@
 				<artifactId>maven-clean-plugin</artifactId>
 				<configuration>
 					<filesets>
+						<fileset>
+							<directory>src-gen</directory>
+							<includes>
+								<include>**</include>
+							</includes>
+							<excludes>
+								<exclude>.gitignore</exclude>
+								<exclude>.svn/</exclude>
+							</excludes>
+						</fileset>
 						<fileset>
 							<directory>xtend-gen</directory>
 							<includes>
 								<include>**</include>
 							</includes>
 							<excludes>
+								<exclude>.gitignore</exclude>
 								<exclude>.svn/</exclude>
+							</excludes>
+						</fileset>
+						<fileset>
+							<directory>../${project.artifactId}.ui/src-gen</directory>
+							<includes>
+								<include>**</include>
+							</includes>
+							<excludes>
 								<exclude>.gitignore</exclude>
+								<exclude>.svn/</exclude>
+							</excludes>
+						</fileset>
+						<fileset>
+							<directory>../${project.artifactId}.ui/xtend-gen</directory>
+							<includes>
+								<include>**</include>
+							</includes>
+							<excludes>
+								<exclude>.gitignore</exclude>
+								<exclude>.svn/</exclude>
+							</excludes>
+						</fileset>
+						<fileset>
+							<directory>../${project.artifactId}.test/src-gen</directory>
+							<includes>
+								<include>**</include>
+							</includes>
+							<excludes>
+								<exclude>.gitignore</exclude>
+								<exclude>.svn/</exclude>
+							</excludes>
+						</fileset>
+						<fileset>
+							<directory>../${project.artifactId}.test/xtend-gen</directory>
+							<includes>
+								<include>**</include>
+							</includes>
+							<excludes>
+								<exclude>.gitignore</exclude>
+								<exclude>.svn/</exclude>
 							</excludes>
 						</fileset>
 					</filesets>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.fornax.toolsupport</groupId>
+				<artifactId>fornax-oaw-m2-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>xtext</id>
+						<phase>generate-sources</phase>
+						<goals>
+							<goal>run-workflow</goal>
+						</goals>
+						<configuration>
+							<workflowEngine>mwe2</workflowEngine>
+							<workflowDescriptor>src/org/yakindu/sct/generator/genmodel/GenerateSGen.mwe2</workflowDescriptor>
+							<timestampFileName>xtext-generator.timestamp</timestampFileName>
+							<jvmSettings>
+								<fork>true</fork>
+								<jvmArgs>
+									<jvmArg>-Xms100m</jvmArg>
+									<jvmArg>-Xmx700m</jvmArg>
+									<jvmArg>-XX:MaxPermSize=128m</jvmArg>
+									<jvmArg>-Dlog4j.configuration=file:${basedir}/log4j.properties</jvmArg>
+								</jvmArgs>
+							</jvmSettings>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.eclipse.xtend</groupId>
 				<artifactId>xtend-maven-plugin</artifactId>

+ 1 - 1
plugins/org.yakindu.sct.generator.genmodel/src/org/yakindu/sct/generator/genmodel/GenerateSGen.mwe2

@@ -28,7 +28,7 @@ Workflow {
     component = Generator {
         pathRtProject = runtimeProject
         pathUiProject = "${runtimeProject}.ui"
-        pathTestProject = "${runtimeProject}.tests"
+        pathTestProject = "${runtimeProject}.test"
         projectNameRt = projectName
         projectNameUi = "${projectName}.ui"
         language = {