diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-07-06 10:02:21 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-07-06 10:02:21 +0000 |
| commit | b98fbdac9b7b9a75f2c198ff5b9c92389b927fe0 (patch) | |
| tree | 86c8635fbe4a8f4e3171cb47d28d1a16f569a58f /share/extensions | |
| parent | Fixes from branch review (diff) | |
| parent | Extensions. Fix for Bug #760429 (Scour extension files organization). (diff) | |
| download | inkscape-b98fbdac9b7b9a75f2c198ff5b9c92389b927fe0.tar.gz inkscape-b98fbdac9b7b9a75f2c198ff5b9c92389b927fe0.zip | |
update to trunk
(bzr r13645.1.103)
Diffstat (limited to 'share/extensions')
| -rw-r--r-- | share/extensions/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | share/extensions/Makefile.am | 3 | ||||
| -rw-r--r-- | share/extensions/scour.inx | 8 | ||||
| -rw-r--r-- | share/extensions/scour/Makefile.am | 13 | ||||
| -rwxr-xr-x | share/extensions/scour/scour.inkscape.py (renamed from share/extensions/scour.inkscape.py) | 0 | ||||
| -rw-r--r-- | share/extensions/scour/scour.py (renamed from share/extensions/scour.py) | 0 | ||||
| -rwxr-xr-x | share/extensions/scour/svg_regex.py (renamed from share/extensions/svg_regex.py) | 0 | ||||
| -rwxr-xr-x | share/extensions/scour/svg_transform.py (renamed from share/extensions/svg_transform.py) | 0 | ||||
| -rwxr-xr-x | share/extensions/scour/yocto_css.py (renamed from share/extensions/yocto_css.py) | 0 |
9 files changed, 22 insertions, 5 deletions
diff --git a/share/extensions/CMakeLists.txt b/share/extensions/CMakeLists.txt index c167a156a..280abd0a7 100644 --- a/share/extensions/CMakeLists.txt +++ b/share/extensions/CMakeLists.txt @@ -42,5 +42,8 @@ install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/Poly3DO file(GLOB _FILES "ink2canvas/*.py") install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/ink2canvas) +file(GLOB _FILES "scour/*.py") +install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/scour) + file(GLOB _FILES "xaml2svg/*.xsl") install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/extensions/xaml2svg) diff --git a/share/extensions/Makefile.am b/share/extensions/Makefile.am index 130ed6e40..765f18a02 100644 --- a/share/extensions/Makefile.am +++ b/share/extensions/Makefile.am @@ -2,9 +2,10 @@ SUBDIRS = \ alphabet_soup \ Barcode \ + ink2canvas \ Poly3DObjects \ + scour \ test \ - ink2canvas \ xaml2svg extensiondir = $(datadir)/inkscape/extensions diff --git a/share/extensions/scour.inx b/share/extensions/scour.inx index 45719deeb..c97eec502 100644 --- a/share/extensions/scour.inx +++ b/share/extensions/scour.inx @@ -2,9 +2,9 @@ <inkscape-extension xmlns="http://www.inkscape.org/namespace/inkscape/extension"> <_name>Optimized SVG Output</_name> <id>org.inkscape.output.scour</id> - <dependency type="executable" location="extensions">scour.py</dependency> - <dependency type="executable" location="extensions">svg_regex.py</dependency> - <dependency type="executable" location="extensions">yocto_css.py</dependency> + <dependency type="executable" location="extensions">scour/scour.py</dependency> + <dependency type="executable" location="extensions">scour/svg_regex.py</dependency> + <dependency type="executable" location="extensions">scour/yocto_css.py</dependency> <param name="tab" type="notebook"> <page name="Options" _gui-text="Options"> <param name="simplify-colors" type="boolean" _gui-text="Shorten color values">true</param> @@ -63,6 +63,6 @@ <_filetypetooltip>Scalable Vector Graphics</_filetypetooltip> </output> <script> - <command reldir="extensions" interpreter="python">scour.inkscape.py</command> + <command reldir="extensions" interpreter="python">scour/scour.inkscape.py</command> </script> </inkscape-extension> diff --git a/share/extensions/scour/Makefile.am b/share/extensions/scour/Makefile.am new file mode 100644 index 000000000..8a6f42544 --- /dev/null +++ b/share/extensions/scour/Makefile.am @@ -0,0 +1,13 @@ + +scourdir = $(datadir)/inkscape/extensions/scour + +scour_DATA = \ + scour.py \ + scour.inkscape.py \ + svg_regex.py \ + svg_transform.py \ + yocto_css.py + +EXTRA_DIST = \ + $(scour_DATA) + diff --git a/share/extensions/scour.inkscape.py b/share/extensions/scour/scour.inkscape.py index f161a09c2..f161a09c2 100755 --- a/share/extensions/scour.inkscape.py +++ b/share/extensions/scour/scour.inkscape.py diff --git a/share/extensions/scour.py b/share/extensions/scour/scour.py index 236529daa..236529daa 100644 --- a/share/extensions/scour.py +++ b/share/extensions/scour/scour.py diff --git a/share/extensions/svg_regex.py b/share/extensions/scour/svg_regex.py index 6321bff0e..6321bff0e 100755 --- a/share/extensions/svg_regex.py +++ b/share/extensions/scour/svg_regex.py diff --git a/share/extensions/svg_transform.py b/share/extensions/scour/svg_transform.py index 860c1df5d..860c1df5d 100755 --- a/share/extensions/svg_transform.py +++ b/share/extensions/scour/svg_transform.py diff --git a/share/extensions/yocto_css.py b/share/extensions/scour/yocto_css.py index c6bd0c37e..c6bd0c37e 100755 --- a/share/extensions/yocto_css.py +++ b/share/extensions/scour/yocto_css.py |