Merge pull request #281 from GreatFruitOmsk/master

Mac OS X related and general fixes

diff --git a/.gitignore b/.gitignore
index 35c9d5fc4b26f1ac4011c2dea59f7f32c4477053..8c4a076d01d75d36dd3aa275998b3b671916b447 100644 (file)
--- 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

diff --git a/.gitmodules b/.gitmodules
index be8ca409c01af7108e665636111fe5c72059b33b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- 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/gui/printWindow.py b/Cura/gui/printWindow.py
index 3a57bb45833d2b6f7085de9c0ccf2120c29bcf46..e79d5c2e2f89d5b25b75d5a94aaa7218b786111f 100644 (file)
--- 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/gui/util/__init__.py b/Cura/gui/util/__init__.py
new file mode 100644 (file)
index 0000000..9bad579
--- /dev/null
+++ b/Cura/gui/util/__init__.py
@@ -0,0 +1 @@
+# coding=utf-8

diff --git a/Cura/util/Power b/Cura/util/Power
deleted file mode 160000 (submodule)
index 9630adf..0000000
--- a/Cura/util/Power
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9630adf08ee2de90cb3a49af53d85693060ccbff

diff --git a/Cura/util/__init__.py b/Cura/util/__init__.py
index c343c1b470502439620ebc4c07a6d256981483b6..bf893c06456e2c5431689eafeb0ded55ee0a6c18 100644 (file)
--- 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

diff --git a/README.md b/README.md
index f369799510b04bbb9e05ea1b7314ee55a628e9ed..5ace7af20316164c757fa8ec13a1d9ae5f918a0f 100644 (file)
--- 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.
@@ -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:

diff --git a/package.sh b/package.sh
index 157d3ab021f224fab5a1acd7b5e4f4dfd0651b90..57726525be4bf287d8b40d4fafa33746ddc46c06 100755 (executable)
--- 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

diff --git a/requirements.txt b/requirements.txt
new file mode 100644 (file)
index 0000000..287791f
--- /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 9469160fdddda29fc75cedb3a037e7ee9f4f47cd..398bda3e240751e0bfeddecaeba7085602c97f3d 100644 (file)
--- 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

diff --git a/setup.py b/setup.py
index 4a4830107f936092eef6ca64f811ee5e5c039098..bde74778299443c20e5a3dd77778fe821e2d3609 100644 (file)
--- 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',