Commit 29c30f6a authored by Marco Mariani's avatar Marco Mariani

global /opt/zimbra search-replace; java 1.7.0_15

parent d0595756
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
# mysql will be compiled with the embedded yaSSL library instead of openssl # mysql will be compiled with the embedded yaSSL library instead of openssl
# back-perl in openldap is disabled for linking issues to libperl.a # back-perl in openldap is disabled for linking issues to libperl.a
# #
# XXX TODO: grep -R 'opt\\/zimbra' .
# grep -R '/usr/bin/procmail' .
extends = extends =
/home/marco/src/slapos/stack/slapos.cfg /home/marco/src/slapos/stack/slapos.cfg
...@@ -59,6 +61,7 @@ parts = ...@@ -59,6 +61,7 @@ parts =
perl-libwww-perl perl-libwww-perl
perl-URI perl-URI
zimbra-sources zimbra-sources
zimbra-sources-search-replace
environment environment
sh-environment sh-environment
zimbra-build zimbra-build
...@@ -75,8 +78,8 @@ slapos.cookbook = ...@@ -75,8 +78,8 @@ slapos.cookbook =
# hack to download java and policy files, bypassing javascript requirement # hack to download java and policy files, bypassing javascript requirement
recipe = plone.recipe.command recipe = plone.recipe.command
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
web-dirname = 7u13-b20 web-dirname = 7u15-b03
filename = jdk-7u13-linux-x64.tar.gz filename = jdk-7u15-linux-x64.tar.gz
policy-filename = UnlimitedJCEPolicyJDK7.zip policy-filename = UnlimitedJCEPolicyJDK7.zip
stop-on-error = True stop-on-error = True
update = true update = true
...@@ -94,6 +97,7 @@ command = ...@@ -94,6 +97,7 @@ command =
# Uncompress the downloaded JDK # Uncompress the downloaded JDK
recipe = hexagonit.recipe.download recipe = hexagonit.recipe.download
url = ${jdk-download:location}/${jdk-download:filename} url = ${jdk-download:location}/${jdk-download:filename}
md5sum = 118a16aab9ff2c3f7c7788658cc77734
strip-top-level-dir = True strip-top-level-dir = True
...@@ -101,13 +105,13 @@ strip-top-level-dir = True ...@@ -101,13 +105,13 @@ strip-top-level-dir = True
# copy the jdk tarball inside the build tree # copy the jdk tarball inside the build tree
recipe = plone.recipe.command recipe = plone.recipe.command
zimbra-target = ${zimbra-sources:location}/ThirdPartyBuilds/x86_64/java zimbra-target = ${zimbra-sources:location}/ThirdPartyBuilds/x86_64/java
zimbra-filename = jdk1.7.0_13.tgz zimbra-filename = jdk1.7.0_15.tgz
update-command = ${:command} update-command = ${:command}
command = command =
mkdir -p ${:zimbra-target} mkdir -p ${:zimbra-target}
cp ${jdk-download:location}/${jdk-download:filename} ${:zimbra-target}/${:zimbra-filename} cp ${jdk-download:location}/${jdk-download:filename} ${:zimbra-target}/${:zimbra-filename}
# alternate spelling (the jdk is referenced with two different names) # alternate spelling (the jdk is referenced with two different names)
ln -s ${:zimbra-target}/${:zimbra-filename} ${:zimbra-target}/jdk-1.7.0_13.tgz ln -s ${:zimbra-target}/${:zimbra-filename} ${:zimbra-target}/jdk-1.7.0_15.tgz
...@@ -184,6 +188,17 @@ develop = True ...@@ -184,6 +188,17 @@ develop = True
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
[zimbra-sources-search-replace]
# replace all remaining occurrences of /opt/zimbra
recipe = plone.recipe.command
ZIMBRA_HOME = ${environment:ZIMBRA_HOME}
command =
cd ${zimbra-sources:location}
find . -name '.git' -prune -o -type f -exec sed -i "s#/opt/zimbra#${:ZIMBRA_HOME}#g" {} \;
update-command = ${:command}
stop-on-error = True
[zimbra-build] [zimbra-build]
# run the main build script for zimbra itself and thirt parties as well. # run the main build script for zimbra itself and thirt parties as well.
recipe = plone.recipe.command recipe = plone.recipe.command
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment