Merge pull request #2 from OoMrFlibble/master

Major overhaul

Author: OoMrFlibble

.github/workflows/build.yml

@@ -4,10 +4,10 @@ name: build
 
 on:
   workflow_dispatch:
-  push:
+  #  push:
+  #  branches: [ main ]
+  #  pull_request:
   #  branches: [ main ]
-  pull_request:
-    branches: [ main ]
 
 jobs:
   semver:
@@ -54,7 +54,7 @@ jobs:
           echo "MACOS_MAJORMINORPATCH=${GitVersion_MajorMinorPatch}" >> "$GITHUB_OUTPUT"
         fi
 
-  package-linux:
+  package-linux-x86_64:
     needs: [semver]
     runs-on: ubuntu-latest
 
@@ -64,34 +64,18 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: setup pyenv
-      run: |
-        sudo apt-get install python3-tk python3-venv python3-pip
-        venv="$HOME/python3/pyinstaller"
-        rm -Rf "$venv"  # uncomment to make fresh venv.
-        python3 -m venv "$venv"
-        source "${venv}"/bin/activate
-        pip install pyinstaller
-        pip install twisted
-
-    - name: Build using pyinstaller
+    - name: make installable tarball
       run: |
-        venv="$HOME/python3/pyinstaller"
-        source "${venv}"/bin/activate
-        pyinstaller \
-        --onefile \
-        --add-binary "oojsc.xbm:." \
-        --add-binary "OoJSC.ico:." \
-        DebugConsole.py
+        cd builder
+        cd Linux
+        ./make.sh debdeps
+        ./make.sh onefile Oolite-Debug-Console-${{ needs.semver.outputs.GITVERSION_SEMVER }}-linux-x86_64-installable /tmp
 
-    - name: create archive
-      run: |
-        tar cvfz Oolite-Debug-Console-${{ needs.semver.outputs.GITVERSION_SEMVER }}-linux.tgz dist/
-        
     - uses: actions/upload-artifact@v4
       with:
-        name: Oolite-Debug-Console-Ubuntu
-        path: ./Oolite-Debug-Console-${{ needs.semver.outputs.GITVERSION_SEMVER }}-linux.tgz
+        name: Oolite-Debug-Console-Linux-x86_64-Installable
+        path: /tmp/Oolite-Debug-Console-${{ needs.semver.outputs.GITVERSION_SEMVER }}-linux-x86_64-installable-onefile.tgz
+  
 
   package-windows:
     needs: [semver]
@@ -105,9 +89,12 @@ jobs:
     - name: Install pyinstaller
       run: |
         pip install -U pyinstaller
+        pip install -U click
         pip install -U twisted
         pip install -U pywin32
 
+#Flibble. Wonder if this is actually used now?        pip install -U pywin32
+
     # in Windows PowerShell the backtick indicates a multiline command
     # see https://stackoverflow.com/questions/3235850/how-to-enter-a-multi-line-command
     - name: Build using pyinstaller
@@ -118,10 +105,10 @@ jobs:
          --log-level=WARN `
          --onefile `
          --name OoDebugConsole `
-         --add-binary "OoJSC.ico:." `
-         --add-binary "oojsc.xbm:." `
+         --add-binary "images\OoJSC.ico:." `
+         --add-binary "images\oojsc.xbm:." `
          --noconsole `
-         --icon=OoJSC.ico `
+         --icon=images\OoJSC.ico `
          DebugConsole.py
 
     #      --version-file=OoDebug_version_info.txt `
@@ -141,7 +128,7 @@ jobs:
         name: Oolite-Debug-Console-Windows
         path: Oolite-Debug-Console-${{ needs.semver.outputs.GITVERSION_SEMVER }}-win.zip
 
-  package-macos:
+  package-macos-arm64:
     needs: [semver]
     runs-on: macos-latest
 
@@ -151,29 +138,19 @@ jobs:
       with:
         fetch-depth: 0
 
-    - name: Install pyinstaller
-      run: |
-        pip install -U pyinstaller
-
-    - name: Build using pyinstaller
-      run: |
-        pyinstaller \
-        --onefile \
-        --add-binary "oojsc.xbm:." \
-        --add-binary "OoJSC.ico:." \
-        DebugConsole.py
-
-    - name: create archive
+    - name: make installable tarball
       run: |
-        tar cvfz Oolite-Debug-Console-${{ needs.semver.outputs.GITVERSION_SEMVER }}-macos.tgz dist/
+        cd builder
+        cd MacOS
+        ./make.sh app Oolite-Debug-Console-${{ needs.semver.outputs.GITVERSION_SEMVER }}-macos-arm64 /tmp
 
     - uses: actions/upload-artifact@v4
       with:
-        name: Oolite-Debug-Console-MacOs
-        path: ./Oolite-Debug-Console-${{ needs.semver.outputs.GITVERSION_SEMVER }}-macos.tgz
+        name: Oolite-Debug-Console-MacOs-arm64
+        path: /tmp/Oolite-Debug-Console-${{ needs.semver.outputs.GITVERSION_SEMVER }}-macos-arm64-app.tgz
 
   release:
-    needs: [semver,package-linux,package-windows,package-macos]
+    needs: [semver,package-linux-x86_64,package-windows,package-macos-arm64]
     runs-on: ubuntu-latest
 
     steps:
@@ -211,9 +188,9 @@ jobs:
         prerelease: true
         title: "Debug Console v${{ needs.semver.outputs.GITVERSION_SEMVER }}"
         files: |
-          artifacts/Oolite-Debug-Console-Ubuntu/*.tgz
+          artifacts/Oolite-Debug-Console-Linux-x86_64-Installable/*.tgz
           artifacts/Oolite-Debug-Console-Windows/*.zip
-          artifacts/Oolite-Debug-Console-MacOs/*.tgz
+          artifacts/Oolite-Debug-Console-MacOs-arm64/*.tgz
       
     - name: Remove old releases
       if: github.ref == 'refs/heads/master'
@@ -237,7 +214,7 @@ jobs:
         prerelease: false
         title: "Debug Console v${{ needs.semver.outputs.GITVERSION_SEMVER }}"
         files: |
-          artifacts/Oolite-Debug-Console-Ubuntu/*.tgz
+          artifacts/Oolite-Debug-Console-Linux-x86_64-Installable/*.tgz
           artifacts/Oolite-Debug-Console-Windows/*.zip
-          artifacts/Oolite-Debug-Console-MacOs/*.tgz
+          artifacts/Oolite-Debug-Console-MacOs-arm64/*.tgz
 

.gitignore

@@ -9,8 +9,21 @@ Icon?
 # Python cruft
 *.pyc
 *.pyo
+*/__pycache__/
 
 # pyinstaller cruft
 *.spec
 build/
 dist/
+
+# VS code
+*/launch.json
+*/settings.json
+
+# NotePad++ cruft
+*/nppBackup/
+
+# OoDC cruft
+*.cfg
+*.log
+*.dat