diff --git a/build.sh b/build.sh index c8a0d0ae1..861367203 100755 --- a/build.sh +++ b/build.sh @@ -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 } @@ -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 \ @@ -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 @@ -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() { @@ -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/" @@ -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 diff --git a/icons/PharoLauncher.icns b/icons/PharoLauncher.icns new file mode 100644 index 000000000..82f255451 Binary files /dev/null and b/icons/PharoLauncher.icns differ diff --git a/icons/README.txt b/icons/README.txt index 42b212e11..70d50d73e 100644 --- a/icons/README.txt +++ b/icons/README.txt @@ -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 under the LGPL v2 license. \ No newline at end of file diff --git a/icons/build-icns.sh b/icons/build-icns.sh deleted file mode 100755 index b0f09d56f..000000000 --- a/icons/build-icns.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# $1 is the source PNG file to convert into ICNS -# $2 is the output folder and the ICNS file name -# ex: ./build-icns.sh pharo-launcher.png PharoLauncher.iconset - -if (( $# != 2 )); then - echo "Usage: $0 source-image icns-file-name" - exit 1 -fi -if [ -e "$2" ] ; then - echo "output folder $2 already exists!" - exit 1 -fi - -mkdir $2 -sips -z 16 16 $1 --out $2/icon_16x16.png -sips -z 32 32 $1 --out $2/icon_16x16@2x.png -sips -z 32 32 $1 --out $2/icon_32x32.png -sips -z 64 64 $1 --out $2/icon_32x32@2x.png -sips -z 128 128 $1 --out $2/icon_128x128.png -sips -z 256 256 $1 --out $2/icon_128x128@2x.png -sips -z 256 256 $1 --out $2/icon_256x256.png -sips -z 512 512 $1 --out $2/icon_256x256@2x.png -sips -z 512 512 $1 --out $2/icon_512x512.png -sips -z 1024 1024 $1 --out $2/icon_512x512@2x.png -iconutil --convert icns $2