From b25ef2dd3965e24484ece2590851324230067ff5 Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Thu, 6 Dec 2012 23:31:57 +0700 Subject: [PATCH 1/8] Ignore build files for Mac OS X. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 35c9d5fc..8c4a076d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ cura.bat object-mirror.png object.png *darwin.dmg +scripts/darwin/dist/* +scripts/darwin/build/* +scripts/darwin/Cura.dmg.sparseimage From fbe29005c764e006027c4258a16d2358728ab209 Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Thu, 6 Dec 2012 23:32:30 +0700 Subject: [PATCH 2/8] Fix STLQuickLook is not copied into Mac OS X bundle. --- package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.sh b/package.sh index 157d3ab0..57726525 100755 --- a/package.sh +++ b/package.sh @@ -85,7 +85,7 @@ if [ "$BUILD_TARGET" = "darwin" ]; then # Install QuickLook plugin mkdir -p dist/Cura.app/Contents/Library/QuickLook - cp STLQuickLook.qlgenerator dist/Cura.app/Contents/Library/QuickLook/ + cp -a STLQuickLook.qlgenerator dist/Cura.app/Contents/Library/QuickLook/ # Archive app $TAR cfp - dist/Cura.app | gzip --best -c > ../../${TARGET_DIR}.tar.gz From 948bbb8d135cbbf56e5e29b388e93bcefe61118f Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Fri, 7 Dec 2012 14:53:23 +0700 Subject: [PATCH 3/8] Upload formula. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f3697995..fe4d6559 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ You'll need non-system, framework-based, universal with min deployment target se **deployment target set to 10.6**: Output of ``otool -l `which python` `` should contain *"cmd LC_VERSION_MIN_MACOSX ... version 10.6"* -The easiest way to install it is via [Homebrew](http://mxcl.github.com/homebrew/): `brew install --fresh osx_python_cura.rb --universal` (TODO: upload the formula). Note you'll need to uninstall Python if you already have it installed via Homebrew. +The easiest way to install it is via [Homebrew](http://mxcl.github.com/homebrew/): `brew install --fresh https://github.com/downloads/GreatFruitOmsk/Cura/python.rb --universal`. Note you'll need to uninstall Python if you already have it installed via Homebrew. ###Virtualenv You may skip this step if you don't bother to use [virtualenv](http://pypi.python.org/pypi/virtualenv). It's not a requirement. From df08ba3ee616662e5fe9b92b37fa27818cace211 Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Fri, 7 Dec 2012 14:54:59 +0700 Subject: [PATCH 4/8] Use Power as pip dependency, not git submodule. --- .gitmodules | 3 --- Cura/util/Power | 1 - requirements.txt | 4 ++++ requirements_darwin.txt | 4 +--- 4 files changed, 5 insertions(+), 7 deletions(-) delete mode 160000 Cura/util/Power create mode 100644 requirements.txt diff --git a/.gitmodules b/.gitmodules index be8ca409..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "Cura/util/Power"] - path = Cura/util/Power - url = git://github.com/GreatFruitOmsk/Power.git diff --git a/Cura/util/Power b/Cura/util/Power deleted file mode 160000 index 9630adf0..00000000 --- a/Cura/util/Power +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9630adf08ee2de90cb3a49af53d85693060ccbff diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..287791f7 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +PyOpenGL>=3.0.2 +numpy>=1.6.2 +pyserial>=2.6 +-e git+git://github.com/GreatFruitOmsk/Power.git#egg=Power diff --git a/requirements_darwin.txt b/requirements_darwin.txt index 9469160f..398bda3e 100644 --- a/requirements_darwin.txt +++ b/requirements_darwin.txt @@ -1,4 +1,2 @@ -PyOpenGL>=3.0.2 -numpy>=1.6.2 -pyserial>=2.6 +-r requirements.txt py2app>=0.7.2 From 59ccbb256c5fb036be662035cb9ff1ee2b9c7781 Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Fri, 7 Dec 2012 15:00:07 +0700 Subject: [PATCH 5/8] Fix typo in requirements. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe4d6559..5ace7af2 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ Following packages are required for packaging Cura into app: py2app>=0.7.2 -The easiest way to install all this packages is to use virtualenv's pip: `pip install requirements_darwin.txt` +The easiest way to install all this packages is to use virtualenv's pip: `pip install -r requirements_darwin.txt` ####PyObjC At time of writing, pyobjc 2.5 is not available at pypi. You have to clone repo and install it manually: From 40e86b2883139bb3de3ca97ae551c1f51483c0c0 Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Fri, 7 Dec 2012 15:29:41 +0700 Subject: [PATCH 6/8] Fix power import. --- Cura/gui/printWindow.py | 2 +- Cura/util/__init__.py | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py index 3a57bb45..e79d5c2e 100644 --- a/Cura/gui/printWindow.py +++ b/Cura/gui/printWindow.py @@ -7,6 +7,7 @@ import subprocess import sys import time import platform +import power import wx from wx.lib import buttons @@ -15,7 +16,6 @@ from Cura.gui.util import webcam from Cura.gui.util import taskbar from Cura.util import machineCom from Cura.util import gcodeInterpreter -from Cura.util import power from Cura.util.resources import getPathForImage printWindowMonitorHandle = None diff --git a/Cura/util/__init__.py b/Cura/util/__init__.py index c343c1b4..bf893c06 100644 --- a/Cura/util/__init__.py +++ b/Cura/util/__init__.py @@ -1,7 +1 @@ -import sys -import os - - -sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'Power')) - -import power +# coding=utf-8 \ No newline at end of file From 17173e7688c7a544678086eb5081051e90b3510b Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Fri, 7 Dec 2012 15:30:30 +0700 Subject: [PATCH 7/8] Make gui.util a package. --- Cura/gui/util/__init__.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 Cura/gui/util/__init__.py diff --git a/Cura/gui/util/__init__.py b/Cura/gui/util/__init__.py new file mode 100644 index 00000000..9bad5790 --- /dev/null +++ b/Cura/gui/util/__init__.py @@ -0,0 +1 @@ +# coding=utf-8 From 449c54d44d179bc27a4b3184f631c6573b4a4718 Mon Sep 17 00:00:00 2001 From: Ilya Kulakov Date: Fri, 7 Dec 2012 15:45:06 +0700 Subject: [PATCH 8/8] Fix darwin setup.py according to new resources structure. --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 4a483010..bde74778 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ if sys.platform.startswith('darwin'): from setuptools import setup APP = ['Cura/cura.py'] - DATA_FILES = ['Cura/images', 'Cura/LICENSE', 'Cura/stl.ico'] + DATA_FILES = ['Cura/LICENSE', 'Cura/resources/images', 'Cura/resources/meshes', 'Cura/resources/example/', 'Cura/resources/firmware/'] PLIST = { u'CFBundleName': u'Cura', u'CFBundleShortVersionString': u'12.11', @@ -51,7 +51,7 @@ if sys.platform.startswith('darwin'): } OPTIONS = { 'argv_emulation': True, - 'iconfile': 'Cura/Cura.icns', + 'iconfile': 'Cura/resources/Cura.icns', 'includes': ['objc', 'Foundation'], 'resources': DATA_FILES, 'optimize': '2',