diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76d0865e..bfe9ff6e 100644 --- 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 index f4bf159f..9f70ba22 100644 --- a/.project +++ b/.project @@ -20,4 +20,15 @@ org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature + + + 1676833826673 + build + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-target + + + diff --git a/build/linux/descriptor.xml b/build/linux/descriptor.xml index 9590ac25..6b3b57da 100644 --- a/build/linux/descriptor.xml +++ b/build/linux/descriptor.xml @@ -8,13 +8,16 @@ spin-tools + + org.eclipse.platform:org.eclipse.swt.win32.win32.x86_64 + org.eclipse.platform:org.eclipse.swt.cocoa.macosx.x86_64 + lib - ../../build/linux - lib + linux app16.png app32.png @@ -22,24 +25,24 @@ app64.png desktop.template + lib - ../../examples - examples + ../examples **/*.binary + examples - ../../library - library + ../library **/*.binary + library - ${project.basedir} - + linux 755 spinide @@ -47,21 +50,22 @@ uninstall.sh spinc + - ../../build/linux - + linux spinide.png + - ../.. - + .. LICENSE CC-BY-3.0.txt + diff --git a/build/linux/pom.xml b/build/linux/pom.xml deleted file mode 100644 index 29a6b723..00000000 --- a/build/linux/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - 4.0.0 - com.maccasoft - linux - 0.22.0 - pom - - - com.maccasoft - com.maccasoft.spin.tools - 0.22.0 - runtime - - - org.eclipse.platform - org.eclipse.swt.gtk.linux.x86_64 - 3.122.0 - runtime - - - - spin-tools - - - maven-assembly-plugin - 3.3.0 - - - make-assembly - package - - single - - - - descriptor.xml - - - - - - - - \ No newline at end of file diff --git a/build/macosx/descriptor.xml b/build/macosx/descriptor.xml index f04926e6..c3182113 100644 --- a/build/macosx/descriptor.xml +++ b/build/macosx/descriptor.xml @@ -8,6 +8,10 @@ Spin Tools IDE.app + + org.eclipse.platform:org.eclipse.swt.gtk.linux.x86_64 + org.eclipse.platform:org.eclipse.swt.win32.win32.x86_64 + Contents/Java @@ -17,26 +21,26 @@ - ../../examples - Contents/Java/examples + ../examples **/*.binary + Contents/Java/examples - ../../library - Contents/Java/library + ../library **/*.binary + Contents/Java/library - ../.. - + .. LICENSE CC-BY-3.0.txt + diff --git a/build/macosx/pom.xml b/build/macosx/pom.xml deleted file mode 100644 index f82cf8a7..00000000 --- a/build/macosx/pom.xml +++ /dev/null @@ -1,89 +0,0 @@ - - 4.0.0 - com.maccasoft - macosx - 0.22.0 - pom - - - com.maccasoft - com.maccasoft.spin.tools - 0.22.0 - runtime - - - org.eclipse.platform - org.eclipse.swt.cocoa.macosx.x86_64 - 3.122.0 - runtime - - - - spin-tools - - - org.apache.maven.plugins - maven-antrun-plugin - 3.1.0 - - - com.evolvedbinary.appbundler - appbundler - 1.1.0 - - - - - make-executable - package - - - - - - - - - run - - - - - - maven-assembly-plugin - 3.3.0 - - - make-assembly - package - - single - - - - descriptor.xml - - - - - - - - \ No newline at end of file diff --git a/build/pom.xml b/build/pom.xml index db18e206..77d9ef35 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -7,8 +7,164 @@ pom .. - linux - windows - macosx + + + com.maccasoft + com.maccasoft.spin.tools + 0.22.0 + runtime + + + org.eclipse.platform + org.eclipse.swt.gtk.linux.x86_64 + 3.122.0 + runtime + + + org.eclipse.platform + org.eclipse.swt.win32.win32.x86_64 + 3.122.0 + runtime + + + org.eclipse.platform + org.eclipse.swt.cocoa.macosx.x86_64 + 3.122.0 + runtime + + + + spin-tools + + + com.akathist.maven.plugins.launch4j + launch4j-maven-plugin + 2.1.3 + + + make-windows-executable + package + + launch4j + + + windows/config.xml + target/spinide.exe + + ${project.version}.0 + ${project.version}.0 + ${project.version}.0 + ${project.version}.0 + + + + + make-windows-cli-executable + package + + launch4j + + + windows/config-cli.xml + target/spinc.exe + + ${project.version}.0 + ${project.version}.0 + ${project.version}.0 + ${project.version}.0 + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + com.evolvedbinary.appbundler + appbundler + 1.1.0 + + + + + make-macosx-executable + package + + + + + + + + + run + + + + + + maven-assembly-plugin + 3.3.0 + + + make-linux-assembly + package + + single + + + + linux/descriptor.xml + + + + + make-windows-assembly + package + + single + + + + windows/descriptor.xml + + + + + make-macosx-assembly + package + + single + + + + macosx/descriptor.xml + + + + + + + diff --git a/build/windows/descriptor.xml b/build/windows/descriptor.xml index 0f84969c..ab657bc4 100644 --- a/build/windows/descriptor.xml +++ b/build/windows/descriptor.xml @@ -8,39 +8,43 @@ spin-tools + + org.eclipse.platform:org.eclipse.swt.gtk.linux.x86_64 + org.eclipse.platform:org.eclipse.swt.cocoa.macosx.x86_64 + lib - ../../examples - examples + ../examples **/*.binary + examples - ../../library - library + ../library **/*.binary + library - ${project.basedir}/target - + target spinide.exe spinc.exe + - ../.. - + .. LICENSE CC-BY-3.0.txt + diff --git a/build/windows/pom.xml b/build/windows/pom.xml deleted file mode 100644 index aa236497..00000000 --- a/build/windows/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - 4.0.0 - com.maccasoft - windows - 0.22.0 - pom - - - com.maccasoft - com.maccasoft.spin.tools - 0.22.0 - runtime - - - org.eclipse.platform - org.eclipse.swt.win32.win32.x86_64 - 3.122.0 - runtime - - - - spin-tools - - - com.akathist.maven.plugins.launch4j - launch4j-maven-plugin - 2.1.3 - - - make-executable - package - - launch4j - - - config.xml - target/spinide.exe - - ${project.version}.0 - ${project.version}.0 - ${project.version}.0 - ${project.version}.0 - - - - - make-cli-executable - package - - launch4j - - - config-cli.xml - target/spinc.exe - - ${project.version}.0 - ${project.version}.0 - ${project.version}.0 - ${project.version}.0 - - - - - - - maven-assembly-plugin - 3.3.0 - - - make-assembly - package - - single - - - - descriptor.xml - - - - - - - - \ No newline at end of file