inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.2) to HEAD (5.2)

Browse Source 
136136 mward: MNT-17200: fixed imagemagick path settings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:01:32 +00:00
parent 2c1ca84acd
commit 86828ec8fb
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/resources/bitrock/imagemagick.xml
View File

@@ -134,9 +134,9 @@ System variables provided by this component:
<value>##### IMAGEMAGICK ENV ##### <value>##### IMAGEMAGICK ENV #####
MAGICK_HOME="${imagemagick_root_directory}" MAGICK_HOME="${imagemagick_root_directory}"
export MAGICK_HOME export MAGICK_HOME
MAGICK_CONFIGURE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16" MAGICK_CONFIGURE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI"
export MAGICK_CONFIGURE_PATH export MAGICK_CONFIGURE_PATH
MAGICK_CODER_MODULE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/modules-Q16/coders" MAGICK_CODER_MODULE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/modules-Q16HDRI/coders"
export MAGICK_CODER_MODULE_PATH export MAGICK_CODER_MODULE_PATH
</value> </value>
@@ -227,23 +227,23 @@ export GS_LIB
<actionList> <actionList>
<actionGroup> <actionGroup>
<actionList> <actionList>
<copyFile origin="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type.xml" destination="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16/" > <copyFile origin="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type.xml" destination="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/" >
<ruleList> <ruleList>
<fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type.xml" /> <fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type.xml" />
</ruleList> </ruleList>
</copyFile> </copyFile>
<copyFile origin="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type-ghostscript.xml" destination="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16/" > <copyFile origin="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type-ghostscript.xml" destination="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/" >
<ruleList> <ruleList>
<fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type-ghostscript.xml" /> <fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type-ghostscript.xml" />
</ruleList> </ruleList>
</copyFile> </copyFile>
<copyFile origin="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/delegates.xml" destination="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16/" > <copyFile origin="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/delegates.xml" destination="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/" >
<ruleList> <ruleList>
<fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/delegates.xml" /> <fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/delegates.xml" />
</ruleList> </ruleList>
</copyFile> </copyFile>
<substitute> <substitute>
<files>${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16/type-ghostscript.xml</files> <files>${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/type-ghostscript.xml</files>
<substitutionList> <substitutionList>
<substitution> <substitution>
<pattern>/usr/share/fonts/default/Type1</pattern> <pattern>/usr/share/fonts/default/Type1</pattern>
@@ -290,7 +290,7 @@ export GS_LIB
<platformTest type="unix"/> <platformTest type="unix"/>
</conditionRuleList> </conditionRuleList>
<actionList> <actionList>
<setInstallerVariable name="imagemagick_policy_path" value="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16/policy.xml"/> <setInstallerVariable name="imagemagick_policy_path" value="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/policy.xml"/>
</actionList> </actionList>
<elseActionList> <elseActionList>
<setInstallerVariable name="imagemagick_policy_path" value="${imagemagick_root_directory}/policy.xml"/> <setInstallerVariable name="imagemagick_policy_path" value="${imagemagick_root_directory}/policy.xml"/>