|
 |
620cea4 |
diff -up cura-lulzbot-2.6.52/CMakeLists.txt.system cura-lulzbot-2.6.52/CMakeLists.txt
|
|
|
620cea4 |
--- cura-lulzbot-2.6.52/CMakeLists.txt.system 2017-11-21 16:03:56.000000000 -0500
|
|
|
620cea4 |
+++ cura-lulzbot-2.6.52/CMakeLists.txt 2017-12-08 14:46:20.121427398 -0500
|
|
|
620cea4 |
@@ -1,4 +1,4 @@
|
|
|
620cea4 |
-project(cura NONE)
|
|
|
620cea4 |
+project(cura-lulzbot NONE)
|
|
|
620cea4 |
cmake_minimum_required(VERSION 2.8.12)
|
|
|
620cea4 |
|
|
|
620cea4 |
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/
|
|
|
620cea4 |
@@ -34,7 +34,7 @@ if(NOT ${URANIUM_DIR} STREQUAL "")
|
|
|
620cea4 |
endif()
|
|
|
620cea4 |
if(NOT ${URANIUM_SCRIPTS_DIR} STREQUAL "")
|
|
|
620cea4 |
list(APPEND CMAKE_MODULE_PATH ${URANIUM_DIR}/cmake)
|
|
|
620cea4 |
- include(UraniumTranslationTools)
|
|
|
620cea4 |
+ include(LulzbotUraniumTranslationTools)
|
|
|
620cea4 |
# Extract Strings
|
|
|
620cea4 |
add_custom_target(extract-messages ${URANIUM_SCRIPTS_DIR}/extract-messages ${CMAKE_SOURCE_DIR} cura)
|
|
|
620cea4 |
# Build Translations
|
|
|
620cea4 |
@@ -53,13 +53,13 @@ if(NOT PYTHON_SITE_PACKAGES_DIR)
|
|
|
620cea4 |
set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages
|
|
|
620cea4 |
CACHE STRING "Directory to install Python bindings to")
|
|
|
620cea4 |
endif()
|
|
|
620cea4 |
- set(CURA_INSTALL_PLUGINS_PATH lib/cura)
|
|
|
620cea4 |
+ set(CURA_INSTALL_PLUGINS_PATH lib/cura-lulzbot)
|
|
|
620cea4 |
else()
|
|
|
620cea4 |
- set(CURA_INSTALL_PLUGINS_PATH ${CMAKE_INSTALL_LIBDIR}/cura)
|
|
|
620cea4 |
+ set(CURA_INSTALL_PLUGINS_PATH ${CMAKE_INSTALL_LIBDIR}/cura-lulzbot)
|
|
|
620cea4 |
endif()
|
|
|
620cea4 |
|
|
|
620cea4 |
install(DIRECTORY resources
|
|
|
620cea4 |
- DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
|
|
|
620cea4 |
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/cura-lulzbot)
|
|
|
620cea4 |
install(DIRECTORY plugins
|
|
|
620cea4 |
DESTINATION ${CURA_INSTALL_PLUGINS_PATH})
|
|
|
620cea4 |
if(NOT APPLE AND NOT WIN32)
|
|
|
620cea4 |
@@ -79,10 +79,10 @@ if(NOT APPLE AND NOT WIN32)
|
|
|
620cea4 |
endif()
|
|
|
620cea4 |
|
|
|
620cea4 |
install(DIRECTORY cura
|
|
|
620cea4 |
- DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
|
|
|
620cea4 |
+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/CuraLulzbot
|
|
|
620cea4 |
FILES_MATCHING PATTERN *.py)
|
|
|
620cea4 |
install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
|
|
|
620cea4 |
- DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
|
|
|
620cea4 |
+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/CuraLulzbot/cura)
|
|
|
620cea4 |
install(FILES ${CMAKE_BINARY_DIR}/cura-lulzbot.desktop
|
|
|
620cea4 |
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
|
|
|
620cea4 |
install(FILES cura.appdata.xml
|
|
|
620cea4 |
@@ -95,10 +95,10 @@ else()
|
|
|
620cea4 |
DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
|
620cea4 |
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
|
|
|
620cea4 |
install(DIRECTORY cura
|
|
|
620cea4 |
- DESTINATION ${PYTHON_SITE_PACKAGES_DIR}
|
|
|
620cea4 |
+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/CuraLulzbot
|
|
|
620cea4 |
FILES_MATCHING PATTERN *.py)
|
|
|
620cea4 |
install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py
|
|
|
620cea4 |
- DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/cura)
|
|
|
620cea4 |
+ DESTINATION ${PYTHON_SITE_PACKAGES_DIR}/CuraLulzbot/cura)
|
|
|
620cea4 |
endif()
|
|
|
620cea4 |
|
|
|
620cea4 |
include(CPackConfig.cmake)
|
|
|
620cea4 |
diff -up cura-lulzbot-2.6.52/cura_app.py.system cura-lulzbot-2.6.52/cura_app.py
|
|
|
620cea4 |
--- cura-lulzbot-2.6.52/cura_app.py.system 2017-11-21 16:03:56.000000000 -0500
|
|
|
620cea4 |
+++ cura-lulzbot-2.6.52/cura_app.py 2017-12-08 14:44:32.526772174 -0500
|
|
|
620cea4 |
@@ -5,6 +5,9 @@
|
|
|
620cea4 |
import os
|
|
|
620cea4 |
import sys
|
|
|
620cea4 |
import platform
|
|
|
620cea4 |
+from distutils.sysconfig import get_python_lib
|
|
|
620cea4 |
+
|
|
|
620cea4 |
+sys.path.insert(0, os.path.join(get_python_lib(), 'CuraLulzbot'))
|
|
|
620cea4 |
|
|
|
620cea4 |
from UM.Platform import Platform
|
|
|
620cea4 |
|
|
|
620cea4 |
diff -up cura-lulzbot-2.6.52/cura/CuraApplication.py.system cura-lulzbot-2.6.52/cura/CuraApplication.py
|
|
|
620cea4 |
--- cura-lulzbot-2.6.52/cura/CuraApplication.py.system 2017-11-21 16:03:56.000000000 -0500
|
|
|
620cea4 |
+++ cura-lulzbot-2.6.52/cura/CuraApplication.py 2017-12-08 14:44:32.526772174 -0500
|
|
|
620cea4 |
@@ -125,7 +125,7 @@ class CuraApplication(QtApplication):
|
|
|
620cea4 |
for dir_name in ["extruders", "machine_instances", "materials", "plugins", "quality", "user", "variants"]:
|
|
|
620cea4 |
Resources.addExpectedDirNameInData(dir_name)
|
|
|
620cea4 |
|
|
|
620cea4 |
- Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura", "resources"))
|
|
|
620cea4 |
+ Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura-lulzbot", "resources"))
|
|
|
620cea4 |
if not hasattr(sys, "frozen"):
|
|
|
620cea4 |
Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources"))
|
|
|
620cea4 |
|
|
|
620cea4 |
@@ -544,7 +544,7 @@ class CuraApplication(QtApplication):
|
|
|
620cea4 |
def _loadPlugins(self):
|
|
|
620cea4 |
self._plugin_registry.addType("profile_reader", self._addProfileReader)
|
|
|
620cea4 |
self._plugin_registry.addType("profile_writer", self._addProfileWriter)
|
|
|
620cea4 |
- self._plugin_registry.addPluginLocation(os.path.join(QtApplication.getInstallPrefix(), "lib", "cura"))
|
|
|
620cea4 |
+ self._plugin_registry.addPluginLocation(os.path.join(QtApplication.getInstallPrefix(), "lib", "cura-lulzbot"))
|
|
|
620cea4 |
if hasattr(sys, "frozen"):
|
|
|
620cea4 |
# This what works for MacOS currently
|
|
|
620cea4 |
self._plugin_registry.addPluginLocation(os.path.join(QtApplication.getInstallPrefix(), "Resources", "cura", "plugins"))
|