Fixed dependencies

CallForSanity · Dec 14, 2021 · 60b75f8 · 60b75f8
1 parent b866d3a
commit 60b75f8
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 205 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,21 +28,19 @@ ADD_SUBDIRECTORY(share)
 
 # build
 add_custom_target(gaalop ALL COMMENT "Compiling Gaalop.")
-add_custom_command(TARGET gaalop COMMAND ${MVN_BINARY} -DupdateOnly=true -Dmaven.test.skip=true package assembly:directory WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+add_custom_command(TARGET gaalop COMMAND ${MVN_BINARY} -DupdateOnly=true -Dmaven.test.skip=true package WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 add_custom_target(mvn_clean ALL COMMENT "Maven Clean Gaalop.")
 add_custom_command(TARGET mvn_clean COMMAND ${MVN_BINARY} clean WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 add_dependencies(gaalop mvn_clean)
 # copy
 COPY_STATIC_DIRECTORY(include-copy include include)
-COPY_STATIC_DIRECTORY(gaalop-copy "target/gaalop-1.0.0-bin" "share/gpc/gaalop")
-COPY_STATIC_DIRECTORY(dependencies-copy dependencies "share/gpc/gaalop/plugins")
+COPY_STATIC_DIRECTORY(gaalop-copy "distribution/target/distribution-1.0.0-bin" "share/gpc/gaalop")
 IF(TARGET gaalop-copy)
 	ADD_DEPENDENCIES(gaalop-copy gaalop)
-	ADD_DEPENDENCIES(dependencies-copy gaalop-copy)
 ENDIF(TARGET gaalop-copy)
 
 # find paths
-FILE(GLOB GAALOP_BUILD_TARGET_DIR_LIST "${CMAKE_CURRENT_SOURCE_DIR}/target/gaalop*")
+FILE(GLOB GAALOP_BUILD_TARGET_DIR_LIST "${CMAKE_CURRENT_SOURCE_DIR}/distribution/target/distribution*")
 IF(GAALOP_BUILD_TARGET_DIR_LIST)
 	LIST(GET GAALOP_BUILD_TARGET_DIR_LIST 0 GAALOP_BUILD_TARGET_DIR)
 ENDIF(GAALOP_BUILD_TARGET_DIR_LIST)
@@ -51,7 +49,6 @@ ENDIF(GAALOP_BUILD_TARGET_DIR_LIST)
 IF(GAALOP_BUILD_TARGET_DIR)
 	INSTALL(DIRECTORY "${GAALOP_BUILD_TARGET_DIR}/." DESTINATION share/gpc/gaalop PATTERN ".svn" EXCLUDE)
 ENDIF(GAALOP_BUILD_TARGET_DIR)
-INSTALL(DIRECTORY "dependencies/." DESTINATION share/gpc/gaalop/plugins PATTERN ".svn" EXCLUDE)
 
 # set root dir
 SET(GPC_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}" CACHE PATH "Gaalop Compiler Driver root directory" FORCE)

diff --git a/dependencies/antlr4-annotations-4.3.jar b/dependencies/antlr4-annotations-4.3.jar
diff --git a/dependencies/antlr4-runtime-4.9.2.jar b/dependencies/antlr4-runtime-4.9.2.jar
diff --git a/dependencies/args4j-2.33.jar b/dependencies/args4j-2.33.jar
diff --git a/dependencies/commons-beanutils-1.8.0.jar b/dependencies/commons-beanutils-1.8.0.jar
diff --git a/dependencies/commons-logging-1.2.jar b/dependencies/commons-logging-1.2.jar
diff --git a/dependencies/jna-5.8.0.jar b/dependencies/jna-5.8.0.jar
diff --git a/dependencies/log4j-1.2.17.jar b/dependencies/log4j-1.2.17.jar
diff --git a/dependencies/stringtemplate-3.2.jar b/dependencies/stringtemplate-3.2.jar
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -10,7 +10,7 @@
 
     <artifactId>distribution</artifactId>
     <packaging>pom</packaging>
-	<version>2.2.5</version>
+	<version>1.0.0</version> <!-- This must stay on version 1.0.0 for CMake process.-->
 
     <name>Gaalop Distribution</name>
 
@@ -24,59 +24,24 @@
             <artifactId>api</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>algebra</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>visualCodeInserter</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>ganjaVisualCodeInserter</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>visualCodeInserter2d</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <dependency>
             <groupId>de.gaalop</groupId>
             <artifactId>clucalc</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>de.gaalop</groupId>
-            <artifactId>globalSettings</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>gappDebugger</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>tba</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>gapp</artifactId>
+            <artifactId>algebra</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>de.gaalop</groupId>
-            <artifactId>codegen-compressed</artifactId>
+            <artifactId>globalSettings</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>de.gaalop</groupId>
-            <artifactId>codegen-cpp</artifactId>
+            <artifactId>visualCodeInserter</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
@@ -86,57 +51,27 @@
         </dependency>
         <dependency>
             <groupId>de.gaalop</groupId>
-            <artifactId>codegen-dot</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>codegen-latex</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>codegen-gapp</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>codegen-visualizer</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>codegen-vis2d</artifactId>
+            <artifactId>codegen-cpp</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>de.gaalop</groupId>
-            <artifactId>codegen-gappopencl</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-		<dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>codegen-rust</artifactId>
+            <artifactId>codegen-compressed</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>de.gaalop</groupId>
-            <artifactId>codegen-mathematica</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-	<dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>codegen-julia</artifactId>
+            <artifactId>gaalet</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>de.gaalop</groupId>
-            <artifactId>codegen-matlab</artifactId>
+            <artifactId>tba</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>de.gaalop</groupId>
-            <artifactId>gaalet</artifactId>
+            <artifactId>gapp</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
@@ -146,24 +81,14 @@
         </dependency>
         <dependency>
             <groupId>de.gaalop</groupId>
-            <artifactId>gui</artifactId>
+            <artifactId>gpc</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>de.gaalop</groupId>
             <artifactId>starter</artifactId>
             <version>1.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>codegen-ganja</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>de.gaalop</groupId>
-            <artifactId>codegen-python</artifactId>
-            <version>1.0.0</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -205,4 +130,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/distribution/src/assembly/dist.xml b/distribution/src/assembly/dist.xml
@@ -7,40 +7,22 @@
     <includeBaseDirectory>false</includeBaseDirectory>
     <moduleSets>
         <moduleSet>
-	        <useAllReactorProjects>true</useAllReactorProjects>
-
+            <useAllReactorProjects>true</useAllReactorProjects>
             <includes>
-                <!-- General & Input -->
-                <include>de.gaalop:algebra</include>
                 <include>de.gaalop:api</include>
-                <include>de.gaalop:cli</include>
                 <include>de.gaalop:clucalc</include>
-                <include>de.gaalop:gaalet</include>
+                <include>de.gaalop:algebra</include>
                 <include>de.gaalop:globalSettings</include>
-                <include>de.gaalop:gui</include>
-                <include>de.gaalop:starter</include>
                 <include>de.gaalop:visualCodeInserter</include>
-                <include>de.gaalop:visualCodeInserter2d</include>
-
-                <!-- Optimization -->
-                <include>de.gaalop:gapp</include>
-                <include>de.gaalop:tba</include>
-
-                <!-- Code generator -->
-                <include>de.gaalop:codegen-compressed</include>
+                <include>de.gaalop:codegen-java</include>
                 <include>de.gaalop:codegen-cpp</include>
-                <include>de.gaalop:codegen-dot</include>
-                <include>de.gaalop:codegen-gapp</include>
+                <include>de.gaalop:codegen-compressed</include>
                 <include>de.gaalop:codegen-gappopencl</include>
-                <include>de.gaalop:codegen-java</include>
-                <include>de.gaalop:codegen-julia</include>
-                <include>de.gaalop:codegen-latex</include>
-                <include>de.gaalop:codegen-mathematica</include>
-                <include>de.gaalop:codegen-matlab</include>
-                <include>de.gaalop:codegen-rust</include>
-                <include>de.gaalop:codegen-vis2d</include>
-                <include>de.gaalop:codegen-visualizer</include>
-                <include>de.gaalop:gappDebugger</include>
+                <include>de.gaalop:gaalet</include>
+                <include>de.gaalop:tba</include>
+                <include>de.gaalop:gapp</include>
+                <include>de.gaalop:cli</include>
+                <include>de.gaalop:gpc</include>
 
             </includes>
             <binaries>
@@ -55,7 +37,6 @@
         </moduleSet>
         <moduleSet>
             <useAllReactorProjects>true</useAllReactorProjects>
-
             <includes>
                 <include>de.gaalop:starter</include>
             </includes>
@@ -67,24 +48,6 @@
         </moduleSet>
     </moduleSets>
 
-    <dependencySets>
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>nativeLibraries</outputDirectory>
-            <includes>
-                <include>org.lwjgl.lwjgl:lwjgl-platform:jar:natives-windows</include>
-                <include>org.lwjgl.lwjgl:lwjgl-platform:jar:natives-linux</include>
-                <include>org.lwjgl.lwjgl:lwjgl-platform:jar:natives-osx</include>
-            </includes>
-            <unpack>true</unpack>
-            <unpackOptions>
-                <excludes>
-                    <exclude>META-INF/**</exclude>
-                </excludes>
-            </unpackOptions>
-        </dependencySet>
-    </dependencySets>
-
     <fileSets>
         <fileSet>
             <directory>src/main/resources/startupscripts</directory>

diff --git a/pom.xml b/pom.xml
@@ -58,8 +58,8 @@
         <!-- testbenches -->
         <module>testbenchTbaGapp</module>
 
-        <!-- distribution
-        <module>distribution</module>-->
+        <!-- distribution-->
+        <module>distribution</module>
 
     </modules>
 
@@ -79,29 +79,8 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <configuration>
-                        <descriptors>
-                            <descriptor>src/assemble/dist.xml</descriptor>
-                        </descriptors>
-                    </configuration>
+                    <version>3.3.0</version>
                 </plugin>
-                <plugin>
-              <groupId>org.owasp</groupId>
-              <artifactId>dependency-check-maven</artifactId>
-              <version>6.5.0</version>
-              <configuration>
-                <suppressionFiles>
-                    <suppressionFile>owasp-dependency-check-suppressions.xml</suppressionFile>
-                </suppressionFiles>
-              </configuration>
-              <executions>
-                  <execution>
-                      <goals>
-                          <goal>check</goal>
-                      </goals>
-                  </execution>
-              </executions>
-            </plugin>
             </plugins>
         </pluginManagement>
     </build>

diff --git a/src/assemble/dist.xml b/src/assemble/dist.xml