Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: modern macOS (Sierra+) icon. #702

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function prepare_image() {

function run_tests() {
rm -rf ~/Pharo # clean posssible remaining Pharo files
./pharo PharoLauncher.image test --junit-xml-output "PharoLauncher.*"
./pharo PharoLauncher.image test --junit-xml-output "PharoLauncher.*"
run_shell_cli_tests
}

Expand All @@ -49,9 +49,9 @@ function run_shell_cli_tests() {
function make_pharo_launcher_deloyed() {
./pharo PharoLauncher.image eval --save "PhLDeploymentScript doAll"

# Set the launcher version on Pharo
# Set the launcher version on Pharo
LAUNCHER_VERSION=$(eval 'git describe --tags --always')
./pharo PharoLauncher.image eval --save "PhLAboutCommand version: '$LAUNCHER_VERSION'"
./pharo PharoLauncher.image eval --save "PhLAboutCommand version: '$LAUNCHER_VERSION'"

# Avoid to have PL core dir set to the slave location and having an outdated list of templates
./pharo PharoLauncher.image eval --save \
Expand Down Expand Up @@ -83,7 +83,6 @@ function package_linux_version() {

function copy_mac_icon_files_to() {
cd icons
./build-icns.sh pharo-launcher.png PharoLauncher.iconset
cd ..
cp icons/PharoLauncher.icns $1
cp icons/PharoImage.icns $1
Expand All @@ -105,13 +104,13 @@ function package_mac_version() {
fetch_current_mac_vm_to $(pwd)/$OUTPUT_PATH
cp scripts/pharo-launcher.sh $RESOURCES_PATH/pharo-launcher && chmod +x $RESOURCES_PATH/pharo-launcher
mv $BIN_PATH/pharo.signatures $RESOURCES_PATH/ || true

VERSION=$VERSION_NUMBER APP_NAME=PharoLauncher SHOULD_SIGN=false ./mac/build-dmg.sh
local generated_dmg
generated_dmg=$(echo *.dmg)
mv "$generated_dmg" "PharoLauncher-$VERSION_NUMBER.dmg"
generated_dmg=$(echo *.dmg)
md5 "$generated_dmg" > "$generated_dmg.md5sum"
md5 "$generated_dmg" > "$generated_dmg.md5sum"
}

function set_env() {
Expand Down Expand Up @@ -143,7 +142,7 @@ function fetch_current_vm_to() {
set_arch_path
local LINUX_VM_PATH="pharo-vm-Linux-$VM_ARCH_PATH-stable.zip"
test -f $LINUX_VM_PATH || wget --progress=dot:mega http://files.pharo.org/get-files/$PHARO/$LINUX_VM_PATH

if [ -f "$LINUX_VM_PATH" ] ; then
unzip -q "$LINUX_VM_PATH" -d "$DEST_PATH/tmp"
mkdir "$DEST_PATH/pharo-vm/"
Expand All @@ -154,7 +153,7 @@ function fetch_current_vm_to() {
}

function fetch_current_mac_vm_to() {
# Only works for VM >= 90. If you need a VM < 90, you need to
# Only works for VM >= 90. If you need a VM < 90, you need to
# udpate this method to use either the old or new VM URL format (see zeroconf).
local DEST_PATH=${1:-.} # If no argument given, use current working dir
set_arch_path
Expand Down
Binary file added icons/PharoLauncher.icns
Binary file not shown.
2 changes: 2 additions & 0 deletions icons/README.txt
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
Icons are provided by https://github.com/fabianalexisinostroza/Antu-classic under the LGPL v2 license

The macOS icon is provided by Pouya Kary <[email protected]> under the LGPL v2 license.
27 changes: 0 additions & 27 deletions icons/build-icns.sh

This file was deleted.