Browse Source

Removed unnecessary project related to FMU generation. It is now being carried out by the cpp project

Casper Thule 3 years ago
parent
commit
ec8f183df9

+ 0 - 3
.gitmodules

@@ -1,3 +0,0 @@
-[submodule "DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.lib/src/resources/hybridCosimulation-framework"]
-	path = DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.lib/src/resources/hybridCosimulation-framework
-	url = https://github.com/into-cps/hybridCosimulation-framework.git

+ 0 - 33
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.lib/pom.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<relativePath>../pom.xml</relativePath>
-		<groupId>be.uantwerpen.ansymo.semanticadaptation</groupId>
-		<artifactId>parent</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-	</parent>
-
-	<artifactId>be.uantwerpen.ansymo.semanticadaptation.cg.cpp.lib</artifactId>
-	<packaging>jar</packaging>
-
-	<name>be.uantwerpen.ansymo.semanticadaptation Code Generation to C++ Framework</name>
-
-	<build>
-
-		<resources>
-			<resource>
-				<directory>src/resources/hybridCosimulation-framework/semantic-adaptation</directory>
-				<targetPath>${project.build.directory}/classes/hybridCosimulation-framework</targetPath>
-				<filtering>false</filtering>
-				<includes>
-					<include>**/*</include>
-				</includes>
-			</resource>
-		</resources>
-
-  </build>
-
-
-</project>

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests/src/be/uantwerpen/ansymo/semanticadaptation/cg/cpp/tests/CgCppBasicTest.xtend

@@ -7,7 +7,7 @@ import be.uantwerpen.ansymo.semanticadaptation.cg.cpp.generation.BuildUtilities
 import be.uantwerpen.ansymo.semanticadaptation.cg.cpp.generation.CppGenerator
 import be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests.CMakeUtil.CMakeGenerateException
 import be.uantwerpen.ansymo.semanticadaptation.semanticAdaptation.SemanticAdaptation
-import be.uantwerpen.ansymo.semanticadaptation.testframework.CMakeListsGenerator
+import be.uantwerpen.ansymo.semanticadaptation.cg.cpp.generation.CMakeListsGenerator
 import be.uantwerpen.ansymo.semanticadaptation.testframework.FmuMainTestGenerator
 import be.uantwerpen.ansymo.semanticadaptation.tests.AbstractSemanticAdaptationTest
 import be.uantwerpen.ansymo.semanticadaptation.tests.SemanticAdaptationInjectorProvider

+ 1 - 43
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.cg.cpp/pom.xml

@@ -18,54 +18,12 @@
     <main.basedir>${project.parent.basedir}</main.basedir>
 	</properties>
 
-	<dependencies>
-
-		<dependency>
-			<groupId>be.uantwerpen.ansymo.semanticadaptation</groupId>
-			<artifactId>be.uantwerpen.ansymo.semanticadaptation.cg.cpp.lib</artifactId>
-			<type>jar</type>
-			<version>${project.version}</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-
 	<build>
 			<plugins>
 				<plugin>
 					<groupId>org.eclipse.xtend</groupId>
 					<artifactId>xtend-maven-plugin</artifactId>
-				</plugin>
-	
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-dependency-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>copy</id>
-							<phase>process-resources</phase>
-							<goals>
-								<goal>copy</goal>
-							</goals>
-							<configuration>
-								<artifactItems>
-									<artifactItem>
-										<groupId>be.uantwerpen.ansymo.semanticadaptation</groupId>
-										<artifactId>be.uantwerpen.ansymo.semanticadaptation.cg.cpp.lib</artifactId>
-										<type>jar</type>
-										<version>${project.version}</version>
-										<overWrite>true</overWrite>
-										<destFileName>cppFramework.jar</destFileName>
-									</artifactItem>
-								</artifactItems>
-								<outputDirectory>${project.basedir}/jars</outputDirectory>
-								<overWriteReleases>false</overWriteReleases>
-								<overWriteSnapshots>false</overWriteSnapshots>
-								<overWriteIfNewer>true</overWriteIfNewer>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-				
+				</plugin>				
 			</plugins>
 	</build>
 

+ 1 - 1
DSL_SemanticAdaptation/be.uantwerpen.ansymo.semanticadaptation.testframework/src/be/uantwerpen/ansymo/semanticadaptation/testframework/CMakeListsGenerator.xtend

@@ -1,4 +1,4 @@
-package be.uantwerpen.ansymo.semanticadaptation.testframework
+package be.uantwerpen.ansymo.semanticadaptation.cg.cpp.generation
 
 class CMakeListsGenerator {
 

+ 0 - 1
DSL_SemanticAdaptation/pom.xml

@@ -16,7 +16,6 @@
 		<module>be.uantwerpen.ansymo.semanticadaptation.tests</module>
 		<module>be.uantwerpen.ansymo.semanticadaptation.ide</module>
 		<module>be.uantwerpen.ansymo.semanticadaptation.ui</module>
-	  <module>be.uantwerpen.ansymo.semanticadaptation.cg.cpp.lib</module>
 		<module>be.uantwerpen.ansymo.semanticadaptation.cg.cpp</module>
 	  <module>be.uantwerpen.ansymo.semanticadaptation.cg.cpp.tests</module>
 		<!--module>../my.mavenized.herolanguage.ui</module>