Merge pull request #6 from bweir/master

Added Mac target

Author: bweir

.gitignore

@@ -8,9 +8,16 @@ propelleride.exe
 openspin.exe
 p1load.exe
 
+propelleride.app
+openspin.app
+p1load.app
+
 staging/
 *.swp
 *.pro.user
 *~
 Makefile
 *.binary
+
+.DS_Store
+.qmake.stash

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "src/openspin/OpenSpin"]
-	path = src/openspin/OpenSpin
+	path = src/openspin/repo
 	url = https://github.com/bweir/OpenSpin

README.md

@@ -101,7 +101,19 @@ PropellerIDE has been built on Windows 7 and 8.
 
 ### OS X
 
-*Not yet available.*
+Install XCode through the App Store, then install the command-line tools through the terminal.
+
+```
+xcode-select --install
+```
+
+Type `make mac` to create an app bundle and DMG package for distribution.
+
+```
+make mac
+```
+
+The Qt version used must match the XCode version. The easiest solution is to use the latest version of xcode and Qt.
 
 ## Credits
 

dist/Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>PropellerIDE</string>
+	<key>CFBundleExecutable</key>
+	<string>PropellerIDE</string>
+	<key>CFBundleIconFile</key>
+	<string>propelleride.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.parallax.PropellerIDE</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>PropellerIDE</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.20</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.developer-tools</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.7</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2014, Parallax Inc. PropellerIDE is released under the GPLv3 license.</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSSupportsSuddenTermination</key>
+	<string>YES</string>
+</dict>
+</plist>

dist/dmg.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+source="$1"
+title="$2"
+target="$3"
+size=$(echo "$((`du -s ${source} | awk '{print $1}'`+1000))")
+echo ${size}
+
+tmpdevice="$(dirname ${source})/pack.temp.dmg"
+
+hdiutil create -srcfolder "${source}" -volname "${title}" -fs HFS+ \
+      -fsargs "-c c=64,a=16,e=16" -format UDRW -size ${size}k ${tmpdevice}
+
+device=$(hdiutil attach -readwrite -noverify -noautoopen "${tmpdevice}" | \
+         egrep '^/dev/' | sed 1q | awk '{print $1}')
+
+background="newspin.png"
+applicationName="PropellerIDE.app"
+
+VOLUME_DIR="/Volumes/${title}/.background/"
+mkdir "${VOLUME_DIR}"
+cp -f dist/${background} "${VOLUME_DIR}"
+
+echo '
+   tell application "Finder"
+     tell disk "'${title}'"
+           open
+           set current view of container window to icon view
+           set toolbar visible of container window to false
+           set statusbar visible of container window to false
+           set the bounds of container window to {400, 100, 900, 434}
+           set theViewOptions to the icon view options of container window
+           set arrangement of theViewOptions to not arranged
+           set icon size of theViewOptions to 72
+           set background picture of theViewOptions to file ".background:'${background}'"
+           make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"}
+           set position of item "'${applicationName}'" of container window to {105, 180}
+           set position of item "Applications" of container window to {395, 180}
+           update without registering applications
+           delay 5
+           close
+     end tell
+   end tell
+' | osascript
+
+chmod -Rf go-w /Volumes/"${title}"
+sync
+sync
+hdiutil detach "${device}"
+hdiutil convert "${tmpdevice}" -format UDZO -imagekey zlib-level=9 -o "${target}"
+rm -f "${tmpdevice}"

dist/ftp.py

@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+import ftplib
+import os, sys
+import getpass, platform
+
+filename = sys.argv[1]
+
+print "Enter host:"
+host = raw_input()
+print "Enter user name:"
+username = raw_input()
+print "Enter password:"
+passwd = getpass.getpass()
+
+ftp = ftplib.FTP(host)
+ftp.login(username,passwd)
+ftp.cwd("/public_html/downloads/"+platform.system())
+
+command = 'STOR ' + filename
+ftp.storbinary(command, open(filename, "rb"), 1024)

dist/installer.iss

@@ -4,15 +4,8 @@
 #define MyAppName "PropellerIDE"
 #define MyAppURL "www.parallax.com"
 #define MyAppExeName "propelleride.exe"
-#define MyAppBin "{app}"
-#define MyPath ".."
 ;#define FtdiChipApp "CDM v2.12.00 WHQL Certified.exe"
 
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; ---- IMPORTANT!!! ---- Set this to your QtPath
-; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-#define QtPath "C:\Qt\5.3\mingw482_32"
-
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
 ; Do not use the same AppId value in installers for other applications.
@@ -26,7 +19,7 @@ AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
-OutputDir="."
+OutputDir="../staging/"
 OutputBaseFilename=propelleride-{#MyAppVersion}-win-setup
 Compression=lzma/Max
 SolidCompression=true
@@ -36,7 +29,7 @@ UsePreviousUserInfo=no
 DisableDirPage=yes
 DisableProgramGroupPage=yes
 DisableReadyPage=no
-WizardImageFile="{#MyPath}\gfx\propellerbanner.bmp"
+WizardImageFile="..\gfx\propellerbanner.bmp"
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -47,19 +40,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: FtdiChip; Description: "Install FTDI Chip USB Serial Port Drivers"; Flags: checkedonce; 
 
 [Files]
-Source: "{#MyPath}\src\propelleride\propelleride.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyPath}\src\p1load\p1load.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyPath}\src\OpenSpin\openspin.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyPath}\gfx\propellerhat.ico"; DestDir: "{app}"; Flags: ignoreversion
-Source: "{#MyPath}\doc"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#MyPath}\library"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "{#MyPath}\src\prebuilt\win32\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-
-Source: "{#QtPath}\bin\Qt5Core.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
-Source: "{#QtPath}\bin\Qt5Gui.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
-Source: "{#QtPath}\bin\Qt5Widgets.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
-Source: "{#QtPath}\bin\Qt5PrintSupport.dll"; DestDir: "{#MyAppBin}"; Flags: ignoreversion
-Source: "{#QtPath}\plugins\platforms\qwindows.dll"; DestDir: "{#MyAppBin}\platforms"; Flags: ignoreversion
+Source: "../staging/propelleride/*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 
 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" ; IconFilename: "{app}\propellerhat.ico";

dist/newspin.png

@@ -6,7 +6,6 @@ DIR_BUILD		:=	$(DIR)/build
 
 DIR_STAGING		:=	$(DIR)/staging
 DIR_OUT			:=	$(DIR_STAGING)
-deb: DIR_OUT	:=	$(DIR_STAGING)/usr
 
 DIR_DIST		:=	$(DIR)/dist
 
@@ -62,13 +61,26 @@ clean_staging:
 clean: clean_staging
 	cd $(DIR_SRC); $(QMAKE); $(MAKE) clean
 
+deb: DIR_OUT := $(DIR_STAGING)/propelleride/usr
 deb: clean_staging copy
-	mkdir -p $(DIR_STAGING)/DEBIAN/ ; \
-	cp -f $(DIR_DIST)/control $(DIR_STAGING)/DEBIAN/control ; \
+	mkdir -p $(DIR_STAGING)/propelleride/DEBIAN/ ; \
+	cp -f $(DIR_DIST)/control $(DIR_STAGING)/propelleride/DEBIAN/control ; \
 	sed -e "s/VERSION/$(VERSION)/" \
 		-e "s/CPU/$(CPU)/" \
-		-i $(DIR_STAGING)/DEBIAN/control ; \
-	dpkg-deb -b $(DIR_STAGING) $(DIR_DIST)/propelleride-$(VERSION)-$(CPU).deb
+		-i $(DIR_STAGING)/propelleride/DEBIAN/control ; \
+	dpkg-deb -b $(DIR_STAGING)/propelleride $(DIR_STAGING)/propelleride-$(VERSION)-$(CPU).deb
 
-win: build
+
+win: DIR_OUT := "$(DIR_STAGING)/propelleride"
+win: clean_staging copy
+	cd $(DIR_OUT); \
+	windeployqt propelleride.exe; \
 	$(ISCC) //dMyAppVersion=$(VERSION) "$(DIR_DIST)/installer.iss"
+
+
+mac: DIR_OUT := "$(DIR_STAGING)/PropellerIDE.app/Contents"
+mac: clean_staging copy
+	cd $(DIR_STAGING) ; \
+	macdeployqt $(DIR_STAGING)/PropellerIDE.app ; \
+	cp -f $(DIR_DIST)/Info.plist $(DIR_OUT)
+	$(DIR_DIST)/dmg.sh $(DIR_STAGING)/PropellerIDE.app PropellerIDE $(DIR_STAGING)/propelleride-$(VERSION)-$(CPU).dmg