From ce9f6077a27b00143254fd961bee7a20a03c2222 Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Tue, 8 Mar 2016 10:58:37 +0100 Subject: [PATCH 1/3] Renaming cura_app.py into cura on Linux* --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92dcb8c88d..8c19bfe188 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,8 +55,11 @@ find_package(PythonInterp 3.4.0 REQUIRED) install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) install(DIRECTORY plugins DESTINATION lib/cura) -install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) if(NOT APPLE AND NOT WIN32) + install(FILES cura_app.py + DESTINATION ${CMAKE_INSTALL_BINDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE + RENAME cura) install(DIRECTORY cura DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages FILES_MATCHING PATTERN *.py) install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura) install(FILES cura.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) @@ -64,6 +67,7 @@ if(NOT APPLE AND NOT WIN32) DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/ RENAME cura.xml ) else() + install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) install(DIRECTORY cura DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages FILES_MATCHING PATTERN *.py) install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura) endif() From 368718e82b266885836162164f2a9e5d7cb20e6b Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Tue, 8 Mar 2016 11:03:25 +0100 Subject: [PATCH 2/3] Make all install(*) commands multiline It makes the CMakeLists.txt (at least for me) easier to read. --- CMakeLists.txt | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c19bfe188..bb6a72bd1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,29 +47,41 @@ if(NOT ${URANIUM_SCRIPTS_DIR} STREQUAL "") add_custom_command(TARGET translations POST_BUILD COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/resources/i18n/${lang}/LC_MESSAGES/ COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} ARGS ${po_file} -o ${mo_file} -f) endforeach() endforeach() - install(DIRECTORY ${CMAKE_BINARY_DIR}/resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) + install(DIRECTORY ${CMAKE_BINARY_DIR}/resources + DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) endif() endif() find_package(PythonInterp 3.4.0 REQUIRED) -install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) -install(DIRECTORY plugins DESTINATION lib/cura) +install(DIRECTORY resources + DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) +install(DIRECTORY plugins + DESTINATION lib/cura) if(NOT APPLE AND NOT WIN32) install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE RENAME cura) - install(DIRECTORY cura DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages FILES_MATCHING PATTERN *.py) - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura) - install(FILES cura.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) + install(DIRECTORY cura + DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages + FILES_MATCHING PATTERN *.py) + install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py + DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura) + install(FILES cura.desktop + DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) install(FILES cura.sharedmimeinfo DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/ RENAME cura.xml ) else() - install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - install(DIRECTORY cura DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages FILES_MATCHING PATTERN *.py) - install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura) + install(FILES cura_app.py + DESTINATION ${CMAKE_INSTALL_BINDIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + install(DIRECTORY cura + DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages + FILES_MATCHING PATTERN *.py) + install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py + DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura) endif() include(CPackConfig.cmake) From 617f591e55eb53f89349a3af7e476b6193f2417f Mon Sep 17 00:00:00 2001 From: Thomas-Karl Pietrowski Date: Tue, 8 Mar 2016 11:08:16 +0100 Subject: [PATCH 3/3] Rename cura_app.py to cura in cura.desktop --- cura.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura.desktop b/cura.desktop index f5fc344c1b..8e02fe6d52 100644 --- a/cura.desktop +++ b/cura.desktop @@ -5,8 +5,8 @@ Name[de]=Cura GenericName=3D Printing Software GenericName[de]=3D-Druck-Software Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great. -Exec=/usr/bin/cura_app.py %F -TryExec=/usr/bin/cura_app.py +Exec=/usr/bin/cura %F +TryExec=/usr/bin/cura Icon=/usr/share/cura/resources/images/cura-icon.png Terminal=false Type=Application