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 
136787 skopf: Merged REPO-2057 (5.2.1) to 5.2.N (5.2.1)
      136647 anechifor: REPO-2057 : GS Replacement: Remove GhostScript from the code base (installer, Admin Console et al.)
         - I remove GhostScript and change pom.xml from installer to build locally.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137509 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:08:21 +00:00
parent c0dddf00bd
commit b7707ed847
5 changed files with 26 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/bitrock/alfresco-customstack-build-settings.xml
View File

@@ -37,7 +37,6 @@
<setInstallerVariable name="java_distribution_folder" value="${local_binaries_folder}/java"/> <setInstallerVariable name="java_distribution_folder" value="${local_binaries_folder}/java"/>
<setInstallerVariable name="libreoffice_distribution_folder" value="${local_binaries_folder}/libreoffice"/> <setInstallerVariable name="libreoffice_distribution_folder" value="${local_binaries_folder}/libreoffice"/>
<setInstallerVariable name="tomcat_distribution_folder" value="${local_binaries_folder}/apache-tomcat"/> <setInstallerVariable name="tomcat_distribution_folder" value="${local_binaries_folder}/apache-tomcat"/>
<setInstallerVariable name="ghostscript_distribution_folder" value="${local_binaries_folder}/ghostscript"/>
<!-- END ALFRESCO BUILD SYSTEM--> <!-- END ALFRESCO BUILD SYSTEM-->
</actionList> </actionList>
<ruleList> <ruleList>

4
src/main/resources/bitrock/ghostscript.xml
View File

@@ -1,4 +1,4 @@
<component> <!-- component>
<name>ghostscript</name> <name>ghostscript</name>
<description>GhostScript</description> <description>GhostScript</description>
<canBeEdited>0</canBeEdited> <canBeEdited>0</canBeEdited>
@@ -89,5 +89,5 @@ export GS_LIB
</folderList> </folderList>
<postInstallationActionList/> <postInstallationActionList/>
</component> </component-->

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

@@ -23,11 +23,6 @@ System variables provided by this component:
<isTrue value="${imagemagick_component_enabled}"/> <isTrue value="${imagemagick_component_enabled}"/>
</shouldPackRuleList> </shouldPackRuleList>
<preBuildActionList> <preBuildActionList>
<setInstallerVariable name="component(imagemagick).parameter(imagemagick_ghostscriptwin_included).value" value="1">
<ruleList>
<fileTest path="${imagemagick_distribution_folder_windows}/lib/gs_init.ps" condition="exists" />
</ruleList>
</setInstallerVariable>
<actionGroup> <actionGroup>
<actionList> <actionList>
<setInstallerVariable name="imagemagick_build_path" value=""/> <setInstallerVariable name="imagemagick_build_path" value=""/>
@@ -93,7 +88,6 @@ System variables provided by this component:
<value>7.0.5</value> <value>7.0.5</value>
<default>7.0.5</default> <default>7.0.5</default>
</stringParameter> </stringParameter>
<booleanParameter name="imagemagick_ghostscriptwin_included" value="0" ask="0" />
</parameterList> </parameterList>
<readyToInstallActionList> <readyToInstallActionList>
<setInstallerVariable name="imagemagick_root_directory" value="${installdir}/common"> <setInstallerVariable name="imagemagick_root_directory" value="${installdir}/common">
@@ -132,51 +126,35 @@ System variables provided by this component:
</setInstallerVariable> </setInstallerVariable>
<setInstallerVariable name="IMAGEMAGICK_ENV_VAR"> <setInstallerVariable name="IMAGEMAGICK_ENV_VAR">
<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-Q16HDRI" 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-Q16HDRI/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>
<ruleList> <ruleList>
<platformTest type="unix"/> <platformTest type="unix"/>
</ruleList> </ruleList>
</setInstallerVariable> </setInstallerVariable>
<setInstallerVariable name="IMAGEMAGICK_ENV_VAR"> <setInstallerVariable name="IMAGEMAGICK_ENV_VAR">
<value>rem ##### IMAGEMAGICK ENV ##### <value>rem ##### IMAGEMAGICK ENV #####
set MAGICK_HOME=${imagemagick_root_directory.dos} set MAGICK_HOME=${imagemagick_root_directory.dos}
set MAGICK_CODER_MODULE_PATH=${imagemagick_root_directory.dos}\modules\coders set MAGICK_CODER_MODULE_PATH=${imagemagick_root_directory.dos}\modules\coders
set MAGICK_CONFIGURE_PATH=${imagemagick_root_directory.dos} set MAGICK_CONFIGURE_PATH=${imagemagick_root_directory.dos}
</value> </value>
<ruleList> <ruleList>
<platformTest type="windows"/> <platformTest type="windows"/>
</ruleList> </ruleList>
</setInstallerVariable> </setInstallerVariable>
<setInstallerVariable name="IMAGEMAGICK_ENV_VAR">
<value>${IMAGEMAGICK_ENV_VAR}
set GS_LIB=${imagemagick_root_directory.dos}\lib
</value>
<ruleList>
<platformTest type="windows"/>
<isTrue value="${imagemagick_ghostscriptwin_included}" />
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="IMAGEMAGICK_ENV_VAR">
<value>${IMAGEMAGICK_ENV_VAR}
GS_LIB="${imagemagick_root_directory}/share/ghostscript/fonts"
export GS_LIB
</value>
<ruleList>
<platformTest type="unix"/>
</ruleList>
</setInstallerVariable>
<setInstallerVariable name="ENV_VAR"> <setInstallerVariable name="ENV_VAR">
<value>${IMAGEMAGICK_ENV_VAR}${ENV_VAR}</value> <value>${IMAGEMAGICK_ENV_VAR}${ENV_VAR}</value>
</setInstallerVariable> </setInstallerVariable>
<setInstallerVariable name="IMAGEMAGICK_WRAPPERS"> <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/compare
${imagemagick_root_directory}/bin/composite ${imagemagick_root_directory}/bin/composite
${imagemagick_root_directory}/bin/conjure ${imagemagick_root_directory}/bin/conjure
@@ -228,33 +206,16 @@ export GS_LIB
<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-Q16HDRI/" > <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-Q16HDRI/" > <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/type-ghostscript.xml" /> <fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/delegates.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-Q16HDRI/" >
<ruleList>
<fileExists path="${imagemagick_root_directory}/share/doc/ImageMagick/www/source/delegates.xml" />
</ruleList>
</copyFile>
<substitute>
<files>${imagemagick_root_directory}/lib/ImageMagick-${imagemagick_version}/config-Q16HDRI/type-ghostscript.xml</files>
<substitutionList>
<substitution>
<pattern>/usr/share/fonts/default/Type1</pattern>
<value>${common_root_directory}/share/ghostscript/fonts</value>
</substitution>
</substitutionList>
</substitute>
</actionList> </actionList>
<ruleList>
<fileTest path="${common_root_directory}/share/ghostscript/fonts" condition="exists" />
</ruleList>
</actionGroup> </actionGroup>
<substitute> <substitute>
<type>exact</type> <type>exact</type>

1
src/main/resources/bitrock/project.xml
View File

@@ -191,7 +191,6 @@
<include file="base-unix-service.xml" /> <include file="base-unix-service.xml" />
<include file="imagemagick.xml"/> <include file="imagemagick.xml"/>
<include file="ghostscript.xml"/>
<include file="alfresco-customstack-postgres-settings.xml" /> <include file="alfresco-customstack-postgres-settings.xml" />
<include file="alfresco-customstack-shortcuts.xml" /> <include file="alfresco-customstack-shortcuts.xml" />
<include file="alfresco-customstack-validations.xml"/> <include file="alfresco-customstack-validations.xml"/>

6
src/main/resources/extract-binaries.xml
View File

@@ -148,12 +148,6 @@
<arg value="${maven.localrepo}/org/libreoffice/libreoffice-dist/${installer.libreoffice.version}/libreoffice-dist-${installer.libreoffice.version}-${libreoffice.platform}.tgz" /> <arg value="${maven.localrepo}/org/libreoffice/libreoffice-dist/${installer.libreoffice.version}/libreoffice-dist-${installer.libreoffice.version}-${libreoffice.platform}.tgz" />
</exec> </exec>
<echo> Extracting GhostScript...</echo>
<exec failonerror="true" executable="tar" dir="${bin.folder}">
<arg value="xf" />
<arg value="${maven.localrepo}/com/ghostscript/ghostscript-distribution/${installer.ghostscript.version}/ghostscript-distribution-${installer.ghostscript.version}-@{targetPlatform}.tgz" />
</exec>
<echo> Extracting ImageMagick...</echo> <echo> Extracting ImageMagick...</echo>
<exec failonerror="true" executable="tar" dir="${bin.folder}"> <exec failonerror="true" executable="tar" dir="${bin.folder}">
<arg value="xf" /> <arg value="xf" />