inteligr8/acs-community-packaging
1
0
Fork 0
mirror of https://github.com/Alfresco/acs-community-packaging.git synced 2025-09-10 14:12:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
136789 skopf: Merged REPO-2057 (5.2.1) to 5.2.N (5.2.1)
      136649 anechifor: REPO-2057 : GS Replacement: Remove GhostScript from the code base (installer, Admin Console et al.)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137511 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:08:36 +00:00
parent 61ef731e4e
commit 22236e8eb5
1 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,35 +126,33 @@ System variables provided by this component:
</setInstallerVariable>
<setInstallerVariable name="IMAGEMAGICK_ENV_VAR">
<value>##### IMAGEMAGICK ENV #####
MAGICK_HOME="${imagemagick_root_directory}"
export MAGICK_HOME
MAGICK_CONFIGURE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI"
export MAGICK_CONFIGURE_PATH
MAGICK_CODER_MODULE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/modules-Q16HDRI/coders"
export MAGICK_CODER_MODULE_PATH
</value>
MAGICK_HOME="${imagemagick_root_directory}"
export MAGICK_HOME
MAGICK_CONFIGURE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI"
export MAGICK_CONFIGURE_PATH
MAGICK_CODER_MODULE_PATH="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/modules-Q16HDRI/coders"
export MAGICK_CODER_MODULE_PATH
</value>
<ruleList>
<platformTest type="unix"/>
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="IMAGEMAGICK_ENV_VAR">
<value>rem ##### IMAGEMAGICK ENV #####
set MAGICK_HOME=${imagemagick_root_directory.dos}
set MAGICK_CODER_MODULE_PATH=${imagemagick_root_directory.dos}\modules\coders
set MAGICK_CONFIGURE_PATH=${imagemagick_root_directory.dos}
</value>
set MAGICK_HOME=${imagemagick_root_directory.dos}
set MAGICK_CODER_MODULE_PATH=${imagemagick_root_directory.dos}\modules\coders
set MAGICK_CONFIGURE_PATH=${imagemagick_root_directory.dos}
</value>
<ruleList>
<platformTest type="windows"/>
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="ENV_VAR">
<value>${IMAGEMAGICK_ENV_VAR}${ENV_VAR}</value>
</setInstallerVariable>
<setInstallerVariable name="IMAGEMAGICK_WRAPPERS">
<value>
${imagemagick_root_directory}/bin/animate
<value> ${imagemagick_root_directory}/bin/animate
${imagemagick_root_directory}/bin/compare
${imagemagick_root_directory}/bin/composite
${imagemagick_root_directory}/bin/conjure
@@ -206,15 +204,20 @@ System variables provided by this component:
<actionGroup>
<actionList>
<copyFile origin="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type.xml" destination="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/" >
<ruleList>
<fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type.xml" />
</ruleList>
</copyFile>
<copyFile origin="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/delegates.xml" destination="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/" >
<ruleList>
<fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/delegates.xml" />
</ruleList>
</copyFile>
<ruleList>
<fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type.xml" />
</ruleList>
</copyFile>
<copyFile origin="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type-ghostscript.xml" destination="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/" >
<ruleList>
<fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/type-ghostscript.xml" />
</ruleList>
</copyFile>
<copyFile origin="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/delegates.xml" destination="${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/" >
<ruleList>
<fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/delegates.xml" />
</ruleList>
</copyFile>
</actionList>
</actionGroup>
<substitute>