From 33d8cb0dcc47fe681457fdeb344f929bf315837a Mon Sep 17 00:00:00 2001
From: Cameron White <cameronwhite91@gmail.com>
Date: Tue, 22 Dec 2020 17:25:44 -0500
Subject: [PATCH] Related to 9a4cd491, move the mac installer into the
 'installer' folder along with Windows

---
 .github/workflows/build.yml                 |   4 ++--
 Makefile.am                                 |  10 ----------
 {osx => installer/macos}/Info.plist         |   0
 {osx => installer/macos}/build_installer.sh |   8 ++++----
 {osx => installer/macos}/pinta.icns         | Bin
 5 files changed, 6 insertions(+), 16 deletions(-)
 rename {osx => installer/macos}/Info.plist (100%)
 rename {osx => installer/macos}/build_installer.sh (57%)
 rename {osx => installer/macos}/pinta.icns (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 88be0bb6a7..6f3aeadcde 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,13 +48,13 @@ jobs:
       run: dotnet test Pinta.sln --configuration Release
     - name: Build Installer
       run: |
-        cd osx
+        cd installer/macos
         ./build_installer.sh
     - name: Upload Installer
       uses: actions/upload-artifact@v2
       with:
         name: "Pinta.app.zip"
-        path: osx/Pinta.app.zip
+        path: installer/macos/Pinta.app.zip
         if-no-files-found: error
 
   build-windows:
diff --git a/Makefile.am b/Makefile.am
index cec12f9d31..0cb79acec9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,16 +100,6 @@ releasetar: $(BINFILES)
 releasezip: $(BINFILES)
 	cd $(BINDIR) && zip -r ../$(RELEASE_FILE).zip * -x "*.mdb"
 
-releaseosx: build $(BINFILES)
-	mkdir -p $(MAC_APP_DIR)/Contents/{MacOS,Resources}
-	cp -r $(BINDIR)/locale $(BINFILES) $(DEBUG_FILES) $(BINDIR)/ICSharpCode.SharpZipLib.dll osx/pinta $(MAC_APP_BIN_DIR)
-	chmod +x $(MAC_APP_BIN_DIR)/pinta
-	cp osx/Info.plist $(MAC_APP_DIR)/Contents
-	cp osx/pinta.icns $(MAC_APP_DIR)/Contents/Resources
-	touch $(MAC_APP_DIR)
-	zip -r9uq $(MAC_APP_DIR).zip $(MAC_APP_DIR)
-	rm -rf $(MAC_APP_DIR)
-
 EXTRA_DIST = Pinta Pinta.Core Pinta.Docking Pinta.Effects Pinta.Gui.Widgets Pinta.Resources Pinta.Tools po xdg tests license-mit.txt \
            license-pdn.txt Pinta.sln Pinta.Install.proj pinta.pc.in readme.md intltool-extract.in \
            intltool-merge.in intltool-update.in
diff --git a/osx/Info.plist b/installer/macos/Info.plist
similarity index 100%
rename from osx/Info.plist
rename to installer/macos/Info.plist
diff --git a/osx/build_installer.sh b/installer/macos/build_installer.sh
similarity index 57%
rename from osx/build_installer.sh
rename to installer/macos/build_installer.sh
index a24222892f..4f2819771b 100755
--- a/osx/build_installer.sh
+++ b/installer/macos/build_installer.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 set -x
 
-msbuild ../Pinta.Install.proj -target:CompileTranslations
-dotnet publish ../Pinta.sln --configuration Release -r osx-x64
+msbuild ../../Pinta.Install.proj -target:CompileTranslations
+dotnet publish ../../Pinta.sln --configuration Release -r osx-x64
 
 MAC_APP_DIR=Pinta.app
 MAC_APP_BIN_DIR="${MAC_APP_DIR}/Contents/MacOS/"
-BIN_DIR=../bin/osx-x64/publish
+BIN_DIR=../../bin/osx-x64/publish
 
 mkdir -p ${MAC_APP_DIR}/Contents/{MacOS,Resources}
-cp -r ${BIN_DIR}/ ../bin/locale ${MAC_APP_BIN_DIR}
+cp -r ${BIN_DIR}/ ../../bin/locale ${MAC_APP_BIN_DIR}
 cp Info.plist ${MAC_APP_DIR}/Contents
 cp pinta.icns ${MAC_APP_DIR}/Contents/Resources
 touch ${MAC_APP_DIR}
diff --git a/osx/pinta.icns b/installer/macos/pinta.icns
similarity index 100%
rename from osx/pinta.icns
rename to installer/macos/pinta.icns