Modifies the build script to handle Mac OS X

Not tested for Mac OS X but building with subproject gives an error on
windows. To be clarified.

build-package-meson.sh

@@ -1,64 +0,0 @@
-#!/bin/bash
-
-lite_build_pgo () {
-  build="$1"
-  if [[ $build == */* || -z "$build" ]]; then
-    echo "invalid build directory, no path allowed: \"$build\""
-    exit 1
-  fi
-  git ls-files --error-unmatch "$build" &> /dev/null
-  if [ $? == 0 ]; then
-    echo "invalid path, \"$build\" is under revision control"
-    exit 1
-  fi
-  rm -fr "$build"
-  meson setup --buildtype=release -Db_pgo=generate "$build" || exit 1
-  ninja -C "$build" || exit 1
-  cp -r data "$build/src"
-  "$build/src/lite"
-  meson configure -Db_pgo=use "$build"
-  ninja -C "$build" || exit 1
-}
-
-lite_build_package () {
-  build="$1"
-  version="$2"
-  arch="$3"
-  lite_exe=lite
-  strip=strip
-  if [[ "$OSTYPE" == msys || "$OSTYPE" == win32 ]]; then
-    lite_exe=lite.exe
-    strip="strip --strip-all"
-  fi
-  local pdir=".package-build/lite-xl-$version"
-  mkdir -p "$pdir"
-  cp -r data "$pdir"
-  cp "$build/src/$lite_exe" "$pdir"
-  $strip "$pdir/$lite_exe"
-  pushd ".package-build"
-  local package_name
-  if [[ "$OSTYPE" == msys || "$OSTYPE" == win32 ]]; then
-    package_name="lite-xl-$version-$arch.zip"
-    zip "$package_name" -r "lite-xl-$version"
-  else
-    package_name="lite-xl-$version-$arch.tar.gz"
-    tar czf "$package_name" "lite-xl-$version"
-  fi
-  mv "$package_name" ..
-  popd
-  rm -fr ".package-build"
-  echo "created package $package_name"
-}
-
-if [[ -z "$1" || -z "$2" ]]; then
-  echo "usage: $0 <version> <arch>"
-  exit 1
-fi
-
-version="$1"
-arch="$2"
-build_dir=".build-$arch"
-
-lite_build_pgo "$build_dir"
-lite_build_package "$build_dir" "$version" "$arch"
-

build-packages.sh

@@ -0,0 +1,126 @@
+#!/bin/bash
+
+# Check if build directory is ok to be used to build.
+build_dir_is_usable () {
+  local build="$1"
+  if [[ $build == */* || -z "$build" ]]; then
+    echo "invalid build directory, no path allowed: \"$build\""
+    return 1
+  fi
+  git ls-files --error-unmatch "$build" &> /dev/null
+  if [ $? == 0 ]; then
+    echo "invalid path, \"$build\" is under revision control"
+    return 1
+  fi
+}
+
+# Ordinary release build
+lite_build () {
+  local build="$1"
+  build_dir_is_usable "$build" || exit 1
+  rm -fr "$build"
+  meson setup --buildtype=release "$build" || exit 1
+  ninja -C "$build" || exit 1
+}
+
+# Build using Profile Guided Optimizations (PGO)
+lite_build_pgo () {
+  local build="$1"
+  build_dir_is_usable "$build" || exit 1
+  rm -fr "$build"
+  meson setup --buildtype=release -Db_pgo=generate "$build" || exit 1
+  ninja -C "$build" || exit 1
+  cp -r data "$build/src"
+  "$build/src/lite"
+  meson configure -Db_pgo=use "$build"
+  ninja -C "$build" || exit 1
+}
+
+lite_build_package_windows () {
+  build="$1"
+  version="$2"
+  arch="$3"
+  local pdir=".package-build/lite-xl-$version"
+  mkdir -p "$pdir"
+  cp -r data "$pdir"
+  cp "$build/src/lite.exe" "$pdir"
+  strip --strip-all "$pdir/lite.exe"
+  pushd ".package-build"
+  local package_name="lite-xl-$version-$arch.zip"
+  zip "$package_name" -r "lite-xl-$version"
+  mv "$package_name" ..
+  popd
+  rm -fr ".package-build"
+  echo "created package $package_name"
+}
+
+lite_build_package_macosx () {
+  build="$1"
+  version="$2"
+  arch="$3"
+  local pdir=".package-build/lite-xl.app/Contents/MacOS"
+  mkdir -p "$pdir"
+  cp -R data "$pdir"
+  cp "$build/src/lite" "$pdir"
+  strip "$pdir/lite"
+  pushd ".package-build"
+  local package_name="lite-xl-$version-$arch.zip"
+  zip "$package_name" -r "lite-xl.app"
+  mv "$package_name" ..
+  popd
+  rm -fr ".package-build"
+  echo "created package $package_name"
+}
+
+lite_build_package_linux () {
+  build="$1"
+  version="$2"
+  arch="$3"
+  local pdir=".package-build/lite-xl-$version"
+  mkdir -p "$pdir"
+  cp -r data "$pdir"
+  cp "$build/src/lite" "$pdir"
+  strip "$pdir/lite"
+  pushd ".package-build"
+  local package_name="lite-xl-$version-$arch.tar.gz"
+  tar czf "$package_name" "lite-xl-$version"
+  mv "$package_name" ..
+  popd
+  rm -fr ".package-build"
+  echo "created package $package_name"
+}
+
+lite_build_package () {
+  if [[ "$OSTYPE" == msys || "$OSTYPE" == win32 ]]; then
+    lite_build_package_windows "$@"
+  elif [[ "$OSTYPE" == "darwin"* ]]; then
+    lite_build_package_macosx "$@"
+  elif [[ "$OSTYPE" == "linux"* || "$OSTYPE" == "freebsd"* ]]; then
+    lite_build_package_linux "$@"
+  else
+    echo "Unknown OS type \"$OSTYPE\""
+    exit 1
+  fi
+}
+
+if [[ -z "$1" || -z "$2" ]]; then
+  echo "usage: $0 <version> <arch>"
+  exit 1
+fi
+
+if [[ "$1" == "-pgo" ]]; then
+  pgo=true
+  shift
+fi
+
+version="$1"
+arch="$2"
+build_dir=".build-$arch"
+
+if [ -z ${pgo+set} ]; then
+  lite_build "$build_dir"
+else
+  lite_build_pgo "$build_dir"
+fi
+lite_build_package "$build_dir" "$version" "$arch"
+

build_release.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-./build.sh release windows
-./build.sh release
-rm lite.zip 2>/dev/null
-cp winlib/SDL2-2.0.10/x86_64-w64-mingw32/bin/SDL2.dll SDL2.dll
-strip lite
-strip lite.exe
-strip SDL2.dll
-zip lite.zip lite lite.exe SDL2.dll data -r
-