Fixing build commands to install Redis
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/464ef006 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/464ef006 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/464ef006 Branch: refs/heads/0.5.0 Commit: 464ef0063caa3ecbb2786fbae12c3e00721a7bb9 Parents: c65577e Author: Andrew Kennedy <[email protected]> Authored: Sat Apr 20 17:29:44 2013 +0100 Committer: Andrew Kennedy <[email protected]> Committed: Wed Apr 24 13:25:43 2013 +0100 ---------------------------------------------------------------------- .../brooklyn/entity/nosql/redis/RedisStoreSshDriver.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/464ef006/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java b/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java index 6efccdb..7ae292a 100644 --- a/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java +++ b/software/nosql/src/main/java/brooklyn/entity/nosql/redis/RedisStoreSshDriver.java @@ -5,11 +5,12 @@ import static java.lang.String.format; import java.util.List; import brooklyn.entity.basic.AbstractSoftwareProcessSshDriver; -import brooklyn.entity.basic.lifecycle.CommonCommands; +import brooklyn.entity.basic.Entities; import brooklyn.entity.drivers.downloads.DownloadResolver; import brooklyn.location.Location; import brooklyn.location.basic.SshMachineLocation; import brooklyn.util.MutableMap; +import brooklyn.util.ssh.CommonCommands; import com.google.common.collect.ImmutableList; @@ -40,7 +41,7 @@ public class RedisStoreSshDriver extends AbstractSoftwareProcessSshDriver implem @Override public void install() { - DownloadResolver resolver = entity.getManagementContext().getEntityDownloadsManager().newDownloader(this); + DownloadResolver resolver = Entities.newDownloader(this); List<String> urls = resolver.getTargets(); String saveAs = resolver.getFilename(); expandedInstallDir = getInstallDir()+"/"+resolver.getUnpackedDirectoryName(format("redis-%s", getVersion())); @@ -48,12 +49,10 @@ public class RedisStoreSshDriver extends AbstractSoftwareProcessSshDriver implem List<String> commands = ImmutableList.<String>builder() .addAll(CommonCommands.downloadUrlAs(urls, saveAs)) .add(CommonCommands.INSTALL_TAR) - .add(CommonCommands.installPackage(MutableMap.of("apt", "libjemalloc-dev", "yum", "jemalloc-devel", "port", null, "brew", null), null)) .add("tar xzfv " + saveAs) .add(format("cd redis-%s", getVersion())) .add("make distclean") - .add("cd deps; make hiredis lua jemalloc linenoise; cd ..") - .add("make LDFLAGS=\"-all-static\"") + .add("make") .build(); newScript(INSTALLING)
