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

Merged HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
117631 jphuynh: Merged JPHUYNH/BDE-443 (5.1.0) to HEAD (5.1)
      114606 jphuynh: - Changed version to 5.1-NO-GPL-SNAPSHOT
      - Updated LibreOffice, Common and PostgreSQL versions
      - Removed swftools


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@117992 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Natalia Smintanca
2015-11-19 09:32:15 +00:00
parent 39644fe34a
commit 19d41b613c
6 changed files with 0 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,6 @@
<setInstallerVariable name="java_distribution_folder" value="${binaries_folder}/java" />
<setInstallerVariable name="xvfb_distribution_folder" value="${binaries_folder}/Xvfb" />
<setInstallerVariable name="libreoffice_distribution_folder" value="${binaries_folder}/libreoffice" />
<setInstallerVariable name="swftools_distribution_folder" value="${binaries_folder}/swftools" />
<setInstallerVariable name="tomcat_distribution_folder" value="${binaries_folder}/apache-tomcat" />
<setInstallerVariable name="manager_distribution_folder" value="${binaries_folder}" />

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

@@ -37,7 +37,6 @@
<setInstallerVariable name="imagemagick_distribution_folder_unix" value="${local_binaries_folder}/ImageMagick"/>
<setInstallerVariable name="java_distribution_folder" value="${local_binaries_folder}/java"/>
<setInstallerVariable name="libreoffice_distribution_folder" value="${local_binaries_folder}/libreoffice"/>
<setInstallerVariable name="swftools_distribution_folder" value="${binaries_folder}/swftools-0.9.2"/>
<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-->

28
src/main/resources/bitrock/alfresco-functions.xml
View File

@@ -189,34 +189,6 @@ img.exe=${'${img.root}'}\\convert.exe</value>
<pattern>@@BITROCK_LO_PORT@@</pattern>
<value>${libreoffice_port}</value>
</substitution>
<substitution>
<pattern>@@BITROCK_PDF2SWF_PATH@@</pattern>
<value>${installdir.dos.unix}/swftools/pdf2swf.exe</value>
<ruleList>
<platformTest type="windows"/>
</ruleList>
</substitution>
<substitution>
<pattern>@@BITROCK_PDF2SWF_PATH@@</pattern>
<value>${installdir.unix}/common/bin/pdf2swf</value>
<ruleList>
<platformTest type="unix"/>
</ruleList>
</substitution>
<substitution>
<pattern>@@BITROCK_PDF2SWF_LANGUAGEDIR@@</pattern>
<value>${installdir.dos.unix}/swftools/japanese</value>
<ruleList>
<platformTest type="windows"/>
</ruleList>
</substitution>
<substitution>
<pattern>@@BITROCK_PDF2SWF_LANGUAGEDIR@@</pattern>
<value>${installdir.unix}/common/japanese</value>
<ruleList>
<platformTest type="unix"/>
</ruleList>
</substitution>
<substitution>
<pattern>@@BITROCK_MYSQL_PORT@@</pattern>
<value>${database_port}</value>

2
src/main/resources/bitrock/bitrock/alfresco/shared/alfresco-global.properties
View File

@@ -40,8 +40,6 @@ ooo.exe=@@BITROCK_LIBREOFFICE_PROGRAM_DIR@@
ooo.enabled=true
ooo.port=@@BITROCK_LO_PORT@@
@@BITROCK_ALFRESCO_IMAGEMAGICK_ENV@@
swf.exe=@@BITROCK_PDF2SWF_PATH@@
swf.languagedir=@@BITROCK_PDF2SWF_LANGUAGEDIR@@
jodconverter.enabled=false
jodconverter.officeHome=@@BITROCK_LIBREOFFICE_JOD_DIR@@

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

@@ -193,7 +193,6 @@
<include file="imagemagick.xml"/>
<include file="ghostscript.xml"/>
<include file="swftools.xml"/>
<include file="alfresco-customstack-postgres-settings.xml" />
<include file="alfresco-customstack-shortcuts.xml" />
<include file="alfresco-customstack-validations.xml"/>

72
src/main/resources/bitrock/swftools.xml
View File

@@ -1,72 +0,0 @@
<component>
<name>swftools</name>
<description>SWFTOOLS Component</description>
<canBeEdited>0</canBeEdited>
<show>0</show>
<selected>1</selected>
<shouldPackRuleList>
<isTrue value="${swftools_component_enabled}" />
</shouldPackRuleList>
<initializationActionList/>
<parameterList>
<booleanParameter name="swftools_component_enabled" ask="0" value="1" />
<directoryParameter>
<ask>0</ask>
<description>SWFTOOLS installation directory</description>
<name>swftools_root_directory</name>
<cliOptionName>swftools_root_directory</cliOptionName>
</directoryParameter>
</parameterList>
<readyToInstallActionList>
<setInstallerVariable name="swftools_root_directory" value="${installdir}/common"/>
<setInstallerVariable name="SWFTOOLS_WRAPPERS">
<value> ${swftools_root_directory}/bin/as3compile
${swftools_root_directory}/bin/font2swf
${swftools_root_directory}/bin/jpeg2swf
${swftools_root_directory}/bin/pdf2swf
${swftools_root_directory}/bin/png2swf
${swftools_root_directory}/bin/swfbbox
${swftools_root_directory}/bin/swfc
${swftools_root_directory}/bin/swfcombine
${swftools_root_directory}/bin/swfdump
${swftools_root_directory}/bin/swfextract
${swftools_root_directory}/bin/swfrender
${swftools_root_directory}/bin/swfstrings
${swftools_root_directory}/bin/wav2swf
</value>
</setInstallerVariable>
<setInstallerVariable name="WRAPPERS" value="${SWFTOOLS_WRAPPERS};${WRAPPERS}"/>
</readyToInstallActionList>
<folderList>
<folder>
<name>swftoolsWindows</name>
<destination>${installdir}/swftools</destination>
<platforms>windows</platforms>
<distributionFileList>
<distributionDirectory allowWildcards="1" origin="${swftools_distribution_folder}/*"/>
</distributionFileList>
</folder>
<folder>
<name>swftoolsUnix</name>
<destination>${swftools_root_directory}</destination>
<platforms>linux linux-x64 osx</platforms>
<distributionFileList>
<distributionDirectory origin="${swftools_distribution_folder}/bin"/>
<distributionDirectory origin="${swftools_distribution_folder}/japanese"/>
</distributionFileList>
<actionList>
<substitute>
<files>${SWFTOOLS_WRAPPERS}</files>
<type>exact</type>
<substitutionList>
<substitution>
<pattern>@@BITROCK_SWFTOOLS_ROOTDIR@@</pattern>
<value>${swftools_root_directory}</value>
</substitution>
</substitutionList>
</substitute>
</actionList>
</folder>
</folderList>
</component>