github/chromebrew
1
1
Fork 0
mirror of https://github.com/chromebrew/chromebrew.git synced 2026-01-09 15:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add gem binary build functionality and also refactor upload to use regex in lieu of sed (#10494)

Browse Source 
* Add initial plumbing for ruby gem-compiler use.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Add binary gem building to ruby buildsystem.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Refactor upload to avoid sed.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Add gem binary build plumbing to crew.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Add binary_compression to gems.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Add ruby gem binaries.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Move ruby_ruby_libversion to core.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Ruby gem update check should account for local versions.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Remove unused update_sha256 function.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Add no_compile_needed to ruby_rubocop.rb

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

* Remove ruby_gem_compiler from buildessential.

Signed-off-by: Satadru Pramanik <satadru@gmail.com>

---------

Signed-off-by: Satadru Pramanik <satadru@gmail.com>
This commit is contained in:
Satadru Pramanik, DO, MPH, MEng
2024-09-19 12:52:39 -04:00
committed by GitHub
parent 60a54a3441
commit 24cda80f45
20 changed files with 229 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
bin/crew
View File

@@ -470,7 +470,7 @@ def download
next if @pkg.no_source_build? && !@pkg.in_upgrade && !@pkg.in_install next if @pkg.no_source_build? && !@pkg.in_upgrade && !@pkg.in_install
case File.basename(filename) case File.basename(filename)
# Sources that download with our internal downloader # Sources that download with our internal downloader
when /\.zip$/i, /\.(tar(\.(gz|bz2|xz|lzma|lz|zst))?|tgz|tbz|tpxz|txz)$/i, /\.deb$/i, /\.AppImage$/i when /\.zip$/i, /\.(tar(\.(gz|bz2|xz|lzma|lz|zst))?|tgz|tbz|tpxz|txz)$/i, /\.deb$/i, /\.AppImage$/i, /\.gem$/i
# Recall file from cache if requested # Recall file from cache if requested
if CREW_CACHE_ENABLED if CREW_CACHE_ENABLED
puts "Looking for #{@pkg.name} archive in cache".orange if CREW_VERBOSE puts "Looking for #{@pkg.name} archive in cache".orange if CREW_VERBOSE
@@ -646,6 +646,10 @@ def unpack(meta)
puts "Unpacking 'AppImage' archive, this may take a while..." puts "Unpacking 'AppImage' archive, this may take a while..."
FileUtils.chmod 0o755, meta[:filename], verbose: @fileutils_verbose FileUtils.chmod 0o755, meta[:filename], verbose: @fileutils_verbose
system "../#{meta[:filename]}", '--appimage-extract', chdir: @extract_dir, exception: true system "../#{meta[:filename]}", '--appimage-extract', chdir: @extract_dir, exception: true
when /\.gem$/i
puts "Moving #{@pkg.gem_name} binary gem for install..."
gem_file = "#{@pkg.gem_name}-#{@pkg.gem_ver}-#{GEM_ARCH}.gem"
FileUtils.mv meta[:filename], File.join(@extract_dir, gem_file)
end end
end end
if meta[:source] if meta[:source]
@@ -668,14 +672,16 @@ def unpack(meta)
target_dir = @extract_dir target_dir = @extract_dir
end end
# Remove tarball to save space. # Remove tarball to save space.
FileUtils.rm_f meta[:filename], verbose: @fileutils_verbose FileUtils.rm_f meta[:filename], verbose: @fileutils_verbose if File.file?(meta[:filename])
end end
return File.join(CREW_BREW_DIR, target_dir) return File.join(CREW_BREW_DIR, target_dir)
end end
def build_and_preconfigure(target_dir) def build_and_preconfigure(target_dir)
Dir.chdir target_dir do Dir.chdir target_dir do
unless @pkg.no_compile_needed? if @pkg.gem_compile_needed?
puts 'Building binary gem...'
elsif !@pkg.no_compile_needed?
puts 'Building from source, this may take a while...' puts 'Building from source, this may take a while...'
# Load musl options only if package is targeted at the musl toolchain # Load musl options only if package is targeted at the musl toolchain
@@ -1236,16 +1242,26 @@ end
def install def install
@pkg.in_install = true @pkg.in_install = true
if !@pkg.in_upgrade && PackageUtils.installed?(@pkg.name) && !@pkg.name.start_with?('ruby_') if !@pkg.in_upgrade && PackageUtils.installed?(@pkg.name) && !@pkg.superclass.to_s == 'RUBY'
puts "Package #{@pkg.name} already installed, skipping...".lightgreen puts "Package #{@pkg.name} already installed, skipping...".lightgreen
return return
end end
install_start_time = Time.now.to_i install_start_time = Time.now.to_i
if @pkg.is_fake? || @pkg.name.start_with?('ruby_') if @pkg.is_fake?
# use CREW_DEST_DIR # use CREW_DEST_DIR
dest_dir = CREW_DEST_DIR dest_dir = CREW_DEST_DIR
elsif @pkg.superclass.to_s == 'RUBY'
meta = download
target_dir = unpack meta
gem_file = "#{@pkg.gem_name}-#{@pkg.gem_ver}-#{GEM_ARCH}.gem"
if File.file?(File.join(target_dir, gem_file))
FileUtils.mv File.join(target_dir, gem_file), File.join(CREW_DEST_DIR, gem_file)
else
build_and_preconfigure target_dir
end
dest_dir = CREW_DEST_DIR
else else
meta = download meta = download
target_dir = unpack meta target_dir = unpack meta
@@ -1289,8 +1305,10 @@ def install
pre_install dest_dir pre_install dest_dir
# perform install process # perform install process
if @pkg.name.start_with?('ruby_') if @pkg.superclass.to_s == 'RUBY'
@pkg.install Dir.chdir(target_dir) do
@pkg.install
end
else else
install_package dest_dir install_package dest_dir
end end
@@ -1340,20 +1358,21 @@ def resolve_dependencies_and_build
FileUtils.mkdir_p "#{CREW_BREW_DIR}/dest", verbose: @fileutils_verbose # this is a little ugly, feel free to find a better way FileUtils.mkdir_p "#{CREW_BREW_DIR}/dest", verbose: @fileutils_verbose # this is a little ugly, feel free to find a better way
end end
end end
puts "#{@pkg.name} is built!".lightgreen puts "#{@pkg.name.capitalize} is built!".lightgreen
@resolve_dependencies_and_build = 0 @resolve_dependencies_and_build = 0
end end
def build_package(crew_archive_dest) def build_package(crew_archive_dest)
# download source codes and unpack it # Download source code and unpack it.
meta = download meta = download
target_dir = unpack meta target_dir = unpack meta
# build from source and place binaries at CREW_DEST_DIR # Build from source and place binaries in CREW_DEST_DIR.
build_and_preconfigure target_dir build_and_preconfigure target_dir
# call check method here. this check method is called by this function only, # Call check method here. This check method is called by this function
# therefore it is possible place time consuming tests in the check method. # only, therefore it is possible to place time consuming tests in the
# check method.
if Dir.exist? target_dir if Dir.exist? target_dir
Dir.chdir target_dir do Dir.chdir target_dir do
@pkg.check @pkg.check
@@ -1361,16 +1380,20 @@ def build_package(crew_archive_dest)
end end
# prepare filelist and dlist at CREW_DEST_DIR # prepare filelist and dlist at CREW_DEST_DIR
prepare_package CREW_DEST_DIR prepare_package CREW_DEST_DIR unless @pkg.superclass.to_s == 'RUBY'
# build package from filelist, dlist and binary files in CREW_DEST_DIR # build package from filelist, dlist and binary files in CREW_DEST_DIR
puts 'Archiving...' puts 'Archiving...'
archive_package crew_archive_dest archive_package(crew_archive_dest)
end end
def archive_package(crew_archive_dest) def archive_package(crew_archive_dest)
if @pkg.superclass.to_s == 'RUBY'
gem_file = "#{@pkg.gem_name}-#{@pkg.gem_ver}-#{GEM_ARCH}.gem"
pkg_name = "#{@pkg.name}-#{@pkg.version}-chromeos-#{@device[:architecture]}.gem"
FileUtils.mv File.join(CREW_DEST_DIR, gem_file), File.join(crew_archive_dest, pkg_name)
# Only use zstd if it is available. # Only use zstd if it is available.
if @pkg.no_zstd? || !Kernel.system('which zstd', %i[out err] => File::NULL) elsif @pkg.no_zstd? || !Kernel.system('which zstd', %i[out err] => File::NULL)
puts 'Using xz to compress package. This may take some time.'.lightblue puts 'Using xz to compress package. This may take some time.'.lightblue
pkg_name = "#{@pkg.name}-#{@pkg.version}-chromeos-#{@device[:architecture]}.tar.xz" pkg_name = "#{@pkg.name}-#{@pkg.version}-chromeos-#{@device[:architecture]}.tar.xz"
Dir.chdir CREW_DEST_DIR do Dir.chdir CREW_DEST_DIR do
@@ -1416,7 +1439,15 @@ def upload(pkg_name = nil, pkg_version = nil, gitlab_token = nil, gitlab_token_u
[packages].each do |package| [packages].each do |package|
pkg_file = "#{CREW_LOCAL_REPO_ROOT}/packages/#{package}.rb" pkg_file = "#{CREW_LOCAL_REPO_ROOT}/packages/#{package}.rb"
binary_sha256_hash = { armv7l: nil, i686: nil, x86_64: nil }
# The following is used to figure out where a non-standard
# binary_sha256 section might be, such as in a gcc_lib file.
starting_binary_sha256_hash = { armv7l: nil, i686: nil, x86_64: nil }
binary_compression = 'gem' if @pkg.superclass.to_s == 'RUBY'
%w[x86_64 i686 armv7l].each do |arch| %w[x86_64 i686 armv7l].each do |arch|
# Load existing binary_sha256 hash from the package file.
binary_sha256_hash[arch.to_sym] = @pkg.binary_sha256[arch.to_sym] if @pkg.binary_sha256&.key?(arch.to_sym)
starting_binary_sha256_hash[arch.to_sym] = @pkg.binary_sha256[arch.to_sym] if @pkg.binary_sha256&.key?(arch.to_sym)
release_dir = "#{CREW_LOCAL_REPO_ROOT}/release/#{arch}" release_dir = "#{CREW_LOCAL_REPO_ROOT}/release/#{arch}"
new_tarfile = if binary_compression.nil? new_tarfile = if binary_compression.nil?
Dir["#{release_dir}/#{package}-#{pkg_version}-chromeos-#{arch}.{tar.xz,tar.zst}"].max_by { |f| File.mtime(f) } Dir["#{release_dir}/#{package}-#{pkg_version}-chromeos-#{arch}.{tar.xz,tar.zst}"].max_by { |f| File.mtime(f) }
@@ -1424,27 +1455,33 @@ def upload(pkg_name = nil, pkg_version = nil, gitlab_token = nil, gitlab_token_u
"#{release_dir}/#{package}-#{pkg_version}-chromeos-#{arch}.#{binary_compression}" "#{release_dir}/#{package}-#{pkg_version}-chromeos-#{arch}.#{binary_compression}"
end end
if new_tarfile.nil? || !File.file?(new_tarfile) if new_tarfile.nil? || !File.file?(new_tarfile)
puts "#{release_dir}/#{package}-#{pkg_version}-chromeos-#{arch}.(tar.xz|tar.zst) not found.\n".lightred puts "#{release_dir}/#{package}-#{pkg_version}-chromeos-#{arch}.#{binary_compression.nil? ? '(tar.xz|tar.zst)' : binary_compression} not found.\n".lightred
next next
end end
if binary_compression.nil? if binary_compression.nil?
ext = File.extname(new_tarfile) ext = File.extname(new_tarfile)
puts "Setting binary compression in #{pkg_file}..." binary_compression = @pkg.superclass.to_s == 'RUBY' ? 'gem' : "tar#{ext}"
binary_compression_line = " binary_compression '#{binary_compression}'"
puts "Setting binary compression in #{pkg_file} to '#{binary_compression}'..."
# Add binary compression setting, and add the line if it doesn't exist. # Add binary compression setting, and add the line if it doesn't exist.
if File.read(pkg_file).include?('binary_compression') file = File.read(pkg_file)
puts "sed -i \"s/binary_compression.*/binary_compression 'tar#{ext}'/\" #{pkg_file}" if CREW_VERBOSE bc_re = /^\ \ binary_compression.*/
system "sed -i \"s/binary_compression.*/binary_compression 'tar#{ext}'/\" #{pkg_file}" source_re = /^\ \ source_sha256.*/
elsif File.read(pkg_file).include?('source_sha256') git_hashtag_re = /^\ \ git_hashtag.*/
puts "sed -i \"/source_sha256/a \\\ \\\ binary_compression 'tar#{ext}'\" #{pkg_file}" if CREW_VERBOSE source_url_re = /^\ \ source_url.*/
system "sed -i \"/source_sha256/a \\\ \\\ binary_compression 'tar#{ext}'\" #{pkg_file}" if file.match(bc_re)
elsif File.read(pkg_file).include?('git_hashtag') File.write(pkg_file, file.gsub(bc_re, binary_compression_line))
puts "sed -i \"/git_hashtag/a \\\ \\\ binary_compression 'tar#{ext}'\" #{pkg_file}" if CREW_VERBOSE elsif file.match(source_re)
system "sed -i \"/git_hashtag/a \\\ \\\ binary_compression 'tar#{ext}'\" #{pkg_file}" source_sha256_bc_line = "#{file.match(source_re)}\n#{binary_compression_line}"
elsif File.read(pkg_file).include?('source_url') File.write(pkg_file, file.gsub(source_re, source_sha256_bc_line))
puts "sed -i \"/source_url/a \\\ \\\ binary_compression 'tar#{ext}'\" #{pkg_file}" if CREW_VERBOSE elsif file.match(git_hashtag_re)
system "sed -i \"/source_url/a \\\ \\\ binary_compression 'tar#{ext}'\" #{pkg_file}" git_hashtag_bc_line = "#{file.match(git_hashtag_re)}\n#{binary_compression_line}"
File.write(pkg_file, file.gsub(git_hashtag_re, git_hashtag_bc_line))
elsif file.match(source_url_re)
source_url_bc_line = "#{file.match(source_url_re)}\n#{binary_compression_line}"
File.write(pkg_file, file.gsub(source_url_re, source_url_bc_line))
else else
puts "Unable to tell where to add \"binary_compression 'tar#{ext}'\" to #{pkg_file}. Please add it and manually.".lightblue puts "Unable to tell where to add \"#{binary_compression_line}\" to #{pkg_file}. Please add it and manually.".lightblue
end end
end end
puts "Package: #{package}, Arch: #{arch}".yellow puts "Package: #{package}, Arch: #{arch}".yellow
@@ -1458,10 +1495,19 @@ def upload(pkg_name = nil, pkg_version = nil, gitlab_token = nil, gitlab_token_u
if `curl -sI #{new_url}`.lines.first.split[1] == '200' if `curl -sI #{new_url}`.lines.first.split[1] == '200'
puts "\n#{new_tarfile} has already been uploaded.\nPlease change the #{package} package version from #{new_version} and try again.\n".lightred puts "\n#{new_tarfile} has already been uploaded.\nPlease change the #{package} package version from #{new_version} and try again.\n".lightred
unless Package.agree_default_no('Do you want to overwrite the existing upload instead') if Package.agree_default_no('Do you want to overwrite the existing upload instead')
crewlog "#{arch} = #{new_sha256}"
binary_sha256_hash[arch.to_sym] = new_sha256
else
puts 'Will NOT overwite the existing upload.'.orange puts 'Will NOT overwite the existing upload.'.orange
upstream_sha256 = `curl -Ls #{new_url} | sha256sum`.chomp.split.first
crewlog "#{arch} = #{upstream_sha256}"
binary_sha256_hash[arch.to_sym] = upstream_sha256
next next
end end
else
crewlog "#{arch} = #{new_sha256}"
binary_sha256_hash[arch.to_sym] = new_sha256
end end
puts "curl -# --header \"#{token_label}: #{gitlab_token}\" --upload-file \"#{new_tarfile}\" \"#{new_url}\" | cat" if CREW_VERBOSE puts "curl -# --header \"#{token_label}: #{gitlab_token}\" --upload-file \"#{new_tarfile}\" \"#{new_url}\" | cat" if CREW_VERBOSE
@@ -1484,41 +1530,43 @@ def upload(pkg_name = nil, pkg_version = nil, gitlab_token = nil, gitlab_token_u
puts "#{output}. Unable to upload. Skipping binary_sha256 update in #{pkg_file}...".lightred puts "#{output}. Unable to upload. Skipping binary_sha256 update in #{pkg_file}...".lightred
next next
end end
old_sha256 = `grep -m 1 #{arch}: #{pkg_file} 2> /dev/null`.chomp
if old_sha256.empty?
unless File.readlines(pkg_file).grep(/binary_sha256/).any?
if CREW_VERBOSE
puts "sed -e '/binary_compression/ a\\
\\
\\ \\ binary_sha256({' -i #{pkg_file}"
end
system "sed -e '/binary_compression/ a\\
\\
\\ \\ binary_sha256({' -i #{pkg_file}"
end
puts "Adding binary_sha256 to #{pkg_file}..."
puts "#{arch}: '#{new_sha256}'"
unless new_sha256.empty?
update_sha256(pkg_file, arch, new_sha256)
update_sha256(pkg_file, 'aarch64', new_sha256) if arch.eql?('armv7l')
end
else
old_sha256 = old_sha256.split("'")[1]
if old_sha256 == new_sha256
puts "Skipping binary_sha256 update in #{pkg_file}..."
else
puts "Updating binary_sha256 in #{pkg_file}..."
puts "from: #{arch}: '#{old_sha256}'"
puts " to: #{arch}: '#{new_sha256}'"
puts "sed -i 's/#{old_sha256}/#{new_sha256}/g' #{pkg_file}" if CREW_VERBOSE
system "sed -i 's/#{old_sha256}/#{new_sha256}/g' #{pkg_file}"
end
end
end end
binary_sha256_block = ''
binary_sha256_block << "\n binary_sha256({\n"
unless binary_sha256_hash[:armv7l].nil?
binary_sha256_block << " aarch64: '#{binary_sha256_hash[:armv7l]}',\n"
binary_sha256_block << " armv7l: '#{binary_sha256_hash[:armv7l]}'"
binary_sha256_block << if binary_sha256_hash[:i686].nil? && binary_sha256_hash[:x86_64].nil?
"\n"
else
",\n"
end
end
unless binary_sha256_hash[:i686].nil?
binary_sha256_block << " i686: '#{binary_sha256_hash[:i686]}'"
binary_sha256_block << if binary_sha256_hash[:x86_64].nil?
"\n"
else
",\n"
end
end
binary_sha256_block << " x86_64: '#{binary_sha256_hash[:x86_64]}'\n" unless binary_sha256_hash[:x86_64].nil?
binary_sha256_block << ' })'
# Replace existing binary_sha256 block (found by looking for the old hash), otherwise add it.
binary_sha256_block_re = /\n^\s*(binary_sha256\(\{)(((?!binary_sha256).)*)#{starting_binary_sha256_hash.compact.values.join('.*')}(((?!\}\)).)*)\}\)/m
file = File.read(pkg_file)
if file.match(binary_sha256_block_re)
File.write(pkg_file, file.gsub(binary_sha256_block_re, "\n#{binary_sha256_block}"))
else
bc_re = /^\ \ binary_compression.*/
binary_sha256_block_with_bc = "#{file.match(bc_re)}\n#{binary_sha256_block}"
File.write(pkg_file, file.gsub(bc_re, binary_sha256_block_with_bc))
end
# Upload python wheels if we are dealing with a pip package, but only # Upload python wheels if we are dealing with a pip package, but only
# if a gitlab token username is set. (The generic repo does not # if a gitlab token username is set. (The generic repo does not
# require a gitlab token username.) # require a gitlab token username.)
next unless Kernel.system "grep -q \"^require 'buildsystems/pip'\" #{pkg_file}" next unless @pkg.superclass.to_s == 'Pip'
if gitlab_token_username.nil? if gitlab_token_username.nil?
puts "\nGITLAB_TOKEN_USERNAME environment variable not set, so generated python wheels will not be uploaded.\n".lightred puts "\nGITLAB_TOKEN_USERNAME environment variable not set, so generated python wheels will not be uploaded.\n".lightred
next package next package
@@ -1537,25 +1585,6 @@ def upload(pkg_name = nil, pkg_version = nil, gitlab_token = nil, gitlab_token_u
end end
end end
def update_sha256(package, key, value)
case key
when 'aarch64'
leading_space = '\\ \\ \\ \\ '
when 'armv7l', 'x86_64'
leading_space = '\\ \\ \\ \\ \\ '
when 'i686'
leading_space = '\\ \\ \\ \\ \\ \\ \\ '
end
comma = key == 'x86_64' ? '\\n\\ \\ })' : ','
if File.readlines(package).grep(/#{key}:/).any?
puts "sed -e \"/#{key}:.*['\"][0-9a-f]*['\"]/c#{leading_space}#{key}: '#{value}'#{comma}\" -i #{package}" if CREW_VERBOSE
system "sed -e \"/#{key}:.*['\"][0-9a-f]*['\"]/c#{leading_space}#{key}: '#{value}'#{comma}\" -i #{package}"
else
puts "sed -e \"/binary_sha256.*({/a#{leading_space}#{key}: '#{value}'#{comma}\" -i #{package}" if CREW_VERBOSE
system "sed -e \"/binary_sha256.*({/a#{leading_space}#{key}: '#{value}'#{comma}\" -i #{package}"
end
end
def copy_package(pkg_name, prompt_msg = '') def copy_package(pkg_name, prompt_msg = '')
pkg_file = File.join(CREW_LOCAL_REPO_ROOT, 'packages', "#{pkg_name}.rb") pkg_file = File.join(CREW_LOCAL_REPO_ROOT, 'packages', "#{pkg_name}.rb")
# Use rubocop to sanitize package file, and let errors get flagged. # Use rubocop to sanitize package file, and let errors get flagged.
@@ -1631,7 +1660,10 @@ def build_command(args)
# Process preflight block to see if package should be built # Process preflight block to see if package should be built
pre_flight pre_flight
if !@pkg.is_fake? && PackageUtils.compatible?(@pkg) && @pkg.source?(ARCH) && (@pkg.no_source_build? || @pkg.source_url.to_s.upcase != 'SKIP') && !@pkg.no_compile_needed? crewlog "!@pkg.is_fake? #{!@pkg.is_fake?} && PackageUtils.compatible?(@pkg) #{PackageUtils.compatible?(@pkg)} && @pkg.source?(ARCH): #{@pkg.source?(ARCH)}"
crewlog "(@pkg.no_source_build? #{@pkg.no_source_build?} || @pkg.source_url.to_s.upcase != 'SKIP' #{@pkg.source_url.to_s.upcase != 'SKIP'})"
crewlog "!@pkg.no_compile_needed? #{!@pkg.no_compile_needed?} && @pkg.gem_compile_needed? #{@pkg.gem_compile_needed?}"
if !@pkg.is_fake? && PackageUtils.compatible?(@pkg) && @pkg.source?(ARCH) && (@pkg.no_source_build? || @pkg.source_url.to_s.upcase != 'SKIP') && !@pkg.no_compile_needed? && @pkg.gem_compile_needed?
resolve_dependencies_and_build resolve_dependencies_and_build
else else
puts 'Unable to build a fake package. Skipping build.'.lightred if @pkg.is_fake? puts 'Unable to build a fake package. Skipping build.'.lightred if @pkg.is_fake?

3
lib/buildsystems/autotools.rb
View File

@@ -1,6 +1,5 @@
require 'fileutils' require 'fileutils'
require_relative '../const' require 'package'
require_relative '../package'
class Autotools < Package class Autotools < Package
property :configure_options, :pre_configure_options, :configure_build_extras, :configure_install_extras property :configure_options, :pre_configure_options, :configure_build_extras, :configure_install_extras

3
lib/buildsystems/cmake.rb
View File

@@ -1,5 +1,4 @@
require_relative '../const' require 'package'
require_relative '../package'
class CMake < Package class CMake < Package
property :cmake_build_extras, :cmake_build_relative_dir, :cmake_install_extras, :cmake_options, :pre_cmake_options property :cmake_build_extras, :cmake_build_relative_dir, :cmake_install_extras, :cmake_options, :pre_cmake_options

3
lib/buildsystems/meson.rb
View File

@@ -1,5 +1,4 @@
require_relative '../const' require 'package'
require_relative '../package'
class Meson < Package class Meson < Package
property :meson_options, :pre_meson_options, :meson_build_extras, :meson_install_extras property :meson_options, :pre_meson_options, :meson_build_extras, :meson_install_extras

3
lib/buildsystems/perl.rb
View File

@@ -1,5 +1,4 @@
require_relative '../const' require 'package'
require_relative '../package'
class PERL < Package class PERL < Package
property :pre_perl_options, :perl_build_extras, :perl_install_extras property :pre_perl_options, :perl_build_extras, :perl_install_extras

5
lib/buildsystems/pip.rb
View File

@@ -1,8 +1,7 @@
Encoding.default_external = Encoding::UTF_8 Encoding.default_external = Encoding::UTF_8
Encoding.default_internal = Encoding::UTF_8 Encoding.default_internal = Encoding::UTF_8
require 'json' require 'json'
require_relative '../const' require 'package'
require_relative '../package'
class Pip < Package class Pip < Package
property :pip_install_extras, :pre_configure_options property :pip_install_extras, :pre_configure_options
@@ -40,7 +39,7 @@ class Pip < Package
end end
puts "Installing #{@py_pkg} python module. This may take a while...".lightblue puts "Installing #{@py_pkg} python module. This may take a while...".lightblue
puts "Additional pre_configure_options being used: #{@pre_configure_options.nil? ? '<no pre_configure_options>' : @pre_configure_options}".orange puts "Additional pre_configure_options being used: #{@pre_configure_options.nil? ? '<no pre_configure_options>' : @pre_configure_options}".orange
puts "#{@py_pkg.capitalize} is configured to install a pre-release version." if prerelease puts "#{@py_pkg.capitalize} is configured to install a pre-release version." if prerelease?
system "MAKEFLAGS=-j#{CREW_NPROC} #{@pre_configure_options} python -s -m pip install --ignore-installed -U \"#{@py_pkg}==#{@py_pkg_chromebrew_version}\" | grep -v 'Requirement already satisfied'", exception: false system "MAKEFLAGS=-j#{CREW_NPROC} #{@pre_configure_options} python -s -m pip install --ignore-installed -U \"#{@py_pkg}==#{@py_pkg_chromebrew_version}\" | grep -v 'Requirement already satisfied'", exception: false
if @source_url == 'SKIP' if @source_url == 'SKIP'

3
lib/buildsystems/python.rb
View File

@@ -1,5 +1,4 @@
require_relative '../const' require 'package'
require_relative '../package'
class Python < Package class Python < Package
property :no_svem, :python_build_extras, :python_build_options, :python_build_relative_dir, :python_install_extras, :python_install_options property :no_svem, :python_build_extras, :python_build_options, :python_build_relative_dir, :python_install_extras, :python_install_options

3
lib/buildsystems/qmake.rb
View File

@@ -1,5 +1,4 @@
require_relative '../const' require 'package'
require_relative '../package'
class Qmake < Package class Qmake < Package
property :qmake_build_extras, :qmake_install_extras property :qmake_build_extras, :qmake_install_extras

60
lib/buildsystems/ruby.rb
View File

@@ -1,22 +1,58 @@
require_relative '../const' require 'active_support/core_ext/object/blank'
require_relative '../package' require 'color'
require 'package'
def check_gem_binary_build_needed(gem_name = nil, gem_ver = nil)
puts "Checking to see if gem compile for #{gem_name} is needed..."
@extract_dir = "#{name}.#{Time.now.utc.strftime('%Y%m%d%H%M%S')}.dir"
FileUtils.mkdir_p File.join(CREW_BREW_DIR, @extract_dir)
Dir.chdir(File.join(CREW_BREW_DIR, @extract_dir)) do
# Need to check if the gem has extensions. If it does, we need
# either a compiler or a pre-compiled binary gem.
system "gem fetch #{gem_name} --platform=ruby --version=#{gem_ver}"
system "gem unpack #{gem_name}-#{gem_ver}.gem"
return system "grep -q -r spec.extensions #{gem_name}-#{gem_ver}/*.gemspec", %i[out err] => File::NULL
end
end
def set_vars(passed_name = nil, passed_version = nil)
# crewlog "Setting gem variables... name: #{passed_name}, version: #{passed_version}"
# This assumes the package class name starts with 'Ruby_' and
# version is in the form '(gem version)-ruby-(ruby version)'.
# For example, name 'Ruby_awesome' and version '1.0.0-ruby-3.3'.
@gem_name = passed_name.sub('ruby_', '').sub('_', '-')
@gem_ver = passed_version.split('-').first.to_s
end
class RUBY < Package class RUBY < Package
property :ruby_install_extras property :gem_name, :gem_ver, :ruby_install_extras
depends_on 'ruby' depends_on 'ruby'
no_compile_needed def self.preflight
set_vars(name, version)
crewlog "@gem_name: #{@gem_name}, @gem_ver: #{@gem_ver}"
end
def self.preinstall
@gem_binary_build_needed = check_gem_binary_build_needed(@gem_name, @gem_version) unless no_compile_needed? || gem_compile_needed?
end
def self.build
return unless !no_compile_needed? || @gem_binary_build_needed
Kernel.system "gem fetch #{@gem_name} --platform=ruby --version=#{@gem_ver}"
Kernel.system "gem unpack #{@gem_name}-#{@gem_ver}.gem"
Kernel.system "gem compile --strip --prune #{@gem_name}-#{@gem_ver}.gem"
end
def self.install def self.install
# This assumes the package class name starts with 'Ruby_' and crewlog "no_compile_needed?: #{no_compile_needed?} @gem_binary_build_needed.blank?: #{@gem_binary_build_needed.blank?}, gem_compile_needed?: #{gem_compile_needed?}"
# version is in the form '(gem version)-ruby-(ruby version)'. puts "#{@gem_name.capitalize} needs a binary gem built!".orange unless @gem_binary_build_needed.blank?
# For example, name 'Ruby_awesome' and version '1.0.0-ruby-3.3'. if !no_compile_needed? || !@gem_binary_build_needed.blank? || gem_compile_needed?
@gem_name = name.sub('ruby_', '').sub('_', '-') FileUtils.cp "#{@gem_name}-#{@gem_ver}-#{GEM_ARCH}.gem", CREW_DEST_DIR if File.file?("#{@gem_name}-#{@gem_ver}-#{GEM_ARCH}.gem")
# We only report if @gem_ver is different than the current version reported by gem. system "gem install -N --local #{CREW_DEST_DIR}/#{@gem_name}-#{@gem_ver}-#{GEM_ARCH}.gem --conservative"
@gem_ver = version.split('-', 2).first.to_s elsif Kernel.system "gem list -i \"^#{@gem_name}\$\"", %i[out err] => File::NULL
@ruby_ver = version.split('-', 3).last.to_s
if Kernel.system "gem list -i \"^#{@gem_name}\$\"", %i[out err] => File::NULL
system "gem update -N #{@gem_name} --conservative" system "gem update -N #{@gem_name} --conservative"
else else
system "gem install -N #{@gem_name} --conservative" system "gem install -N #{@gem_name} --conservative"

11
lib/const.rb
View File

@@ -3,7 +3,7 @@
require 'etc' require 'etc'
OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0' OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0'
CREW_VERSION ||= '1.52.4' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION CREW_VERSION ||= '1.52.5' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
# Kernel architecture. # Kernel architecture.
KERN_ARCH ||= Etc.uname[:machine] KERN_ARCH ||= Etc.uname[:machine]
@@ -286,6 +286,15 @@ OPT
CREW_CMAKE_LIBSUFFIX_OPTIONS ||= "#{CREW_CMAKE_OPTIONS} -DLIB_SUFFIX=#{CREW_LIB_SUFFIX}" CREW_CMAKE_LIBSUFFIX_OPTIONS ||= "#{CREW_CMAKE_OPTIONS} -DLIB_SUFFIX=#{CREW_LIB_SUFFIX}"
GEM_ARCH ||= case ARCH
when 'x86_64'
'x86_64-linux'
when 'i686'
'x86-linux'
when 'aarch64', 'armv7l'
'armv8l-linux-eabihf'
end
PY3_SETUP_BUILD_OPTIONS ||= "--executable=#{CREW_PREFIX}/bin/python3" PY3_SETUP_BUILD_OPTIONS ||= "--executable=#{CREW_PREFIX}/bin/python3"
PY2_SETUP_BUILD_OPTIONS ||= "--executable=#{CREW_PREFIX}/bin/python2" PY2_SETUP_BUILD_OPTIONS ||= "--executable=#{CREW_PREFIX}/bin/python2"
PY_SETUP_INSTALL_OPTIONS_NO_SVEM ||= "--root=#{CREW_DEST_DIR} --prefix=#{CREW_PREFIX} -O2 --compile" PY_SETUP_INSTALL_OPTIONS_NO_SVEM ||= "--root=#{CREW_DEST_DIR} --prefix=#{CREW_PREFIX} -O2 --compile"

2
lib/package.rb
View File

@@ -42,7 +42,7 @@ def agree_with_default(yes_or_no_question_msg, character = nil, default:)
end end
class Package class Package
boolean_property :arch_flags_override, :conflicts_ok, :git_clone_deep, :git_fetchtags, :gnome, :is_fake, :is_musl, :is_static, boolean_property :arch_flags_override, :conflicts_ok, :git_clone_deep, :git_fetchtags, :gem_compile_needed, :gnome, :is_fake, :is_musl, :is_static,
:no_compile_needed, :no_compress, :no_env_options, :no_fhs, :no_git_submodules, :no_links, :no_lto, :no_patchelf, :no_compile_needed, :no_compress, :no_env_options, :no_fhs, :no_git_submodules, :no_links, :no_lto, :no_patchelf,
:no_shrink, :no_source_build, :no_strip, :no_upstream_update, :no_zstd, :patchelf, :prerelease, :print_source_bashrc, :run_tests :no_shrink, :no_source_build, :no_strip, :no_upstream_update, :no_zstd, :patchelf, :prerelease, :print_source_bashrc, :run_tests

4
packages/buildessential.rb
View File

@@ -3,7 +3,7 @@ require 'package'
class Buildessential < Package class Buildessential < Package
description 'A collection of tools essential to compile and build software.' description 'A collection of tools essential to compile and build software.'
homepage 'SKIP' homepage 'SKIP'
version '1.37' version '1.38'
license 'GPL-3+' license 'GPL-3+'
compatibility 'all' compatibility 'all'
@@ -177,8 +177,6 @@ class Buildessential < Package
# Add rubocop for linting packages. (This also installs the # Add rubocop for linting packages. (This also installs the
# rubocop config file.) # rubocop config file.)
depends_on 'ruby_rubocop' depends_on 'ruby_rubocop'
# crew check -V breaks without this.
depends_on 'ruby_ruby_libversion'
# Code quality # Code quality
depends_on 'py3_pre_commit' depends_on 'py3_pre_commit'

6
packages/core.rb
View File

@@ -3,7 +3,7 @@ require 'package'
class Core < Package class Core < Package
description 'Core Chromebrew Packages.' description 'Core Chromebrew Packages.'
homepage 'https://github.com/chromebrew/chromebrew' homepage 'https://github.com/chromebrew/chromebrew'
version '2.9' version '3.0'
license 'GPL-3+' license 'GPL-3+'
compatibility 'all' compatibility 'all'
@@ -80,10 +80,14 @@ class Core < Package
depends_on 'ruby' depends_on 'ruby'
depends_on 'ruby_activesupport' depends_on 'ruby_activesupport'
depends_on 'ruby_concurrent_ruby' depends_on 'ruby_concurrent_ruby'
# Allows for building binary gems if necessary.
depends_on 'ruby_gem_compiler'
# For use in ruby prompts. # For use in ruby prompts.
depends_on 'ruby_highline' depends_on 'ruby_highline'
# This contains the debugger config files. # This contains the debugger config files.
depends_on 'ruby_pry' depends_on 'ruby_pry'
# crew check -V breaks without this.
depends_on 'ruby_ruby_libversion'
depends_on 'slang' depends_on 'slang'
depends_on 'sqlite' depends_on 'sqlite'
depends_on 'uchardet' depends_on 'uchardet'

1
packages/ruby.rb
View File

@@ -67,6 +67,5 @@ class Ruby < Package
puts 'Updating ruby gems. This may take a while...' puts 'Updating ruby gems. This may take a while...'
silent = @opt_verbose ? '' : '--silent' silent = @opt_verbose ? '' : '--silent'
system "gem update #{silent} -N --system", exception: false system "gem update #{silent} -N --system", exception: false
system 'gem pristine --all', exception: false
end end
end end

11
packages/ruby_debug.rb
View File

@@ -7,7 +7,16 @@ class Ruby_debug < RUBY
license 'MIT' license 'MIT'
compatibility 'all' compatibility 'all'
source_url 'SKIP' source_url 'SKIP'
binary_compression 'gem'
binary_sha256({
aarch64: '6b7344390da0b795d379c4e95ce41242a6392324a9c1f5e27bbba9a4b01a792a',
armv7l: '6b7344390da0b795d379c4e95ce41242a6392324a9c1f5e27bbba9a4b01a792a',
i686: '149ddb718f60aba21ca7aa3370df2e650d2b316117285b29c7de158da91711f7',
x86_64: 'ec3e4a33ea6dd305c666c641e510b891816483116313e7c35d683b2dbcabd035'
})
conflicts_ok conflicts_ok
no_compile_needed gem_compile_needed
no_source_build
end end

13
packages/ruby_gem_compiler.rb Normal file
View File

@@ -0,0 +1,13 @@
require 'buildsystems/ruby'
class Ruby_gem_compiler < RUBY
description 'Gem-compiler is a plugin that helps generates binary gems from already existing ones without altering the original source code.'
homepage 'https://github.com/luislavena/gem-compiler'
version '0.9.0-ruby-3.3'
license 'MIT'
compatibility 'all'
source_url 'SKIP'
conflicts_ok
no_compile_needed
end

2
packages/ruby_rubocop.rb
View File

@@ -15,6 +15,6 @@ class Ruby_rubocop < RUBY
depends_on 'xdg_base' depends_on 'xdg_base'
conflicts_ok conflicts_ok
no_compile_needed
no_fhs no_fhs
no_compile_needed
end end

14
packages/ruby_ruby_libversion.rb
View File

@@ -3,12 +3,20 @@ require 'buildsystems/ruby'
class Ruby_ruby_libversion < RUBY class Ruby_ruby_libversion < RUBY
description 'Ruby bindings for libversion.' description 'Ruby bindings for libversion.'
homepage 'https://github.com/Zopolis4/ruby-libversion' homepage 'https://github.com/Zopolis4/ruby-libversion'
version '1.0.0-ruby-3.3' version '1.0.0-1-ruby-3.3'
license 'MIT' license 'MIT'
compatibility 'all' compatibility 'all'
source_url 'SKIP' source_url 'SKIP'
binary_compression 'gem'
binary_sha256({
aarch64: '694e8851a3a5f683fe2b13d3021857d13377a666681db13f9921d704fb23eead',
armv7l: '694e8851a3a5f683fe2b13d3021857d13377a666681db13f9921d704fb23eead',
i686: 'e811dc6dbf8237b43736535722d29c0a1241ce6cf6d5120a61d412d569194986',
x86_64: 'f52ded350de72587350361049a671e19a9d387e41ceac582a83b3d7bb50db234'
})
depends_on 'libversion' # R depends_on 'libversion' # R
gem_compile_needed
no_compile_needed no_source_build
end end

5
tools/packages.yaml
View File

@@ -7891,6 +7891,11 @@ url: https://github.com/docopt/docopt/releases
activity: none activity: none
--- ---
kind: url kind: url
name: ruby_gem_compiler
url: https://github.com/luislavena/gem-compiler/releases
activity: low
---
kind: url
name: ruby_glib2 name: ruby_glib2
url: https://rubygems.org/gems/glib2 url: https://rubygems.org/gems/glib2
activity: medium activity: medium

4
tools/update_ruby_gem_packages.rb
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
# update_ruby_gem_packages version 1.2 (for Chromebrew) # update_ruby_gem_packages version 1.3 (for Chromebrew)
# Author: Satadru Pramanik (satmandu) satadru at gmail dot com # Author: Satadru Pramanik (satmandu) satadru at gmail dot com
# Usage in root of cloned chromebrew repo: # Usage in root of cloned chromebrew repo:
# tools/update_ruby_gem_packages.rb # tools/update_ruby_gem_packages.rb
@@ -41,7 +41,7 @@ relevant_gem_packages.each_with_index do |package, index|
pool.post do pool.post do
gem_name = package.gsub('.rb', '').sub('ruby_', '').gsub('_', '-').gsub('packages/', '') gem_name = package.gsub('.rb', '').sub('ruby_', '').gsub('_', '-').gsub('packages/', '')
puts "[#{(index + 1).to_s.rjust(numlength)}/#{total_files_to_check}] Checking rubygems for updates to #{gem_name}...".orange puts "[#{(index + 1).to_s.rjust(numlength)}/#{total_files_to_check}] Checking rubygems for updates to #{gem_name}...".orange
pkg_version = `sed -n -e 's/^\ \ version //p' #{package}`.chomp.delete("'").delete('"').gsub(ruby_ver_string, '') pkg_version = `sed -n -e 's/^\ \ version //p' #{package}`.chomp.delete("'").delete('"').gsub(ruby_ver_string, '').split('-').first
gem_version = Gem.latest_spec_for(gem_name).version.to_s gem_version = Gem.latest_spec_for(gem_name).version.to_s
next package if gem_version.blank? next package if gem_version.blank?
if Gem::Version.new(gem_version) > Gem::Version.new(pkg_version) if Gem::Version.new(gem_version) > Gem::Version.new(pkg_version)