Download as
Browse Code »

Commit 253c50cddfcd0cc9ee2ca672991588e898317081

Authored by Jacob Vosmaer
1 parent 73544656
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Create explicit rugged and libgit2 dependencies 

This is needed to make sure libgit2 is compiled in an omnibus-friendly
way. When rugged gets updated in the gitlab-rails Gemfile in the future,
the omnibus-gitlab build will fail until the rugged version in
config/software/rugged.rb matches the gitlab-rails Gemfile.
Showing 3 changed files with 76 additions and 0 deletions   Show diff stats
config/software/gitlab-rails.rb
  Diff comments   View file @253c50c
... ... @@ -31,6 +31,7 @@ dependency "libicu"
31 31 dependency "postgresql"
32 32 dependency "python-docutils"
33 33 dependency "mysql-client" if EE
  34 +dependency "rugged"
34 35  
35 36 source :git => "https://gitlab.com/gitlab-org/gitlab-ce.git"
36 37  
... ...
config/software/libgit2.rb 0 → 100644
  Diff comments   View file @253c50c
... ... @@ -0,0 +1,47 @@
  1 +#
  2 +## Copyright:: Copyright (c) 2014 GitLab B.V.
  3 +## License:: Apache License, Version 2.0
  4 +##
  5 +## Licensed under the Apache License, Version 2.0 (the "License");
  6 +## you may not use this file except in compliance with the License.
  7 +## You may obtain a copy of the License at
  8 +##
  9 +## http://www.apache.org/licenses/LICENSE-2.0
  10 +##
  11 +## Unless required by applicable law or agreed to in writing, software
  12 +## distributed under the License is distributed on an "AS IS" BASIS,
  13 +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  14 +## See the License for the specific language governing permissions and
  15 +## limitations under the License.
  16 +##
  17 +#
  18 +
  19 +name "libgit2"
  20 +default_version "v0.21.1"
  21 +
  22 +source git: "git://github.com/libgit2/libgit2.git"
  23 +
  24 +dependency "zlib"
  25 +dependency "openssl"
  26 +
  27 +relative_path "libgit2"
  28 +
  29 +build_dir = "#{project_dir}/build"
  30 +
  31 +build do
  32 + env = with_standard_compiler_flags(with_embedded_path)
  33 + cmake_options = [
  34 + "-DCMAKE_SKIP_RPATH=YES",
  35 + "-DCMAKE_INSTALL_PREFIX=#{install_dir}/embedded",
  36 + "-DWITH_SSL=system",
  37 + "-DOPENSSL_INCLUDE_DIR:PATH=#{install_dir}/embedded/include",
  38 + "-DOPENSSL_LIBRARIES:FILEPATH=#{install_dir}/embedded/lib/libssl.so",
  39 + "-DWITH_ZLIB=system",
  40 + "-DZLIB_INCLUDE_DIR:PATH=#{install_dir}/embedded/include",
  41 + "-DZLIB_LIBRARY:FILEPATH=#{install_dir}/embedded/lib/libz.so",
  42 + "-DCRYPTO_LIBRARY:FILEPATH=#{install_dir}/embedded/lib/libcrypto.so",
  43 + ]
  44 + mkdir build_dir
  45 + command "cmake .. #{cmake_options.join(' ')}", env: env, cwd: build_dir
  46 + command "make -j #{max_build_jobs} install", env: env, cwd: build_dir
  47 +end
... ...
config/software/rugged.rb 0 → 100644
  Diff comments   View file @253c50c
... ... @@ -0,0 +1,28 @@
  1 +#
  2 +## Copyright:: Copyright (c) 2014 GitLab B.V.
  3 +## License:: Apache License, Version 2.0
  4 +##
  5 +## Licensed under the Apache License, Version 2.0 (the "License");
  6 +## you may not use this file except in compliance with the License.
  7 +## You may obtain a copy of the License at
  8 +##
  9 +## http://www.apache.org/licenses/LICENSE-2.0
  10 +##
  11 +## Unless required by applicable law or agreed to in writing, software
  12 +## distributed under the License is distributed on an "AS IS" BASIS,
  13 +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  14 +## See the License for the specific language governing permissions and
  15 +## limitations under the License.
  16 +##
  17 +#
  18 +
  19 +name "rugged"
  20 +default_version "0.21.0"
  21 +
  22 +dependency "ruby"
  23 +dependency "rubygems"
  24 +dependency "libgit2"
  25 +
  26 +build do
  27 + gem "install rugged --install-dir=#{install_dir}/embedded/service/gem/ruby/2.1.0 --no-rdoc --no-ri -v #{version} -- --use-system-libraries"
  28 +end
... ...