Add dmg tool for compressing DMG images

Author: ProjectSynchro

CHANGELOG.md

@@ -8,10 +8,14 @@
 - `naev-steamruntime` (Used for linux steam builds in the steamruntime (soldier) environment)
 - `naev-windows` (Used to cross compile for Windows.)
 
+### v1.5.11
+Update OpenBLAS to 0.3.20 for `naev-windows`
+Add `dmg` tool for compressing DMGs for `naev-macos`
+
 ### v1.5.10
-Fix osxcross-macports script file validation
-Remove binutils from macports package list (not used or needed)
-Add luajit from macports (is actively maintained.)
+Fix osxcross-macports script file validation for `naev-macos`
+Remove binutils from macports package list (not used or needed) for `naev-macos`
+Add luajit from macports (is actively maintained.) for `naev-macos`
 
 ### v1.5.9
 Update EndPoint repository URL for `naev-linux-lts`

naev-macos/Dockerfile.aarch64

@@ -3,7 +3,7 @@ FROM registry.fedoraproject.org/fedora-minimal:latest AS build
 
 # Install Build dependencies and utilities.
 RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install bzip2 clang cmake git file findutils patch python3 \
-    openssl openssl-devel xz-devel libxml2-devel llvm-devel uuid-devel unzip tar xz && \
+    openssl openssl-devel xz-devel libxml2-devel llvm-devel uuid-devel unzip tar xz zlib-devel && \
     microdnf clean all && \
 # Verify tool / language versions versions.
     echo "Verifying clang install" && \
@@ -16,6 +16,14 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install bzip2 clang cmake
     command -v python3 && \
     python3 --version
 
+# Git clone libdmg-hfsplus repo
+WORKDIR /usr/local/src
+RUN git clone https://github.com/fanquake/libdmg-hfsplus.git
+WORKDIR /usr/local/src/libdmg-hfsplus
+RUN mkdir build && cd build && \
+    cmake .. && \
+    make && make install
+
 # Git clone osxcross repo
 WORKDIR /usr/local/src
 RUN git clone https://github.com/tpoechtrager/osxcross.git
@@ -50,6 +58,7 @@ FROM registry.fedoraproject.org/fedora-minimal:latest
 
 WORKDIR /
 COPY --from=build /usr/lib/osxcross /usr/lib/osxcross 
+COPY --from=build /usr/local/bin/dmg /usr/bin
 
 LABEL org.opencontainers.image.authors "Naev Dev Team"
 LABEL org.opencontainers.image.source "https://github.com/naev/naev-infrastructure"
@@ -74,12 +83,13 @@ ENV HOST "aarch64-apple-darwin20.1"
 ENV APPIMAGE_EXTRACT_AND_RUN 1
 
 # Install build tools.
-RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage git llvm meson ninja-build python3-pyyaml unzip tar xz zip && \
+RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage git llvm meson ninja-build python3-pyyaml unzip tar xz zlib zip && \
     microdnf clean all && \
 # Verify tool version.
     echo "Verifying meson install" && \
     command -v meson && \
     meson --version && \
+    command -v dmg && \
 # Horrible hack: ensure a hardcoded header file path resolves.  
     rmdir /opt && ln -s /usr/lib/osxcross/macports/pkgs/opt /opt && \
 # Set WORKDIR when you spin up the image.

naev-macos/Dockerfile.amd64

@@ -3,7 +3,7 @@ FROM registry.fedoraproject.org/fedora-minimal:latest AS build
 
 # Install Build dependencies and utilities.
 RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install bzip2 clang cmake git file findutils patch python3 \
-    openssl openssl-devel xz-devel libxml2-devel llvm-devel uuid-devel unzip tar xz && \
+    openssl openssl-devel xz-devel libxml2-devel llvm-devel uuid-devel unzip tar xz zlib-devel && \
     microdnf clean all && \
 # Verify tool / language versions versions.
     echo "Verifying clang install" && \
@@ -16,6 +16,14 @@ RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install bzip2 clang cmake
     command -v python3 && \
     python3 --version
 
+# Git clone libdmg-hfsplus repo
+WORKDIR /usr/local/src
+RUN git clone https://github.com/fanquake/libdmg-hfsplus.git
+WORKDIR /usr/local/src/libdmg-hfsplus
+RUN mkdir build && cd build && \
+    cmake .. && \
+    make && make install
+
 # Git clone osxcross repo
 WORKDIR /usr/local/src
 RUN git clone https://github.com/tpoechtrager/osxcross.git
@@ -49,6 +57,7 @@ FROM registry.fedoraproject.org/fedora-minimal:latest
 
 WORKDIR /
 COPY --from=build /usr/lib/osxcross /usr/lib/osxcross 
+COPY --from=build /usr/local/bin/dmg /usr/bin
 
 LABEL org.opencontainers.image.authors "Naev Dev Team"
 LABEL org.opencontainers.image.source "https://github.com/naev/naev-infrastructure"
@@ -73,12 +82,14 @@ ENV HOST "x86_64-apple-darwin17"
 ENV APPIMAGE_EXTRACT_AND_RUN 1
 
 # Install build tools.
-RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage git llvm meson ninja-build python3-pyyaml unzip tar xz zip && \
+RUN microdnf --nodocs --setopt=install_weak_deps=0 -y install clang cmake gettext genisoimage git llvm meson ninja-build python3-pyyaml unzip tar xz zlib zip && \
     microdnf clean all && \
 # Verify tool version.
     echo "Verifying meson install" && \
     command -v meson && \
     meson --version && \
+    echo "Verifying dmg install" && \
+    command -v dmg && \
 # Horrible hack: ensure a hardcoded header file path resolves.  
     rmdir /opt && ln -s /usr/lib/osxcross/macports/pkgs/opt /opt && \
 # Set WORKDIR when you spin up the image.