From 3c059ffe361e76274caf535de42c180a270502af Mon Sep 17 00:00:00 2001 From: Mark Kim Date: Mon, 11 Jan 2021 18:16:22 -0500 Subject: [PATCH] Move custom/macos* files to macos/* Move all macOS build scripts and resources into the same directory instead of just having the scripts in one directory and the resources in another. --- Makefile | 4 ++-- custom/README.txt | 5 +---- custom/macos.sh => macos/build-app.sh | 0 custom/macos-mkdmg.sh => macos/build-dmg.sh | 0 4 files changed, 3 insertions(+), 6 deletions(-) rename custom/macos.sh => macos/build-app.sh (100%) rename custom/macos-mkdmg.sh => macos/build-dmg.sh (100%) diff --git a/Makefile b/Makefile index ce16808a2..4883ae54d 100644 --- a/Makefile +++ b/Makefile @@ -1033,14 +1033,14 @@ install-macbundle: @install -m 644 macos/PkgInfo $(BUNDLE)/Contents @install -m 644 macos/Info.plist $(BUNDLE)/Contents @install -m 644 macos/tuxpaint.icns $(BUNDLE)/Contents/Resources - @custom/macos.sh + @macos/build-app.sh # Create DMG for macOS TuxPaint.dmg: @echo @echo "...Creating DMG Distribution File..." - @custom/macos-mkdmg.sh + @macos/build-dmg.sh # Build the program! diff --git a/custom/README.txt b/custom/README.txt index 0c80fd7e6..8364bfaf9 100755 --- a/custom/README.txt +++ b/custom/README.txt @@ -2,8 +2,5 @@ Tux Paint Customization This folder allows for customization of Tux Paint. One example is adding resources such as fonts, stamps, starters... -On Mac OS X, at the very end of the build, macos.sh script in this folder is run. +On Windows, the win32.bat in this folder has to be run manually. At some point, a calling to the script could be integrated in the build process so as to be run automatically. -On Windows, the win32.bat in this folder has to be run manually. At some point, a calling to the script could be integrated in the build process so as to be run automatically, just like it is on Mac OS X (see above). - -On Linux, it should be straightforward to replicate the process describe above on Mac OS X, and automatically call a linux.sh script, in this folder, from the build process. diff --git a/custom/macos.sh b/macos/build-app.sh similarity index 100% rename from custom/macos.sh rename to macos/build-app.sh diff --git a/custom/macos-mkdmg.sh b/macos/build-dmg.sh similarity index 100% rename from custom/macos-mkdmg.sh rename to macos/build-dmg.sh