notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Automatically update macOS build version at build time.

Browse source
This commit is contained in:
Mark Kim 2022-09-10 09:16:10 -04:00
parent 6e21c4fab1
commit dd3009408f
8 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -13,6 +13,7 @@ TuxPaint.dmg
*.dylib *.dylib
*.dSYM *.dSYM
.DS_Store .DS_Store
Info.plist
*.thumbs *.thumbs
*.swp *.swp
*.swo *.swo

16
Makefile
View file

@ -1113,6 +1113,7 @@ install-macbundle:
@install -d -m 755 $(BUNDLE)/Contents/lib @install -d -m 755 $(BUNDLE)/Contents/lib
@install -m 755 tuxpaint $(BUNDLE)/Contents/MacOS @install -m 755 tuxpaint $(BUNDLE)/Contents/MacOS
@install -m 644 macos/PkgInfo $(BUNDLE)/Contents @install -m 644 macos/PkgInfo $(BUNDLE)/Contents
@VER_VERSION=$(VER_VERSION) macos/template.sh macos/Info.plist.shdoc > macos/Info.plist
@install -m 644 macos/Info.plist $(BUNDLE)/Contents @install -m 644 macos/Info.plist $(BUNDLE)/Contents
@install -m 644 macos/tuxpaint.icns $(BUNDLE)/Contents/Resources @install -m 644 macos/tuxpaint.icns $(BUNDLE)/Contents/Resources
@macos/build-app.sh @macos/build-app.sh
@ -1122,13 +1123,14 @@ install-macbundle:
install-iosbundle: install-iosbundle:
@echo @echo
@echo "...Installing iOS App Bundle Support Files..." @echo "...Installing iOS App Bundle Support Files..."
install -m 755 tuxpaint $(BUNDLE) @install -m 755 tuxpaint $(BUNDLE)
install -m 644 ios/PkgInfo $(BUNDLE) @install -m 644 ios/PkgInfo $(BUNDLE)
install -m 644 ios/Info.plist $(BUNDLE) @VER_VERSION=$(VER_VERSION) ios/template.sh ios/Info.plist.shdoc > ios/Info.plist
install -m 644 ios/tuxpaint.icns $(BUNDLE) @install -m 644 ios/Info.plist $(BUNDLE)
install -m 644 ios/tuxpaint.cfg $(BUNDLE) @install -m 644 ios/tuxpaint.icns $(BUNDLE)
install -m 644 ios/Splash.png $(BUNDLE) @install -m 644 ios/tuxpaint.cfg $(BUNDLE)
ibtool --compile $(BUNDLE)/Splash.storyboardc ios/Splash.storyboard @install -m 644 ios/Splash.png $(BUNDLE)
@ibtool --compile $(BUNDLE)/Splash.storyboardc ios/Splash.storyboard
# Create DMG for macOS # Create DMG for macOS

3
docs/CHANGES.txt
View file

@ -72,6 +72,9 @@ http://www.tuxpaint.org/
(also corrects some warnings being reported by libpng (via SDL_image); (also corrects some warnings being reported by libpng (via SDL_image);
h/t Tim Dickson, closes https://sourceforge.net/p/tuxpaint/bugs/252/) h/t Tim Dickson, closes https://sourceforge.net/p/tuxpaint/bugs/252/)
* Automatically update macOS build version from the command line at build
time.
* Ports & Building: * Ports & Building:
----------------- -----------------
* Change name of Tux Paint config. files from ".conf" to ".cfg" * Change name of Tux Paint config. files from ".conf" to ".cfg"

1
docs/RELEASE.txt
View file

@ -25,7 +25,6 @@ a .tar.gz source tarball, and making the tarball available for download.
* Build description files: * Build description files:
* tuxpaint.spec (Linux RPM package) * tuxpaint.spec (Linux RPM package)
* macos/Info.plist (macOS build)
* win32/resources.rc (Windows mingw/msys build) * win32/resources.rc (Windows mingw/msys build)
* Changelog * Changelog

6
ios/Info.plist → ios/Info.plist.shdoc
View file

@ -7,7 +7,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>tuxpaint</string> <string>tuxpaint</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>0.9.26, Copyright 2009-2020, Tux Paint Development Team</string> <string>${VER_VERSION}, Copyright 2002-$(date +%Y), Tux Paint Development Team</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>tuxpaint.icns</string> <string>tuxpaint.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
@ -19,11 +19,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.9.26</string> <string>${VER_VERSION}</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>TXPT</string> <string>TXPT</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2020-12-27</string> <string>$(date +%Y-%m-%d)</string>
<key>UISupportedInterfaceOrientations</key> <key>UISupportedInterfaceOrientations</key>
<array> <array>
<string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeLeft</string>

1
ios/template.sh Symbolic link
View file

@ -0,0 +1 @@
../macos/template.sh

6
macos/Info.plist → macos/Info.plist.shdoc
View file

@ -7,7 +7,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>tuxpaint</string> <string>tuxpaint</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>0.9.29, Copyright 2002-2022, Tux Paint Development Team</string> <string>${VER_VERSION}, Copyright 2002-$(date +%Y), Tux Paint Development Team</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>tuxpaint.icns</string> <string>tuxpaint.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
@ -19,10 +19,10 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.9.29</string> <string>${VER_VERSION}</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>TXPT</string> <string>TXPT</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2022-06-14</string> <string>$(date +%Y-%m-%d)</string>
</dict> </dict>
</plist> </plist>

13
macos/template.sh Executable file
View file

@ -0,0 +1,13 @@
#!/bin/bash
#
# Process a document containing shell escape sequences.
#
# Usage: template.sh document.shdoc
#
bash <<<"cat <<__SHDOC_TEMPLATE__$$
$(cat "$@")
__SHDOC_TEMPLATE__$$"
# vim:ft=bash