Merge lp:~mapreri/inkscape/executable-not-elf-or-script into lp:~inkscape.dev/inkscape/trunk

[Mattia Rizzolo]

Avoid installing python modules not intended to be executed directly (but are imported from others) as executables.

It's kinda ugly because listing explicitly is not nice, but I think it's good enough. Otherwise, do you have any idea of how to accomplish it in some nicer way?

[Mc (mc...)]

what does add the +x bit in the first lpace instead of keeping the permissions from the original files ?

[Mattia Rizzolo (mapreri)]

The 'install(PROGRAMS ...)' of cmake does. PROGRAMS is there exactly to specify that you want the +x. FILES is used when you don't want the +x.

From the little I know about cmake, the only way to preserve the original permissions is to use install(DIRECTORY ... USE_SOURCE_PERMISSIONS), but with that you'd need to copy the whole directory, which I assumed you don't want to do given that you wrote this CMakeList in first place.

[Mattia Rizzolo (mapreri)]

Thank you!

=== modified file 'share/extensions/CMakeLists.txt'
--- share/extensions/CMakeLists.txt	2016-11-26 16:15:27 +0000
+++ share/extensions/CMakeLists.txt	2017-01-07 12:31:40 +0000
@@ -26,8 +26,18 @@
       "*.sh"
       "*.rb"
     )
-
+# These files don't need the +x bit
+set(_SCRIPTS_NOEXEC
+    "hersheydata.py"
+    "hpgl_decoder.py"
+    "hpgl_encoder.py"
+    "simplepath.py"
+    "simplestyle.py"
+    "simpletransform.py"
+)
+list(REMOVE_ITEM _SCRIPTS ${_SCRIPTS_NOEXEC})
 install(PROGRAMS ${_SCRIPTS} DESTINATION ${INKSCAPE_SHARE_INSTALL}/extensions)
+install(FILES ${_SCRIPTS_NOEXEC} DESTINATION ${INKSCAPE_SHARE_INSTALL}/extensions)
 
 file(GLOB _FILES "alphabet_soup/*.svg")
 install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/extensions/alphabet_soup)