Build script refactorings

maccasoft · Feb 20, 2023 · 932303b · 932303b
1 parent ce3102b
commit 932303b
Show file tree

Hide file tree

Showing 9 changed files with 211 additions and 250 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,9 +23,9 @@ jobs:
       uses: softprops/action-gh-release@v1
       with:
         files: |
-          build/linux/target/spin-tools-linux*
-          build/windows/target/spin-tools-windows*
-          build/macosx/target/spin-tools-macos*
+          build/target/spin-tools-linux*
+          build/target/spin-tools-windows*
+          build/target/spin-tools-macos*
 
     - name: Create Tests Summary
       uses: test-summary/action@dist

diff --git a/.project b/.project
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1676833826673</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/linux/descriptor.xml b/build/linux/descriptor.xml
@@ -8,60 +8,64 @@
     <baseDirectory>spin-tools</baseDirectory>
     <dependencySets>
         <dependencySet>
+            <excludes>
+                <exclude>org.eclipse.platform:org.eclipse.swt.win32.win32.x86_64</exclude>
+                <exclude>org.eclipse.platform:org.eclipse.swt.cocoa.macosx.x86_64</exclude>
+            </excludes>
             <outputDirectory>lib</outputDirectory>
         </dependencySet>
     </dependencySets>
     <fileSets>
         <fileSet>
-            <directory>../../build/linux</directory>
-            <outputDirectory>lib</outputDirectory>
+            <directory>linux</directory>
             <includes>
                 <include>app16.png</include>
                 <include>app32.png</include>
                 <include>app48.png</include>
                 <include>app64.png</include>
                 <include>desktop.template</include>
             </includes>
+            <outputDirectory>lib</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../../examples</directory>
-            <outputDirectory>examples</outputDirectory>
+            <directory>../examples</directory>
             <excludes>
                 <exclude>**/*.binary</exclude>
             </excludes>
+            <outputDirectory>examples</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../../library</directory>
-            <outputDirectory>library</outputDirectory>
+            <directory>../library</directory>
             <excludes>
                 <exclude>**/*.binary</exclude>
             </excludes>
+            <outputDirectory>library</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}</directory>
-            <outputDirectory></outputDirectory>
+            <directory>linux</directory>
             <fileMode>755</fileMode>
             <includes>
                 <include>spinide</include>
                 <include>install.sh</include>
                 <include>uninstall.sh</include>
                 <include>spinc</include>
             </includes>
+            <outputDirectory></outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../../build/linux</directory>
-            <outputDirectory></outputDirectory>
+            <directory>linux</directory>
             <includes>
                 <include>spinide.png</include>
             </includes>
+            <outputDirectory></outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../..</directory>
-            <outputDirectory></outputDirectory>
+            <directory>..</directory>
             <includes>
                 <include>LICENSE</include>
                 <include>CC-BY-3.0.txt</include>
             </includes>
+            <outputDirectory></outputDirectory>
         </fileSet>
     </fileSets>
 </assembly>
diff --git a/build/linux/pom.xml b/build/linux/pom.xml
diff --git a/build/macosx/descriptor.xml b/build/macosx/descriptor.xml
@@ -8,6 +8,10 @@
     <baseDirectory>Spin Tools IDE.app</baseDirectory>
     <dependencySets>
         <dependencySet>
+            <excludes>
+                <exclude>org.eclipse.platform:org.eclipse.swt.gtk.linux.x86_64</exclude>
+                <exclude>org.eclipse.platform:org.eclipse.swt.win32.win32.x86_64</exclude>
+            </excludes>
             <outputDirectory>Contents/Java</outputDirectory>
         </dependencySet>
     </dependencySets>
@@ -17,26 +21,26 @@
             <outputDirectory></outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../../examples</directory>
-            <outputDirectory>Contents/Java/examples</outputDirectory>
+            <directory>../examples</directory>
             <excludes>
                 <exclude>**/*.binary</exclude>
             </excludes>
+            <outputDirectory>Contents/Java/examples</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../../library</directory>
-            <outputDirectory>Contents/Java/library</outputDirectory>
+            <directory>../library</directory>
             <excludes>
                 <exclude>**/*.binary</exclude>
             </excludes>
+            <outputDirectory>Contents/Java/library</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../..</directory>
-            <outputDirectory></outputDirectory>
+            <directory>..</directory>
             <includes>
                 <include>LICENSE</include>
                 <include>CC-BY-3.0.txt</include>
             </includes>
+            <outputDirectory></outputDirectory>
         </fileSet>
     </fileSets>
 </assembly>
diff --git a/build/macosx/pom.xml b/build/macosx/pom.xml