From 27b02395a75b64246f2dc21a036704d3cba73541 Mon Sep 17 00:00:00 2001 From: ArangoDB Release BOT Date: Fri, 18 Nov 2016 14:02:42 +0100 Subject: [PATCH] arangodb 3.1.1 Closes #7053. Signed-off-by: ilovezfs --- Formula/arangodb.rb | 61 ++++----------------------------------------- 1 file changed, 5 insertions(+), 56 deletions(-) diff --git a/Formula/arangodb.rb b/Formula/arangodb.rb index 539dce23c9..96bacbc062 100644 --- a/Formula/arangodb.rb +++ b/Formula/arangodb.rb @@ -1,8 +1,8 @@ class Arangodb < Formula desc "The Multi-Model NoSQL Database." homepage "https://www.arangodb.com/" - url "https://www.arangodb.com/repositories/Source/ArangoDB-3.0.10.tar.gz" - sha256 "d8da3e5948d5ba7591c50a093bbd5302ce5a6f524b6797b724e7f4f3644e4628" + url "https://www.arangodb.com/repositories/Source/ArangoDB-3.1.1.tar.gz" + sha256 "404bf36b1682337184ad5b8b1a79a8d25848916338ea18a1f47fd248517bb77f" head "https://github.com/arangodb/arangodb.git", :branch => "unstable" bottle do @@ -23,49 +23,18 @@ class Arangodb < Formula cause "Fails with compile errors" end - resource "arangodb2" do - url "https://www.arangodb.com/repositories/Source/ArangoDB-2.8.10.tar.gz" - sha256 "3a455e9d6093739660ad79bd3369652db79f3dabd9ae02faca1b014c9aa220f4" - end - - resource "upgrade" do - url "https://www.arangodb.com/repositories/Source/upgrade3-1.0.0.tar.gz" - sha256 "965f899685e420530bb3c68ada903c815ebd0aa55e477d6949abba9506574011" - end - def install ENV.cxx11 - (libexec/"arangodb2/bin").install resource("upgrade") - - resource("arangodb2").stage do - ENV.cxx11 - - args = %W[ - --disable-dependency-tracking - --prefix=#{libexec}/arangodb2 - --disable-relative - --localstatedir=#{var} - --program-suffix=-2.8 - ] - - if ENV.compiler == "gcc-6" - ENV.append "CXXFLAGS", "-O2 -g -fno-delete-null-pointer-checks" - inreplace "3rdParty/Makefile.v8", "CXXFLAGS=\"", "CXXFLAGS=\"-fno-delete-null-pointer-checks " - end - - system "./configure", *args - system "make", "install" - end - mkdir "build" do args = std_cmake_args + %W[ -DHOMEBREW=ON -DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF -DASM_OPTIMIZATIONS=OFF -DCMAKE_INSTALL_DATADIR=#{share} - -DETCDIR=#{etc} - -DVARDIR=#{var} + -DCMAKE_INSTALL_DATAROOTDIR=#{share} + -DCMAKE_INSTALL_SYSCONFDIR=#{etc} + -DCMAKE_INSTALL_LOCALSTATEDIR=#{var} ] if ENV.compiler == "gcc-6" @@ -82,32 +51,12 @@ class Arangodb < Formula end def post_install - oldpath_prefix = "#{HOMEBREW_PREFIX}/Cellar/arangodb/3.0." - oldpath_regexp = /#{Regexp.escape(oldpath_prefix)}[12]/ - - %w[arangod arango-dfdb arangosh foxx-manager].each do |f| - inreplace etc/"arangodb3/#{f}.conf", oldpath_regexp, opt_prefix, false - end - (var/"lib/arangodb3").mkpath (var/"log/arangodb3").mkpath - - args = %W[ - #{libexec}/arangodb2 - #{var}/lib/arangodb - #{opt_prefix} - #{var}/lib/arangodb3 - ] - - system libexec/"arangodb2/bin/upgrade.sh", *args end def caveats s = <<-EOS.undent - The database format between ArangoDB 2.x and ArangoDB 3.x has - been changed, please checkout - https://docs.arangodb.com/3.0/Manual/Administration/Upgrading/index.html - An empty password has been set. Please change it by executing #{opt_sbin}/arango-secure-installation EOS