Commit 58167a14 authored by sumpfralle's avatar sumpfralle

disable multiprocessing for frozen Windows executable

fixed minor packaging stuff

git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@1046 bbaffbd6-741e-11dd-a85d-61de82d9cad9
parent c57aa102
...@@ -39,7 +39,7 @@ try: ...@@ -39,7 +39,7 @@ try:
except OSError: except OSError:
START_MENU_BASEDIR = get_special_folder_path("CSIDL_PROGRAMS") START_MENU_BASEDIR = get_special_folder_path("CSIDL_PROGRAMS")
except NameError: except NameError:
START_MENU_BASEDIR = "HELO" START_MENU_BASEDIR = "C:\\"
START_MENU_SUBDIR = os.path.join(START_MENU_BASEDIR, "PyCAM") START_MENU_SUBDIR = os.path.join(START_MENU_BASEDIR, "PyCAM")
# create a start menu item for pycam # create a start menu item for pycam
...@@ -56,7 +56,7 @@ ICON_FILE = os.path.join(SHARE_DIR, "pycam.ico") ...@@ -56,7 +56,7 @@ ICON_FILE = os.path.join(SHARE_DIR, "pycam.ico")
# add some more doc files # add some more doc files
DOC_FILES = [("LICENSE.TXT", "License"),] DOC_FILES = [("LICENSE.TXT", "License"),]
WEB_LINKS = [ WEB_LINKS = [
(r"http://sourceforge.net/projects/pycam/", "Project's Website"), (r"http://pycam.sourceforge.net/", "Project's Website"),
(r"http://sourceforge.net/tracker/?group_id=237831&atid=1104176", "Report a Bug"), (r"http://sourceforge.net/tracker/?group_id=237831&atid=1104176", "Report a Bug"),
(r"http://sourceforge.net/projects/pycam/forums", "Forum Discussions"), (r"http://sourceforge.net/projects/pycam/forums", "Forum Discussions"),
(r"http://sourceforge.net/apps/mediawiki/pycam/index.php?title=User_Manual", "User Manual")] (r"http://sourceforge.net/apps/mediawiki/pycam/index.php?title=User_Manual", "User Manual")]
......
# keysyms does not seem to be recognized by pyinstaller # keysyms does not seem to be recognized by pyinstaller
# There will be exceptions after any keypress without this line. # There will be exceptions after any keypress without this line.
hiddenimports = ["gtk.keysyms"] hiddenimports = ["gtk.keysyms", "decimal", "uuid", "ConfigParser", "subprocess", "platform", "webbrowser", "OpenGL.GLUT"]
...@@ -146,7 +146,8 @@ for file_list in (data, a.datas): ...@@ -146,7 +146,8 @@ for file_list in (data, a.datas):
file_list.append(fentry) file_list.append(fentry)
exe = EXE(pyz, data, exe = EXE(pyz,
data,
a.scripts, a.scripts,
a.binaries, a.binaries,
a.zipfiles, a.zipfiles,
......
...@@ -83,6 +83,9 @@ def is_pool_available(): ...@@ -83,6 +83,9 @@ def is_pool_available():
return not __manager is None return not __manager is None
def is_multiprocessing_available(): def is_multiprocessing_available():
if (pycam.Utils.get_platform() == pycam.Utils.PLATFORM_WINDOWS) and \
hasattr(sys, "frozen") and sys.frozen:
return False
try: try:
import multiprocessing import multiprocessing
return True return True
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment