Mac build was not uploaded.

Linux builder desktop file was wrong name (inherited from offline dev)

Author: OoMrFlibble

_version.py

@@ -1 +1 @@
-__version__ = "2.14.104.1"
+__version__ = "2.14.105"

builder/Linux/make.sh

@@ -74,7 +74,7 @@ commonparts(){
  mkdir -p bin &&
   mkdir -p share/applications &&
    mkdir -p share/icons/hicolor/256x256/apps &&
-    echo "$desktop" > share/applications/OoDC.desktop &&
+    echo "$desktop" > share/applications/$basename.desktop &&
      cp ../../../../OoJSC256x256.png share/icons/hicolor/256x256/apps/$basename-icon.png ||
  q "commonparts : failed to make output tree"
 }

builder/MacOS/MacOS-README.txt

@@ -0,0 +1,30 @@
+The Mac version of this is currently quite crude compared to its Linux brother.
+
+This will build an app tarball, with an executable that will work where python
+ is unavailable.
+
+Then, build.
+
+    ./make.sh dist
+
+If rebuilding for any reason, delete the build directory.
+
+    ./make.sh clean
+
+Detailed info:
+
+The script needs to be in the build tree at ./MacOS/make.sh
+
+It expects to be executed in that directory.
+
+Any arg2 will be used as the base name for the tarball. Take care!
+
+Any arg3 will be used as a destination directory for the tarballs.
+
+It will:
+    Create a "build" directory.
+    Create a python3 venv in it.
+    Activate the venv.
+    Use pip inside the venv to install python dependencies and pyinstaller.
+    Compile an executable of the project.
+    Create a tar archive with that in it.

builder/MacOS/make.sh

@@ -0,0 +1,78 @@
+#!/bin/bash
+
+q(){ echo "Error at: $*" >&2 ; exit 5 ; } # exit function
+
+alttarbase="$2"
+alttardir="$3"
+
+cleaner(){
+  step="Remove build directory"
+  echo "$step" ; rm -Rf build || q "$step"
+}
+
+basedir="$(dirname $(realpath $0))"
+[ -d "$basedir" ] || q "Insane basedir '$basedir'"
+cd "$basedir" || q "Can't cd to $basedir"
+
+builddirname=build
+builddir="$basedir/$builddirname" # this can be deleted to retry a build
+basename=OoliteDebugConsole2 # gets used a lot
+inscript=DebugConsole.py # the name of the script we'll be 'compiling'
+venv="$builddir/pyinstaller"
+relpath="../../../"
+
+prep(){
+  mkdir -p "$builddir" || q "Can't create $builddir."
+  cd "$builddir" || q "Can't cd to builddir $builddir"
+  step="setting up venv and building tools"
+  python3 -m venv "$venv" &&
+  source "$venv"/bin/activate &&
+  pip install click &&
+  pip install twisted &&
+  pip install pyinstaller || q "$step"
+}
+
+
+setupvars(){
+ #cd to base directory and set up base variables
+ cd "$basedir"
+ cd ../.. && ver=$(echo "
+from _version import __version__
+print(__version__)
+" | python3 ) && cd - || q "error ascertaining version"
+ [ "x$ver" = "x" ] && q "version not found. version file empty or absent"
+ [ "x$alttarbase" != "x" ] && tarbase="$alttarbase" || tarbase="${basename}-$ver-macos_$(arch)"
+ [ "x$alttardir" != "x" ] && tardir="$alttardir" || tardir="$basedir"
+ mkdir -p "$tardir" || q "could not create dir '$tardir' to house tarballs"
+}
+
+onefile(){
+step="making executable"
+echo "$step"
+pyinstaller --name "$basename" --onefile "${relpath}$inscript" \
+ --add-binary "${relpath}oojsc.xbm:." --add-binary "${relpath}OoJSC.ico:." \
+ --add-binary "${relpath}OoJSC256x256.png:." &&
+tarname="$tarbase-onefile.tgz"
+tar -C "$builddir/dist" --numeric-owner --dereference \
+ -cpzf "$tardir/$tarname" . || q "$failed $step"
+mv  dist/$basename $basedir &&
+echo "
+Finished $step.
+
+To test the executable run:
+
+./$basename
+
+A tarball is at '$tardir/$tarname'.
+
+" || q "$step"
+}
+
+#Arg 1 chooses action. clean or dist.
+case "$1" in
+    clean) cleaner ;; # remove entire build directory
+    dist) cleaner && setupvars && prep && onefile ;;
+    *) q "Setup: Invalid arg 1: [clean|dist]" ;;
+esac
+
+#end