diff --git a/.gitignore b/.gitignore index d49abf5..c948f29 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ var/ *.egg .eggs/ .python-version +dmg/ # PyInstaller # Usually these files are written by a python script from a template diff --git a/PreparingADisti.txt b/PreparingADisti.txt index 8d8c1c8..eb150e2 100644 --- a/PreparingADisti.txt +++ b/PreparingADisti.txt @@ -109,7 +109,7 @@ If you want to increment any part of the version number, you can do so by Creating a Mac app contained in a DMG ------------------------------------- -Assuming you're in Terminal and currently in the `[YourWhateverFolderPath]\Roastero\Openroast` folder, you can create an app build by typing `./build_mac.sh -n -m` and pressing Enter. A disk image (DMG) containing the app will be created in the folder `[YourWhateverFolderPath]/Roastero/Openroast/dist`. You'll want to test this app on a separate Mac machine to verify functionality. +Assuming you're in Terminal and currently in the `[YourWhateverFolderPath]\Roastero\Openroast` folder, you can create an app build by typing `./build_mac.sh -n -m` and pressing Enter. A disk image (DMG) containing the app will be created in the folder `[YourWhateverFolderPath]/Roastero/Openroast/dmg`. You'll want to test this app on a separate Mac machine to verify functionality. Posting the installer on Github ------------------------------- diff --git a/build_mac.sh b/build_mac.sh index bbf89e6..cf85587 100755 --- a/build_mac.sh +++ b/build_mac.sh @@ -211,7 +211,7 @@ fi if "${make_install}" ; then echo "make_install - creating Openroast app..." # remove old stuff - rm -rf build dist + rm -rf build dist dmg # get version string version_file=($(setup_py2app_"${version_string}".py # build! - echo "Laucnhing py2app..." + echo "Launching py2app..." python setup_py2app_"${version_string}".py py2app rm setup_py2app_"${version_string}".py # now, for some serious manually-powered stripping of unecessary files @@ -287,15 +287,22 @@ if "${make_install}" ; then # Create DMG for distribution echo "Creating DMG..." + rm -rf dmg + mkdir dmg + # copy other required files to dist... + cp build_tools/CH34x_Install_V1.4.pkg dist/ + cp 'build_tools/Openroast 1.2 for Mac README.rtf' dist/ ./build_tools/create-dmg/create-dmg \ +--background 'build_tools/mac_dmg_background.png' \ --window-pos 100 100 \ ---window-size 400 200 \ +--window-size 400 400 \ --icon-size 100 \ ---icon 'Openroast '"${version_string}"'.app' 100 100 \ ---app-drop-link 300 100 \ -'./dist/Openroast '"${version_string}"' Installer.dmg' \ +--icon 'Openroast '"${version_string}"'.app' 100 300 \ +--icon 'CH34x_Install_V1.4.pkg' 300 100 \ +--icon 'Openroast 1.2 for Mac README.rtf' 100 100 \ +--app-drop-link 300 300 \ +'./dmg/Openroast '"${version_string}"' Mac OS X Installer.dmg' \ dist \ / - rm -rf 'dist/Openroast '"${version_string}"'.app' echo "make_install done." fi \ No newline at end of file diff --git a/build_tools/CH34x_Install_V1.4.pkg b/build_tools/CH34x_Install_V1.4.pkg new file mode 100755 index 0000000..63fdf19 Binary files /dev/null and b/build_tools/CH34x_Install_V1.4.pkg differ diff --git a/build_tools/Openroast 1.2 for Mac README.rtf b/build_tools/Openroast 1.2 for Mac README.rtf new file mode 100644 index 0000000..2c985eb --- /dev/null +++ b/build_tools/Openroast 1.2 for Mac README.rtf @@ -0,0 +1,22 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1348\cocoasubrtf170 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\margl1440\margr1440\vieww10800\viewh8400\viewkind0 +\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural + +\f0\b\fs36 \cf0 Openroast 1.2 for Mac README +\b0\fs24 \ +March 26, 2017\ +\ +Is it assumed that you are reading this because you have downloaded and mounted the Disk Image (DMG) file.\ +\ + +\b\fs28 Installation Instructions\ + +\b0 1. Drag the Openroast 1.2 icon over to the Applications shortcut. This installs the app.\ +2. Click the file named CH34x_Install_V1.4. This is the driver for the Freshroast SR700\'92s USB chip. You must install this in order to enable Openroast 1.2 to connect to the device. \ +\ + +\b Appendix - Details about the USB driver\ + +\b0 Specifically, the Freshroast SR700 device uses a QinHeng CH340 USB to serial port integrated circuit. We have included version 1.4 of this driver as a courtesy - it is current as of the date of this writing. It was obtained from {\field{\*\fldinst{HYPERLINK "http://www.wch.cn/download/CH341SER_MAC_ZIP.html"}}{\fldrslt http://www.wch.cn/download/CH341SER_MAC_ZIP.html}}. There may be newer versions of the driver available in the future. Please search the web for \'91QinHeng CH340\'92 to find a compatible driver in the future, if necessary.} \ No newline at end of file diff --git a/build_tools/mac_dmg_background.png b/build_tools/mac_dmg_background.png new file mode 100755 index 0000000..76523a9 Binary files /dev/null and b/build_tools/mac_dmg_background.png differ