pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:daid/Cura

Browse source
This commit is contained in:
daid303 2012-12-17 14:15:50 +01:00
commit 26e85f4ee6
3 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cura/gui/app.py
View file

@ -10,7 +10,6 @@ import warnings
#Only import the _core to save import time
import wx._core
from Cura.gui import splashScreen
from Cura.util import profile
class CuraApp(wx.App):
@ -27,6 +26,7 @@ class CuraApp(wx.App):
#Do not show a splashscreen on OSX, as by Apple guidelines
self.afterSplashCallback()
else:
from Cura.gui import splashScreen
self.splash = splashScreen.splashScreen(self.afterSplashCallback)
def MacOpenFile(self, path):

42
package.sh
View file

@ -66,6 +66,25 @@ if [ "$BUILD_TARGET" = "all" ]; then
exit
fi
# Change working directory to the directory the script is in
# http://stackoverflow.com/a/246128
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $SCRIPT_DIR
checkTool git "git: http://git-scm.com/"
checkTool curl "curl: http://curl.haxx.se/"
if [ $BUILD_TARGET = "win32" ]; then
#Check if we have 7zip, needed to extract and packup a bunch of packages for windows.
checkTool 7z "7zip: http://www.7-zip.org/"
fi
#For building under MacOS we need gnutar instead of tar
if [ -z `which gnutar` ]; then
TAR=tar
else
TAR=gnutar
fi
#############################
# Darwin
#############################
@ -88,7 +107,9 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
cp -a STLQuickLook.qlgenerator dist/Cura.app/Contents/Library/QuickLook/
# Archive app
$TAR cfp - dist/Cura.app | gzip --best -c > ../../${TARGET_DIR}.tar.gz
cd dist
$TAR cfp - Cura.app | gzip --best -c > ../../../${TARGET_DIR}.tar.gz
cd ..
# Create sparse image for distribution
hdiutil detach /Volumes/Cura\ -\ Ultimaker/
@ -102,28 +123,11 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
exit
fi
#############################
# Rest
#############################
# Change working directory to the directory the script is in
# http://stackoverflow.com/a/246128
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $SCRIPT_DIR
checkTool git "git: http://git-scm.com/"
checkTool curl "curl: http://curl.haxx.se/"
if [ $BUILD_TARGET = "win32" ]; then
#Check if we have 7zip, needed to extract and packup a bunch of packages for windows.
checkTool 7z "7zip: http://www.7-zip.org/"
fi
#For building under MacOS we need gnutar instead of tar
if [ -z `which gnutar` ]; then
TAR=tar
else
TAR=gnutar
fi
#############################
# Download all needed files.
#############################

6
setup.py
View file

@ -18,19 +18,19 @@ if sys.platform.startswith('darwin'):
{
u'CFBundleTypeRole': u'Viewer',
u'LSItemContentTypes': [u'com.pleasantsoftware.uti.stl'],
u'LSHandlerRank': u'Alternate',
u'LSHandlerRank': u'Owner',
},
{
u'CFBundleTypeRole': u'Viewer',
u'LSItemContentTypes': [u'org.khronos.collada.digital-asset-exchange'],
u'LSHandlerRank': u'Alternate'
u'LSHandlerRank': u'Owner'
},
{
u'CFBundleTypeName': u'Wavefront 3D Object',
u'CFBundleTypeExtensions': [u'obj'],
u'CFBundleTypeMIMETypes': [u'application/obj-3d'],
u'CFBundleTypeRole': u'Viewer',
u'LSHandlerRank': u'Alternate'
u'LSHandlerRank': u'Owner'
}
],
u'UTImportedTypeDeclarations': [