Skip to content

P
pyMKcam
Commit a4c1edec authored by Paul Bonser's avatar Paul Bonser
Browse files
Options

Merge branch 'master' of ssh://pycam.git.sourceforge.net/gitroot/pycam/pycam

parents 53f9c310 f9625ef3
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
setup.py
View file @ a4c1edec
...@@ -35,8 +35,8 @@ import shutil ...@@ -35,8 +35,8 @@ import shutil
from pycam import VERSION from pycam import VERSION
WINDOWS_START_SCRIPT = "scripts/pycam-loader.py" WINDOWS_START_SCRIPT = os.path.join("scripts", "pycam-loader.py")
DEFAULT_START_SCRIPT = "scripts/pycam" DEFAULT_START_SCRIPT = os.path.join("scripts", "pycam")
# we don't want to include the windows postinstall script in other installers # we don't want to include the windows postinstall script in other installers
is_windows_installer = "bdist_wininst" in sys.argv or "bdist_msi" in sys.argv is_windows_installer = "bdist_wininst" in sys.argv or "bdist_msi" in sys.argv
...@@ -44,7 +44,8 @@ is_windows_installer = "bdist_wininst" in sys.argv or "bdist_msi" in sys.argv ...@@ -44,7 +44,8 @@ is_windows_installer = "bdist_wininst" in sys.argv or "bdist_msi" in sys.argv
if is_windows_installer: if is_windows_installer:
shutil.copy2(os.path.join(BASE_DIR, DEFAULT_START_SCRIPT), shutil.copy2(os.path.join(BASE_DIR, DEFAULT_START_SCRIPT),
os.path.join(BASE_DIR, WINDOWS_START_SCRIPT)) os.path.join(BASE_DIR, WINDOWS_START_SCRIPT))
PLATFORM_SCRIPTS = [WINDOWS_START_SCRIPT, "scripts/pycam_win32_postinstall.py"] PLATFORM_SCRIPTS = [WINDOWS_START_SCRIPT,
os.path.join("scripts", "pycam_win32_postinstall.py")]
else: else:
PLATFORM_SCRIPTS = [DEFAULT_START_SCRIPT] PLATFORM_SCRIPTS = [DEFAULT_START_SCRIPT]
......
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