Project folders reorganization

maccasoft · Dec 27, 2024 · f3ebb03 · f3ebb03
1 parent 07401f0
commit f3ebb03
Show file tree

Hide file tree

Showing 31 changed files with 94 additions and 58 deletions.
diff --git a/.project b/.project
@@ -14,15 +14,4 @@
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
-	<filteredResources>
-		<filter>
-			<id>0</id>
-			<name>build</name>
-			<type>10</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-target</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
 </projectDescription>
diff --git a/build/.gitignore b/build/.gitignore
diff --git a/build/Spin Tools IDE.launch → eclipse/Spin Tools IDE.launch b/build/Spin Tools IDE.launch → eclipse/Spin Tools IDE.launch
diff --git a/build/Spin Tools Tests.launch → eclipse/Spin Tools Tests.launch b/build/Spin Tools Tests.launch → eclipse/Spin Tools Tests.launch
diff --git a/build/linux/app128.png → linux/app128.png b/build/linux/app128.png → linux/app128.png
diff --git a/build/linux/app16.png → linux/app16.png b/build/linux/app16.png → linux/app16.png
diff --git a/build/linux/app256.png → linux/app256.png b/build/linux/app256.png → linux/app256.png
diff --git a/build/linux/app32.png → linux/app32.png b/build/linux/app32.png → linux/app32.png
diff --git a/build/linux/app48.png → linux/app48.png b/build/linux/app48.png → linux/app48.png
diff --git a/build/linux/app64.png → linux/app64.png b/build/linux/app64.png → linux/app64.png
diff --git a/build/linux/descriptor.xml → linux/descriptor.xml b/build/linux/descriptor.xml → linux/descriptor.xml
@@ -12,16 +12,16 @@
         </dependencySet>
     </dependencySets>
     <files>
-        <file><source>build/linux/app16.png</source><outputDirectory>lib</outputDirectory></file>
-        <file><source>build/linux/app32.png</source><outputDirectory>lib</outputDirectory></file>
-        <file><source>build/linux/app48.png</source><outputDirectory>lib</outputDirectory></file>
-        <file><source>build/linux/app64.png</source><outputDirectory>lib</outputDirectory></file>
-        <file><source>build/linux/desktop.template</source><outputDirectory>lib</outputDirectory></file>
-        <file><source>build/linux/spinc</source><fileMode>755</fileMode></file>
-        <file><source>build/linux/spinide</source><fileMode>755</fileMode></file>
-        <file><source>build/linux/spinide.png</source></file>
-        <file><source>build/linux/install.sh</source><fileMode>755</fileMode></file>
-        <file><source>build/linux/uninstall.sh</source><fileMode>755</fileMode></file>
+        <file><source>linux/app16.png</source><outputDirectory>lib</outputDirectory></file>
+        <file><source>linux/app32.png</source><outputDirectory>lib</outputDirectory></file>
+        <file><source>linux/app48.png</source><outputDirectory>lib</outputDirectory></file>
+        <file><source>linux/app64.png</source><outputDirectory>lib</outputDirectory></file>
+        <file><source>linux/desktop.template</source><outputDirectory>lib</outputDirectory></file>
+        <file><source>linux/spinc</source><fileMode>755</fileMode></file>
+        <file><source>linux/spinide</source><fileMode>755</fileMode></file>
+        <file><source>linux/spinide.png</source></file>
+        <file><source>linux/install.sh</source><fileMode>755</fileMode></file>
+        <file><source>linux/uninstall.sh</source><fileMode>755</fileMode></file>
         <file><source>LICENSE</source></file>
     </files>
     <fileSets>

diff --git a/build/linux/descriptor_jre.xml → linux/descriptor_jre.xml b/build/linux/descriptor_jre.xml → linux/descriptor_jre.xml
@@ -12,16 +12,16 @@
         </dependencySet>
     </dependencySets>
     <files>
-        <file><source>build/linux/app16.png</source><outputDirectory>lib</outputDirectory></file>
-        <file><source>build/linux/app32.png</source><outputDirectory>lib</outputDirectory></file>
-        <file><source>build/linux/app48.png</source><outputDirectory>lib</outputDirectory></file>
-        <file><source>build/linux/app64.png</source><outputDirectory>lib</outputDirectory></file>
-        <file><source>build/linux/desktop.template</source><outputDirectory>lib</outputDirectory></file>
-        <file><source>build/linux/spinc</source><fileMode>755</fileMode></file>
-        <file><source>build/linux/spinide</source><fileMode>755</fileMode></file>
-        <file><source>build/linux/spinide.png</source></file>
-        <file><source>build/linux/install.sh</source><fileMode>755</fileMode></file>
-        <file><source>build/linux/uninstall.sh</source><fileMode>755</fileMode></file>
+        <file><source>linux/app16.png</source><outputDirectory>lib</outputDirectory></file>
+        <file><source>linux/app32.png</source><outputDirectory>lib</outputDirectory></file>
+        <file><source>linux/app48.png</source><outputDirectory>lib</outputDirectory></file>
+        <file><source>linux/app64.png</source><outputDirectory>lib</outputDirectory></file>
+        <file><source>linux/desktop.template</source><outputDirectory>lib</outputDirectory></file>
+        <file><source>linux/spinc</source><fileMode>755</fileMode></file>
+        <file><source>linux/spinide</source><fileMode>755</fileMode></file>
+        <file><source>linux/spinide.png</source></file>
+        <file><source>linux/install.sh</source><fileMode>755</fileMode></file>
+        <file><source>linux/uninstall.sh</source><fileMode>755</fileMode></file>
         <file><source>LICENSE</source></file>
     </files>
     <fileSets>
@@ -40,7 +40,7 @@
             <outputDirectory>library</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>build/target/maven-jlink/default</directory>
+            <directory>modules/runtime/target/maven-jlink/default</directory>
             <outputDirectory>java</outputDirectory>
         </fileSet>
     </fileSets>

diff --git a/build/linux/desktop.template → linux/desktop.template b/build/linux/desktop.template → linux/desktop.template
diff --git a/build/linux/install.sh → linux/install.sh b/build/linux/install.sh → linux/install.sh
diff --git a/build/linux/spinc → linux/spinc b/build/linux/spinc → linux/spinc
diff --git a/build/linux/spinide → linux/spinide b/build/linux/spinide → linux/spinide
diff --git a/build/linux/spinide.png → linux/spinide.png b/build/linux/spinide.png → linux/spinide.png
diff --git a/build/linux/uninstall.sh → linux/uninstall.sh b/build/linux/uninstall.sh → linux/uninstall.sh
diff --git a/build/macosx/app.icns → macosx/app.icns b/build/macosx/app.icns → macosx/app.icns
diff --git a/build/macosx/descriptor.xml → macosx/descriptor.xml b/build/macosx/descriptor.xml → macosx/descriptor.xml
@@ -13,7 +13,7 @@
     </dependencySets>
     <files>
         <file>
-            <source>build/macosx/spinc</source>
+            <source>macosx/spinc</source>
             <fileMode>755</fileMode>
             <outputDirectory>Contents/MacOS</outputDirectory>
         </file>

diff --git a/build/macosx/descriptor_jre.xml → macosx/descriptor_jre.xml b/build/macosx/descriptor_jre.xml → macosx/descriptor_jre.xml
@@ -13,7 +13,7 @@
     </dependencySets>
     <files>
         <file>
-            <source>build/macosx/spinc</source>
+            <source>macosx/spinc</source>
             <fileMode>755</fileMode>
             <outputDirectory>Contents/MacOS</outputDirectory>
         </file>

diff --git a/build/macosx/spinc → macosx/spinc b/build/macosx/spinc → macosx/spinc
diff --git a/modules/runtime/.gitignore b/modules/runtime/.gitignore
@@ -0,0 +1,2 @@
+.settings/
+target/
diff --git a/modules/runtime/descriptor.xml b/modules/runtime/descriptor.xml
@@ -0,0 +1,15 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    <id>runtime</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <baseDirectory>_jre</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>target/maven-jlink/default</directory>
+            <outputDirectory></outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/build/pom.xml → modules/runtime/pom.xml b/build/pom.xml → modules/runtime/pom.xml
@@ -1,9 +1,12 @@
 <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.maccasoft</groupId>
-    <artifactId>spin-tools-runtime</artifactId>
-    <version>0.43.0</version>
+    <groupId>com.parallax</groupId>
+    <artifactId>runtime</artifactId>
+    <version>1.17.0</version>
     <packaging>pom</packaging>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
     <build>
         <plugins>
             <plugin>
@@ -17,7 +20,7 @@
                         </goals>
                         <configuration>
                             <modulePaths>
-                                <modulePath>../target</modulePath>
+                                <modulePath>target</modulePath>
                             </modulePaths>
                             <addModules>
                                 <addModule>java.base</addModule>
@@ -26,10 +29,29 @@
                             </addModules>
                             <noHeaderFiles>true</noHeaderFiles>
                             <noManPages>true</noManPages>
+                            <stripDebug>true</stripDebug>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>            
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptors>
+                        <descriptor>descriptor.xml</descriptor>
+                    </descriptors>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -12,9 +12,12 @@
             <url>https://www.maccasoft.com</url>
         </developer>
     </developers>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
     <modules>
+        <module>modules/runtime</module>
         <module>modules/spin-tools</module>
-        <module>build</module>
     </modules>
     <dependencies>
         <dependency>
@@ -39,8 +42,8 @@
                         <artifactId>maven-assembly-plugin</artifactId>
                         <configuration>
                             <descriptors>
-                                <descriptor>build/linux/descriptor.xml</descriptor>
-                                <descriptor>build/linux/descriptor_jre.xml</descriptor>
+                                <descriptor>linux/descriptor.xml</descriptor>
+                                <descriptor>linux/descriptor_jre.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </plugin>
@@ -61,8 +64,8 @@
                         <artifactId>maven-assembly-plugin</artifactId>
                         <configuration>
                             <descriptors>
-                                <descriptor>build/linux/descriptor.xml</descriptor>
-                                <descriptor>build/linux/descriptor_jre.xml</descriptor>
+                                <descriptor>linux/descriptor.xml</descriptor>
+                                <descriptor>linux/descriptor_jre.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </plugin>
@@ -91,7 +94,7 @@
                                     <goal>launch4j</goal>
                                 </goals>
                                 <configuration>
-                                    <infile>build/windows/config.xml</infile>
+                                    <infile>windows/config.xml</infile>
                                     <outfile>target/spinide.exe</outfile>
                                     <versionInfo>
                                         <fileVersion>${project.version}.0</fileVersion>
@@ -108,7 +111,7 @@
                                     <goal>launch4j</goal>
                                 </goals>
                                 <configuration>
-                                    <infile>build/windows/config-cli.xml</infile>
+                                    <infile>windows/config-cli.xml</infile>
                                     <outfile>target/spinc.exe</outfile>
                                     <versionInfo>
                                         <fileVersion>${project.version}.0</fileVersion>
@@ -124,8 +127,8 @@
                         <artifactId>maven-assembly-plugin</artifactId>
                         <configuration>
                             <descriptors>
-                                <descriptor>build/windows/descriptor.xml</descriptor>
-                                <descriptor>build/windows/descriptor_jre.xml</descriptor>
+                                <descriptor>windows/descriptor.xml</descriptor>
+                                <descriptor>windows/descriptor_jre.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </plugin>
@@ -140,6 +143,9 @@
             <properties>
                 <project.arch>x86_64</project.arch>
             </properties>
+            <modules>
+                <module>modules/spin-tools</module>
+            </modules>
             <build>
                 <plugins>
                     <plugin>
@@ -174,7 +180,7 @@
                                             displayname="Spin Tools IDE"
                                             executableName="spinide"
                                             identifier="com.maccasoft.propeller"
-                                            icon="build/macosx/app.icns"
+                                            icon="macosx/app.icns"
                                             shortversion="${project.version}"
                                             signature="????"
                                             copyright="Marco Maccaferri"
@@ -195,7 +201,7 @@
                                             displayname="Spin Tools IDE"
                                             executableName="spinide"
                                             identifier="com.maccasoft.propeller"
-                                            icon="build/macosx/app.icns"
+                                            icon="macosx/app.icns"
                                             shortversion="${project.version}"
                                             signature="????"
                                             copyright="Marco Maccaferri"
@@ -223,8 +229,8 @@
                         <artifactId>maven-assembly-plugin</artifactId>
                         <configuration>
                             <descriptors>
-                                <descriptor>build/macosx/descriptor.xml</descriptor>
-                                <descriptor>build/macosx/descriptor_jre.xml</descriptor>
+                                <descriptor>macosx/descriptor.xml</descriptor>
+                                <descriptor>macosx/descriptor_jre.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </plugin>
@@ -239,6 +245,9 @@
             <properties>
                 <project.arch>aarch64</project.arch>
             </properties>
+            <modules>
+                <module>modules/spin-tools</module>
+            </modules>
             <build>
                 <plugins>
                     <plugin>
@@ -273,7 +282,7 @@
                                             displayname="Spin Tools IDE"
                                             executableName="spinide"
                                             identifier="com.maccasoft.propeller"
-                                            icon="build/macosx/app.icns"
+                                            icon="macosx/app.icns"
                                             shortversion="${project.version}"
                                             signature="????"
                                             copyright="Marco Maccaferri"
@@ -294,7 +303,7 @@
                                             displayname="Spin Tools IDE"
                                             executableName="spinide"
                                             identifier="com.maccasoft.propeller"
-                                            icon="build/macosx/app.icns"
+                                            icon="macosx/app.icns"
                                             shortversion="${project.version}"
                                             signature="????"
                                             copyright="Marco Maccaferri"
@@ -322,8 +331,8 @@
                         <artifactId>maven-assembly-plugin</artifactId>
                         <configuration>
                             <descriptors>
-                                <descriptor>build/macosx/descriptor.xml</descriptor>
-                                <descriptor>build/macosx/descriptor_jre.xml</descriptor>
+                                <descriptor>macosx/descriptor.xml</descriptor>
+                                <descriptor>macosx/descriptor_jre.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </plugin>

diff --git a/build/windows/config-cli.xml → windows/config-cli.xml b/build/windows/config-cli.xml → windows/config-cli.xml
diff --git a/build/windows/config.xml → windows/config.xml b/build/windows/config.xml → windows/config.xml
diff --git a/build/windows/descriptor.xml → windows/descriptor.xml b/build/windows/descriptor.xml → windows/descriptor.xml
diff --git a/build/windows/descriptor_jre.xml → windows/descriptor_jre.xml b/build/windows/descriptor_jre.xml → windows/descriptor_jre.xml
@@ -32,7 +32,7 @@
             <outputDirectory>library</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>build/target/maven-jlink/default</directory>
+            <directory>modules/runtime/target/maven-jlink/default</directory>
             <outputDirectory>java</outputDirectory>
         </fileSet>
     </fileSets>

diff --git a/build/windows/spinide.ico → windows/spinide.ico b/build/windows/spinide.ico → windows/spinide.ico