Updated project to support new DSL Builder

9 files changed, 61 insertions, 36 deletions

diff --git a/dsls/ACG/.cvsignore b/dsls/ACG/.cvsignore
deleted file mode 100644
index 3822a4f9..00000000
--- a/dsls/ACG/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-TGE
-megamodel-AM3.mgm
diff --git a/dsls/ACG/ACG build.xml.launch b/dsls/ACG/.externalToolBuilders/ACG DSL Builder.launch
index 90d44805..cf5020f1 100644
--- a/dsls/ACG/ACG build.xml.launch
+++ b/dsls/ACG/.externalToolBuilders/ACG DSL Builder.launch
@@ -1,26 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean,"/>
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/ACG/build.xml"/>
+<listEntry value="/AMMAScripts/build.dsl.xml"/>
 </listAttribute>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="true"/>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.ant.ui.classpathentry.antHome&quot;&gt;&#13;&#10;&lt;memento default=&quot;true&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.ant.ui.classpathentry.extraClasspathEntries&quot;&gt;&#13;&#10;&lt;memento/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/TCSBuilder_ANTLR3/ANTLR/antlr.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/TCSBuilder_ANTLR3/ANTLR/antlr-3.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/TCSBuilder_ANTLR3/ANTLR/stringtemplate-3.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/TCSBuilder_ANTLR3/ANT/antlr3.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ACG"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/ACG/build.xml}"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/AMMAScripts/libs/antlr.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/AMMAScripts/libs/antlr-3.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/AMMAScripts/libs/antlr3-ant.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/AMMAScripts/libs/stringtemplate-3.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="AMMAScripts"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/AMMAScripts/build.dsl.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,clean"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/ACG}"/>
 </launchConfiguration>
diff --git a/dsls/ACG/.project b/dsls/ACG/.project
index 1007db1d..d4f1ff55 100644
--- a/dsls/ACG/.project
+++ b/dsls/ACG/.project
@@ -6,6 +6,16 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/ACG DSL Builder.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.atl.eclipse.adt.builder.atlBuilder</name>
 			<arguments>
 			</arguments>
diff --git a/dsls/ACG/Compiler/.cvsignore b/dsls/ACG/Compiler/.cvsignore
deleted file mode 100644
index 28b0b36b..00000000
--- a/dsls/ACG/Compiler/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-ACG.asm
diff --git a/dsls/ACG/Metamodel/.cvsignore b/dsls/ACG/Metamodel/.cvsignore
deleted file mode 100644
index a68cff2a..00000000
--- a/dsls/ACG/Metamodel/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-ACG.ecore
diff --git a/dsls/ACG/Metamodel/ACG.ann b/dsls/ACG/Metamodel/ACG.ann
new file mode 100644
index 00000000..68d632af
--- /dev/null
+++ b/dsls/ACG/Metamodel/ACG.ann
@@ -0,0 +1,28 @@
+annotate ACG {
+    annotate ACG with
+        nsURI='http://www.eclipse.org/m2m/atl/2007/ACG',
+        nsPrefix='acg';
+    
+    annotate "ACG::critic" with
+        literalValue='critic';
+    
+    annotate "ACG::error" with
+        literalValue='error';
+    
+    annotate "ACG::warning" with
+        literalValue='warning';
+    
+    annotate PrimitiveTypes with
+        nsURI='http://www.eclipse.org/m2m/atl/2007/ACG-PrimitiveTypes',
+        nsPrefix='pt';
+    
+    annotate "PrimitiveTypes::Boolean" with
+        instanceClassName='boolean';
+    
+    annotate "PrimitiveTypes::Integer" with
+        instanceClassName='int';
+    
+    annotate "PrimitiveTypes::String" with
+        instanceClassName='java.lang.String';
+    
+}
\ No newline at end of file
diff --git a/dsls/ACG/Syntax/.cvsignore b/dsls/ACG/Syntax/.cvsignore
deleted file mode 100644
index 3276f3ea..00000000
--- a/dsls/ACG/Syntax/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-ACG-importer.jar
-ACG-parser.jar
-org
diff --git a/dsls/ACG/build.properties b/dsls/ACG/build.properties
new file mode 100644
index 00000000..68613d70
--- /dev/null
+++ b/dsls/ACG/build.properties
@@ -0,0 +1,2 @@
+dsl.name=ACG
+dsl.ext=acg
\ No newline at end of file
diff --git a/dsls/ACG/build.xml b/dsls/ACG/build.xml
deleted file mode 100644
index e1ecfff6..00000000
--- a/dsls/ACG/build.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="callBuildDSL" default="main">
-	<property name="dsl.name" value="ACG"/>
-	<property name="dsl.ext" value="acg"/>
-	
-    <target name="main">
-        <ant antfile="../TCSBuilder_ANTLR3/BuildDSL.xml">
-        	<property name="dsl.name" value="${dsl.name}"/>
-        	<property name="dsl.ext" value="${dsl.ext}"/>
-        </ant>
-    </target>
-</project>