Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjen Hiemstra <a.hiemstra@ultimaker.com>2015-05-21 16:12:05 +0300
committerArjen Hiemstra <a.hiemstra@ultimaker.com>2015-05-21 16:13:06 +0300
commit96e0faf937f10b14d7d729639045a68f2c09180f (patch)
treef736f062b20ff666b4f1f31678f6b82d76f4de1a
parent8d6f72f4094ed9a83ee9175f6f5aa3e3f115e04e (diff)
Rename cura.py to cura_app.py to prevent conflicts with "cura" directory
Contributes to Ultimaker/Uranium#41
-rw-r--r--CMakeLists.txt2
-rw-r--r--cura_app.py (renamed from cura.py)0
-rw-r--r--setup.py4
3 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47a054dc25..c13e3e2eea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,4 +58,4 @@ file(GLOB cura_plugins_SRCS plugins/*)
install(DIRECTORY ${cura_plugins_SRCS} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cura)
file(GLOB cura_SRCS src/*)
install(FILES ${cura_SRCS} DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
-install(FILES cura.py DESTINATION ${CMAKE_INSTALL_BINDIR}) \ No newline at end of file
+install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR}) \ No newline at end of file
diff --git a/cura.py b/cura_app.py
index cfe99284b3..cfe99284b3 100644
--- a/cura.py
+++ b/cura_app.py
diff --git a/setup.py b/setup.py
index c7804d1534..cfd59c47d2 100644
--- a/setup.py
+++ b/setup.py
@@ -46,9 +46,9 @@ setup(name="Cura",
author_email="d.braam@ultimaker.com",
url="http://software.ultimaker.com/",
license="GNU AFFERO GENERAL PUBLIC LICENSE (AGPL)",
- scripts=["cura.py"],
+ scripts=["cura_app.py"],
#windows=[{"script": "printer.py", "dest_name": "Cura"}],
- console=[{"script": "cura.py"}],
+ console=[{"script": "cura_app.py"}],
options={"py2exe": {"skip_archive": False, "includes": includes}})
print("Coping Cura plugins.")