github/chromebrew
1
1
Fork 0
mirror of https://github.com/chromebrew/chromebrew.git synced 2026-01-10 07:57:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove trailing slashes from const.rb (#9016)

Browse Source 
* remove trailing slash from CREW_DEST_DIR

* remove trailing slash from CREW_META_PATH

* remove trailing slash from CREW_MAN_PREFIX

* remove trailing slash from CREW_PACKAGES_PATH

* remove trailing slash from CREW_LIB_PATH

* remove trailing slash from CREW_CONFIG_PATH

* remove trailing slash from CREW_BREW_DIR

* remove trailing slash from CREW_WINE_PREFIX

* fixup

* suggested changes
This commit is contained in:
Satadru Pramanik, DO, MPH, MEng
2023-11-29 17:00:40 -05:00
committed by GitHub
parent 71047d0b26
commit d3af5eaa4d
41 changed files with 88 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
bin/crew
View File

@@ -214,13 +214,13 @@ def set_package(pkgName, pkgPath)
end
def list_packages
Dir["#{CREW_PACKAGES_PATH}*.rb"].each do |filename|
Dir["#{CREW_PACKAGES_PATH}/*.rb"].each do |filename|
print_package filename
end
end
def list_available
Dir["#{CREW_PACKAGES_PATH}*.rb"].each do |filename|
Dir["#{CREW_PACKAGES_PATH}/*.rb"].each do |filename|
pkgName = File.basename(filename, '.rb')
filelist = File.join(CREW_META_PATH, "#{pkgName}.filelist")
notInstalled = !File.file?(filelist)
@@ -252,18 +252,18 @@ def list_installed
end
print "\n"
else
Dir["#{CREW_META_PATH}*.directorylist"].map do |f|
Dir["#{CREW_META_PATH}/*.directorylist"].map do |f|
File.basename(f, '.directorylist').lightgreen
end
end
end
def list_compatible(compat = true)
Dir["#{CREW_PACKAGES_PATH}*.rb"].each do |filename|
Dir["#{CREW_PACKAGES_PATH}/*.rb"].each do |filename|
pkgName = File.basename filename, '.rb'
if @device[:compatible_packages].any? { |elem| elem[:name] == pkgName }
if compat
if File.file? "#{CREW_META_PATH}#{pkgName}.filelist"
if File.file? "#{CREW_META_PATH}/#{pkgName}.filelist"
puts pkgName.lightgreen
else
puts pkgName
@@ -278,7 +278,7 @@ end
def generate_compatible
puts 'Generating compatible packages...'.orange if @opt_verbose
@device[:compatible_packages] = []
Dir["#{CREW_PACKAGES_PATH}*.rb"].each do |filename|
Dir["#{CREW_PACKAGES_PATH}/*.rb"].each do |filename|
pkgName = File.basename filename, '.rb'
begin
set_package pkgName, filename
@@ -294,7 +294,7 @@ def generate_compatible
puts "#{pkgName} is not a compatible package.".lightred
end
end
File.open("#{CREW_CONFIG_PATH}device.json", 'w') do |file|
File.open(File.join(CREW_CONFIG_PATH, 'device.json'), 'w') do |file|
output = JSON.parse @device.to_json
file.write JSON.pretty_generate(output)
end
@@ -317,11 +317,11 @@ end
def regexp_search(pkgPat)
re = Regexp.new(pkgPat, true)
results = Dir["#{CREW_PACKAGES_PATH}*.rb"] \
results = Dir["#{CREW_PACKAGES_PATH}/*.rb"] \
.select { |f| File.basename(f, '.rb') =~ re } \
.each { |f| print_package(f, @opt_verbose) }
if results.empty?
Dir["#{CREW_PACKAGES_PATH}*.rb"].each do |packagePath|
Dir["#{CREW_PACKAGES_PATH}/*.rb"].each do |packagePath|
packageName = File.basename packagePath, '.rb'
begin
set_package packageName, packagePath
@@ -993,7 +993,7 @@ def build_and_preconfigure(target_dir)
puts 'Building from source, this may take a while...'
# Load musl options only if package is targeted at the musl toolchain
load "#{CREW_LIB_PATH}lib/musl.rb" if @pkg.is_musl?
load "#{CREW_LIB_PATH}/lib/musl.rb" if @pkg.is_musl?
end
@pkg.in_build = true
@@ -1067,15 +1067,15 @@ end
def determine_conflicts(dir, pkg)
conflicts = []
if File.file?("#{dir}/filelist")
if File.file?("#{CREW_META_PATH}#{pkg}.filelist")
if File.file?(File.join(CREW_META_PATH, "#{pkg}.filelist"))
puts 'Checking for conflicts with files from installed packages...'.orange
conflictscmd = `grep --exclude=#{CREW_META_PATH}#{pkg}.filelist --exclude=#{CREW_META_PATH}\\\*_build.filelist -Fxf #{dir}/filelist #{CREW_META_PATH}*.filelist`
conflictscmd = `grep --exclude=#{File.join(CREW_META_PATH, "#{pkg}.filelist")} --exclude=#{CREW_META_PATH}/\\\*_build.filelist -Fxf #{dir}/filelist #{CREW_META_PATH}/*.filelist`
conflicts = conflictscmd.gsub(/(\.filelist|#{CREW_META_PATH})/, '').split("\n")
conflicts.reject!(&:empty?)
end
elsif File.file?("#{CREW_META_PATH}#{pkg}.filelist")
elsif File.file?(File.join(CREW_META_PATH, "#{pkg}.filelist"))
puts "Checking for conflicts of #{pkg} with files from installed packages...".orange
conflictscmd = `grep --exclude=#{CREW_META_PATH}#{pkg}.filelist --exclude=#{CREW_META_PATH}\\\*_build.filelist -Fxf #{CREW_META_PATH}#{pkg}.filelist #{CREW_META_PATH}*.filelist`
conflictscmd = `grep --exclude=#{File.join(CREW_META_PATH, "#{pkg}.filelist")} --exclude=#{CREW_META_PATH}/\\\*_build.filelist -Fxf #{File.join(CREW_META_PATH, "#{pkg}.filelist")} #{CREW_META_PATH}/*.filelist`
conflicts = conflictscmd.gsub(/(\.filelist|#{CREW_META_PATH})/, '').split("\n")
conflicts.reject!(&:empty?)
end
@@ -1387,8 +1387,8 @@ def install_package(pkgdir)
# install filelist, dlist and binary files
puts 'Performing install...'
FileUtils.mv 'dlist', "#{CREW_META_PATH}#{@pkg.name}.directorylist", verbose: @fileutils_verbose
FileUtils.mv 'filelist', "#{CREW_META_PATH}#{@pkg.name}.filelist", verbose: @fileutils_verbose
FileUtils.mv 'dlist', File.join(CREW_META_PATH, "#{@pkg.name}.directorylist"), verbose: @fileutils_verbose
FileUtils.mv 'filelist', File.join(CREW_META_PATH, "#{@pkg.name}.filelist"), verbose: @fileutils_verbose
unless CREW_NOT_LINKS || @pkg.no_links?
@brokensymlinks = nil
@@ -1572,7 +1572,7 @@ def install
# If this fails, the install should fail before we create any
# damage, and we should roughly be at maximal disk space usage at this
# point anyways.
FileUtils.cp "#{CREW_CONFIG_PATH}device.json", "#{CREW_CONFIG_PATH}device.json.tmp"
FileUtils.cp File.join(CREW_CONFIG_PATH, 'device.json'), "#{CREW_CONFIG_PATH}/device.json.tmp"
# remove it just before the file copy
if @pkg.in_upgrade
@@ -1595,13 +1595,13 @@ def install
# add to installed packages
@device[:installed_packages].push(name: @pkg.name, version: @pkg.version, binary_sha256: @pkg.get_binary_sha256(@device[:architecture]))
File.open("#{CREW_CONFIG_PATH}device.json.tmp", 'w') do |file|
File.open("#{CREW_CONFIG_PATH}/device.json.tmp", 'w') do |file|
output = JSON.parse @device.to_json
file.write JSON.pretty_generate(output)
end
# Copy over original if the write to the tmp file succeeds.
FileUtils.cp "#{CREW_CONFIG_PATH}device.json.tmp", "#{CREW_CONFIG_PATH}device.json"
FileUtils.rm "#{CREW_CONFIG_PATH}device.json.tmp"
FileUtils.cp "#{CREW_CONFIG_PATH}/device.json.tmp", File.join(CREW_CONFIG_PATH, 'device.json')
FileUtils.rm "#{CREW_CONFIG_PATH}/device.json.tmp"
end
def resolve_dependencies_and_build
@@ -1692,7 +1692,7 @@ end
def remove(pkgName)
# make sure the package is actually installed
unless @device[:installed_packages].any? { |pkg| pkg[:name] == pkgName } || File.file?("#{CREW_META_PATH}#{pkgName}.filelist")
unless @device[:installed_packages].any? { |pkg| pkg[:name] == pkgName } || File.file?(File.join(CREW_META_PATH, "#{pkgName}.filelist"))
puts "Package #{pkgName} isn't installed.".lightred
return
end
@@ -1717,7 +1717,7 @@ def remove(pkgName)
conflicts = determine_conflicts(Dir.pwd, pkgName)
# if the filelist exists, remove the files and directories installed by the package
if File.file?("#{CREW_META_PATH}#{pkgName}.filelist")
if File.file?(File.join(CREW_META_PATH, "#{pkgName}.filelist"))
Dir.chdir CREW_CONFIG_PATH do
# remove all files installed by the package
File.foreach("meta/#{pkgName}.filelist", chomp: true) do |line|

18
lib/const.rb
View File

@@ -1,7 +1,7 @@
# lib/const.rb
# Defines common constants used in different parts of crew
CREW_VERSION = '1.40.1'
CREW_VERSION = '1.40.2'
# kernel architecture
KERN_ARCH = `uname -m`.chomp
@@ -90,14 +90,14 @@ else
end
CREW_LIB_PREFIX = File.join(CREW_PREFIX, ARCH_LIB)
CREW_MAN_PREFIX = File.join(CREW_PREFIX, 'share/man/')
CREW_LIB_PATH = File.join(CREW_PREFIX, 'lib/crew/')
CREW_PACKAGES_PATH = File.join(CREW_LIB_PATH, 'packages/')
CREW_CONFIG_PATH = File.join(CREW_PREFIX, 'etc/crew/')
CREW_META_PATH = File.join(CREW_CONFIG_PATH, 'meta/')
CREW_BREW_DIR = File.join(CREW_PREFIX, 'tmp/crew/')
CREW_DEST_DIR = File.join(CREW_BREW_DIR, 'dest/')
CREW_WINE_PREFIX = File.join(CREW_LIB_PREFIX, 'wine/')
CREW_MAN_PREFIX = File.join(CREW_PREFIX, 'share/man')
CREW_LIB_PATH = File.join(CREW_PREFIX, 'lib/crew')
CREW_PACKAGES_PATH = File.join(CREW_LIB_PATH, 'packages')
CREW_CONFIG_PATH = File.join(CREW_PREFIX, 'etc/crew')
CREW_META_PATH = File.join(CREW_CONFIG_PATH, 'meta')
CREW_BREW_DIR = File.join(CREW_PREFIX, 'tmp/crew')
CREW_DEST_DIR = File.join(CREW_BREW_DIR, 'dest')
CREW_WINE_PREFIX = File.join(CREW_LIB_PREFIX, 'wine')
CREW_DEST_PREFIX = File.join(CREW_DEST_DIR, CREW_PREFIX)
CREW_DEST_LIB_PREFIX = File.join(CREW_DEST_DIR, CREW_LIB_PREFIX)
CREW_DEST_WINE_PREFIX = File.join(CREW_DEST_PREFIX, CREW_WINE_PREFIX)

2
lib/fixup.rb
View File

@@ -147,7 +147,7 @@ end
CREW_CONST_GIT_COMMIT = '0000' unless defined?(CREW_CONST_GIT_COMMIT)
Dir.chdir CREW_LIB_PATH do
@new_const_git_commit = `git log -n1 --oneline #{CREW_LIB_PATH}lib/const.rb`.chomp.split.first
@new_const_git_commit = `git log -n1 --oneline #{CREW_LIB_PATH}/lib/const.rb`.chomp.split.first
end
unless @new_const_git_commit == CREW_CONST_GIT_COMMIT

2
lib/musl.rb
View File

@@ -1,7 +1,7 @@
ENV['CREW_DISABLE_ENV_OPTIONS'] = '1'
warn_level = $VERBOSE
$VERBOSE = nil
load "#{CREW_LIB_PATH}lib/const.rb"
load "#{CREW_LIB_PATH}/lib/const.rb"
# Defines common musl build constants used in musl builds
MUSL_ARCH_SSP_CFLAGS = ''
MUSL_ARCH_C_FLAGS = ''

13
packages/freedos.rb
View File

@@ -26,10 +26,8 @@ class Freedos < Package
end
# See https://opensource.com/article/17/10/run-dos-applications-linux.
system 'mkdir -p $HOME/dosfiles'
system "mkdir -p #{CREW_DEST_DIR}$HOME/dosfiles"
system 'curl -#LO https://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.2/FD12CD.iso'
abort 'Checksum mismatch. :/ Try again.'.lightred unless Digest::SHA256.hexdigest(File.read('FD12CD.iso')) == '6c7f6aad72ab16c592e879367d1ed463047e3b7c94e1828e1ddadb680d461bc3'
FileUtils.mkdir_p "#{CREW_DEST_HOME}/dosfiles"
downloader 'https://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.2/FD12CD.iso', '6c7f6aad72ab16c592e879367d1ed463047e3b7c94e1828e1ddadb680d461bc3'
system "qemu-img create freedos.img #{mb}M"
system 'qemu-system-i386 -m 16 -k en-us -rtc base=localtime -soundhw all -device cirrus-vga -display gtk -hda freedos.img -cdrom FD12CD.iso -boot order=d'
system "echo '#!/bin/bash' > freedos"
@@ -37,16 +35,15 @@ class Freedos < Package
end
def self.install
system "install -Dm755 freedos #{CREW_DEST_PREFIX}/bin/freedos"
system "install -Dm644 freedos.img #{CREW_DEST_PREFIX}$HOME/freedos.img"
system 'install -Dm644 freedos.img $HOME/freedos.img'
FileUtils.install 'freedos', "#{CREW_DEST_PREFIX}/bin/freedos", mode: 0o755
FileUtils.install 'freedos.img', "#{CREW_DEST_HOME}/freedos.img", mode: 0o644
end
def self.postinstall
puts
puts "Type 'freedos' to start.".lightblue
puts
puts 'Add files to $HOME/dosfiles.'.lightblue
puts "Add files to #{HOME}/dosfiles.".lightblue
puts
end
end

2
packages/gcc_dev.rb
View File

@@ -47,7 +47,7 @@ class Gcc_dev < Package
@filelist.each do |filename|
next if filename.include?('.so') && !filename.include?('libgccjit')
@destpath = "#{CREW_DEST_DIR.chomp('/')}#{filename}"
@destpath = File.join(CREW_DEST_DIR, filename)
@filename_target = File.realpath(filename)
FileUtils.install @filename_target, @destpath
end

2
packages/gcc_lib.rb
View File

@@ -39,7 +39,7 @@ class Gcc_lib < Package
@filelist.each do |filename|
next unless filename.include?('.so') && !filename.include?('libgccjit')
@destpath = "#{CREW_DEST_DIR.chomp('/')}#{filename}"
@destpath = File.join(CREW_DEST_DIR, filename)
@filename_target = File.realpath(filename)
FileUtils.install @filename_target, @destpath
end

8
packages/gdb.rb
View File

@@ -77,11 +77,11 @@ class Gdb < Package
FileUtils.rm_f "#{CREW_DEST_PREFIX}/share/info/bfd.info"
conflict_packages = %w[binutils]
conflict_packages.each do |package|
file = File.read("#{CREW_META_PATH}#{package}.filelist")
file = File.read(File.join(CREW_META_PATH, "#{package}.filelist"))
file.each_line do |line|
if File.exist?("#{CREW_DEST_DIR}#{line}")
FileUtils.rm_f "#{CREW_DEST_DIR}#{line}"
puts "Removed #{CREW_DEST_DIR}#{line}"
if File.exist?("#{CREW_DEST_DIR}/#{line}")
FileUtils.rm_f "#{CREW_DEST_DIR}/#{line}"
puts "Removed #{CREW_DEST_DIR}/#{line}"
end
end
end

2
packages/glibc_build223.rb
View File

@@ -226,7 +226,7 @@ class Glibc_build223 < Package
Dir.chdir 'glibc_build' do
# gold linker does not work for glibc 2.23, and maybe others.
FileUtils.mkdir_p 'binutils'
@binutils = File.readlines("#{CREW_META_PATH}binutils.filelist")
@binutils = File.readlines(File.join(CREW_META_PATH, 'binutils.filelist'))
@binutils.each do |bin|
FileUtils.cp bin.chomp, "binutils/#{File.basename(bin.chomp)}" if bin['/bin/']
end

2
packages/glibc_build227.rb
View File

@@ -230,7 +230,7 @@ class Glibc_build227 < Package
Dir.chdir 'glibc_build' do
# gold linker does not work for glibc 2.23, and maybe others.
FileUtils.mkdir_p 'binutils'
@binutils = File.readlines("#{CREW_META_PATH}binutils.filelist")
@binutils = File.readlines(File.join(CREW_META_PATH, 'binutils.filelist'))
@binutils.each do |bin|
FileUtils.cp bin.chomp, "binutils/#{File.basename(bin.chomp)}" if bin['/bin/']
end

2
packages/glibc_build232.rb
View File

@@ -64,7 +64,7 @@ class Glibc_build232 < Package
Dir.chdir 'glibc_build' do
# gold linker does not work for glibc 2.23, and maybe others.
FileUtils.mkdir_p 'binutils'
@binutils = File.readlines("#{CREW_META_PATH}binutils.filelist")
@binutils = File.readlines(File.join(CREW_META_PATH, 'binutils.filelist'))
@binutils.each do |bin|
FileUtils.cp bin.chomp, "binutils/#{File.basename(bin.chomp)}" if bin['/bin/']
end

2
packages/glibc_build233.rb
View File

@@ -64,7 +64,7 @@ class Glibc_build233 < Package
Dir.chdir 'glibc_build' do
# gold linker does not work for glibc 2.23, and maybe others.
FileUtils.mkdir_p 'binutils'
@binutils = File.readlines("#{CREW_META_PATH}binutils.filelist")
@binutils = File.readlines(File.join(CREW_META_PATH, 'binutils.filelist'))
@binutils.each do |bin|
FileUtils.cp bin.chomp, "binutils/#{File.basename(bin.chomp)}" if bin['/bin/']
end

2
packages/glibc_dev235.rb
View File

@@ -36,7 +36,7 @@ class Glibc_dev235 < Package
@filelist.each do |filename|
next if filename.include?('.so') || filename.include?('bin/')
@destpath = "#{CREW_DEST_DIR.chomp('/')}#{filename}"
@destpath = File.join(CREW_DEST_DIR, filename)
# next unless File.file?(filename)
@filename_target = File.realpath(filename)

2
packages/glibc_lib235.rb
View File

@@ -37,7 +37,7 @@ class Glibc_lib235 < Package
@filelist.each do |filename|
next unless filename.include?('.so') || filename.include?('bin/')
@destpath = "#{CREW_DEST_DIR.chomp('/')}#{filename}"
@destpath = File.join(CREW_DEST_DIR, filename)
@filename_target = File.realpath(filename)
FileUtils.install @filename_target, @destpath
end

16
packages/grabinfo.rb
View File

@@ -35,13 +35,13 @@ class Grabinfo < Package
end
def self.install
system "mkdir -p #{CREW_DEST_DIR}#{CREW_PREFIX}/bin"
system "mkdir -p #{CREW_DEST_DIR}#{CREW_PREFIX}/man/man1"
system "mkdir -p #{CREW_DEST_DIR}#{CREW_PREFIX}/tmp/grabinfo"
system "cp grabinfo #{CREW_DEST_DIR}#{CREW_PREFIX}/bin"
system "cp GrabInfo.pm #{CREW_DEST_DIR}#{CREW_PREFIX}/bin"
system "cp -r GrabInfo/ #{CREW_DEST_DIR}#{CREW_PREFIX}/bin"
system "cp grabinfo.1 #{CREW_DEST_DIR}#{CREW_PREFIX}/man/man1"
system "touch #{CREW_DEST_DIR}#{CREW_PREFIX}/tmp/grabinfo/grabinfo.lock"
system "mkdir -p #{CREW_DEST_PREFIX}/bin"
system "mkdir -p #{CREW_DEST_PREFIX}/man/man1"
system "mkdir -p #{CREW_DEST_PREFIX}/tmp/grabinfo"
system "cp grabinfo #{CREW_DEST_PREFIX}/bin"
system "cp GrabInfo.pm #{CREW_DEST_PREFIX}/bin"
system "cp -r GrabInfo/ #{CREW_DEST_PREFIX}/bin"
system "cp grabinfo.1 #{CREW_DEST_PREFIX}/man/man1"
system "touch #{CREW_DEST_PREFIX}/tmp/grabinfo/grabinfo.lock"
end
end

2
packages/helix_editor.rb
View File

@@ -45,7 +45,7 @@ class Helix_editor < Package
FileUtils.install ".#{@build_folder_suffix}/hx", helix_executable_dest_dir.to_s, mode: 0o755
# Copy runtime dir (without the sources)
FileUtils.rm_rf './runtime/grammars/sources' # remove the sources
helix_runtime_dest_dir = "#{CREW_DEST_DIR}#{@helix_runtime_dir}"
helix_runtime_dest_dir = File.join(CREW_DEST_DIR, @helix_runtime_dir)
FileUtils.mkdir_p helix_runtime_dest_dir.to_s
FileUtils.cp_r './runtime', helix_runtime_dest_dir.to_s
end

2
packages/icu4c.rb
View File

@@ -77,7 +77,7 @@ class Icu4c < Package
@nmresults = `nm -A *.so* 2>/dev/null | grep ucol_open_#{oldver}`.chop.split(/$/).map(&:strip)
@nmresults.each { |fileLine| @libArray.push(fileLine.partition(':').first) }
@libArray.each do |f|
@grepresults = `grep "#{f}" #{CREW_META_PATH}*.filelist`.chomp.gsub('.filelist', '').partition(':').first.gsub(
@grepresults = `grep "#{f}" #{CREW_META_PATH}/*.filelist`.chomp.gsub('.filelist', '').partition(':').first.gsub(
CREW_META_PATH, ''
).split(/$/).map(&:strip)
@grepresults.each { |fileLine| @fileArray.push(fileLine) }

2
packages/llvm16_dev.rb
View File

@@ -50,7 +50,7 @@ class Llvm16_dev < Package
next
end
@destpath = "#{CREW_DEST_DIR.chomp('/')}#{filename}"
@destpath = File.join(CREW_DEST_DIR, filename)
@filename_target = File.realpath(filename)
FileUtils.install @filename_target, @destpath
end

2
packages/llvm16_lib.rb
View File

@@ -43,7 +43,7 @@ class Llvm16_lib < Package
@filelist.each do |filename|
next unless (filename.include?('.so') && filename.include?('libLLVM')) || filename.include?('llvm-strip')
@destpath = "#{CREW_DEST_DIR.chomp('/')}#{filename}"
@destpath = File.join(CREW_DEST_DIR, filename)
@filename_target = File.realpath(filename)
FileUtils.install @filename_target, @destpath
end

2
packages/llvm17_dev.rb
View File

@@ -53,7 +53,7 @@ class Llvm17_dev < Package
next
end
@destpath = "#{CREW_DEST_DIR.chomp('/')}#{filename}"
@destpath = File.join(CREW_DEST_DIR, filename)
@filename_target = File.realpath(filename)
FileUtils.install @filename_target, @destpath
end

2
packages/llvm17_lib.rb
View File

@@ -46,7 +46,7 @@ class Llvm17_lib < Package
@filelist.each do |filename|
next unless (filename.include?('.so') && filename.include?('libLLVM')) || filename.include?('llvm-strip')
@destpath = "#{CREW_DEST_DIR.chomp('/')}#{filename}"
@destpath = File.join(CREW_DEST_DIR, filename)
@filename_target = File.realpath(filename)
FileUtils.install @filename_target, @destpath
end

8
packages/mongodb.rb
View File

@@ -33,16 +33,16 @@ MONGO-TOOLS***'"
# build mongo and install it at once
case ARCH
when 'x86_64'
system "scons -j#{CREW_NPROC} install --ssl --prefix=#{CREW_DEST_DIR}#{CREW_PREFIX} --use-new-tools"
system "scons -j#{CREW_NPROC} install --ssl --prefix=#{CREW_DEST_PREFIX} --use-new-tools"
when 'i686'
system "scons -j#{CREW_NPROC} install --ssl --wiredtiger=off --prefix=#{CREW_DEST_DIR}#{CREW_PREFIX} --use-new-tools"
system "scons -j#{CREW_NPROC} install --ssl --wiredtiger=off --prefix=#{CREW_DEST_PREFIX} --use-new-tools"
when 'armv7l'
# Arm 32 bit architecture is not supported officaially.
# Please read https://groups.google.com/forum/#!msg/mongodb-dev/G-kGjZEEam0/VSVB9fYCBAAJ for details
system 'cd src/third_party/mozjs-38/; ./get_sources.sh'
system 'cd src/third_party/mozjs-38/; ./gen-config.sh arm linux'
system 'cd src/third_party/mozjs-38/; rm -rf firefix* mozilla-release'
system "scons -j#{CREW_NPROC} install --ssl --wiredtiger=off --mmapv1=on --prefix=#{CREW_DEST_DIR}#{CREW_PREFIX} --use-new-tools"
system "scons -j#{CREW_NPROC} install --ssl --wiredtiger=off --mmapv1=on --prefix=#{CREW_DEST_PREFIX} --use-new-tools"
when 'aarch64'
# Arm 64 bit architecture is supported, but Chrome OS aarch64 is 32 bit.
# So, it is required to pretend it is armv7l.
@@ -50,7 +50,7 @@ MONGO-TOOLS***'"
system 'cd src/third_party/mozjs-38/; ./gen-config.sh arm linux'
system 'cd src/third_party/mozjs-38/; rm -rf firefix* mozilla-release'
# Not sure how to pretend it under scons
system "scons -j#{CREW_NPROC} install --ssl --wiredtiger=off --mmapv1=on --prefix=#{CREW_DEST_DIR}#{CREW_PREFIX} --use-new-tools"
system "scons -j#{CREW_NPROC} install --ssl --wiredtiger=off --mmapv1=on --prefix=#{CREW_DEST_PREFIX} --use-new-tools"
end
# guide messages

2
packages/multitail.rb
View File

@@ -32,7 +32,7 @@ class Multitail < Package
def self.install
system 'make', "PREFIX=#{CREW_PREFIX}", "DESTDIR=#{CREW_DEST_DIR}", 'install'
system "mkdir -p #{CREW_DEST_DIR}$HOME"
system "cp #{CREW_DEST_PREFIX}/etc/multitail.conf.new #{CREW_DEST_DIR}$HOME/.multitail.conf"
system "cp #{CREW_DEST_PREFIX}/etc/multitail.conf.new #{CREW_DEST_HOME}/.multitail.conf"
system "cp #{CREW_DEST_PREFIX}/etc/multitail.conf.new $HOME/.multitail.conf"
end

2
packages/musl_brotli.rb
View File

@@ -28,7 +28,7 @@ class Musl_brotli < Package
is_static
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
FileUtils.mkdir('builddir')
Dir.chdir('builddir') do
system "#{MUSL_CMAKE_OPTIONS} \

2
packages/musl_bz2.rb
View File

@@ -25,7 +25,7 @@ class Musl_bz2 < Package
depends_on 'patchelf' => :build
def self.patch
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
# Modify Makefile from "ln -s $(PREFIX)/bin/xxx $(PREFIX)/bin/yyy" to
# "ln -s xxx $(PREFIX)/bin/yyy"
system "sed -i Makefile -e '/ln -s/s:$(PREFIX)/bin/::'"

2
packages/musl_c_ares.rb
View File

@@ -34,7 +34,7 @@ class Musl_c_ares < Package
is_static
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
FileUtils.mkdir('builddir')
Dir.chdir('builddir') do
system "#{MUSL_CMAKE_OPTIONS} \

2
packages/musl_cyrus_sasl.rb
View File

@@ -33,7 +33,7 @@ class Musl_cyrus_sasl < Package
is_static
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
system "#{MUSL_ENV_OPTIONS} ./configure --prefix=#{CREW_MUSL_PREFIX} \
--enable-static \
--with-cxx-static"

2
packages/musl_getaddrinfo_test.rb
View File

@@ -11,7 +11,7 @@ class Musl_getaddrinfo_test < Package
depends_on 'musl_native_toolchain' => :build
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
@a_c = <<~'SOURCEEOF'
#include <netdb.h>
#include <stdio.h>

2
packages/musl_krb5.rb
View File

@@ -32,7 +32,7 @@ class Musl_krb5 < Package
is_static
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
Dir.chdir 'src' do
system 'autoreconf -fiv'
system "#{MUSL_ENV_OPTIONS.gsub("LDFLAGS='",

2
packages/musl_libbacktrace.rb
View File

@@ -28,7 +28,7 @@ class Musl_libbacktrace < Package
depends_on 'musl_native_toolchain' => :build
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
system "./configure --prefix=#{CREW_MUSL_PREFIX} \
#{MUSL_ENV_OPTIONS} \
--enable-shared \

2
packages/musl_libnghttp2.rb
View File

@@ -32,7 +32,7 @@ class Musl_libnghttp2 < Package
is_static
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
FileUtils.mkdir('builddir')
Dir.chdir('builddir') do
system "#{MUSL_CMAKE_OPTIONS} \

2
packages/musl_libssh.rb
View File

@@ -34,7 +34,7 @@ class Musl_libssh < Package
is_static
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
FileUtils.mkdir('builddir')
Dir.chdir('builddir') do
system "#{MUSL_CMAKE_OPTIONS} \

2
packages/musl_libucontext.rb
View File

@@ -27,7 +27,7 @@ class Musl_libucontext < Package
is_static
def self.patch
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
system "sed -i 's,LIBDIR := /lib,LIBDIR := #{CREW_MUSL_PREFIX}/lib,g' Makefile"
system "sed -i 's,INCLUDEDIR := /usr/include,INCLUDEDIR := #{CREW_MUSL_PREFIX}/include,g' Makefile"
system "sed -i 's,PKGCONFIGDIR := /usr/lib/pkgconfig,PKGCONFIGDIR := #{CREW_MUSL_PREFIX}/lib/pkgconfig,g' Makefile"

2
packages/musl_libunwind.rb
View File

@@ -42,7 +42,7 @@ class Musl_libunwind < Package
end
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
system "#{MUSL_ENV_OPTIONS} ./configure --prefix=#{CREW_MUSL_PREFIX} \
--enable-shared \
--enable-static \

2
packages/musl_lz4.rb
View File

@@ -27,7 +27,7 @@ class Musl_lz4 < Package
is_static
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
system "#{MUSL_ENV_OPTIONS} make PREFIX=#{CREW_MUSL_PREFIX} \
LIBDIR=#{CREW_MUSL_PREFIX}/lib \
BUILD_STATIC=yes \

2
packages/musl_native_toolchain.rb
View File

@@ -194,7 +194,7 @@ class Musl_native_toolchain < Package
end
def self.install
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
system "OUTPUT=#{CREW_DEST_MUSL_PREFIX} make install"
# Delete libc symlink made to syslibdir
FileUtils.rm_f "#{CREW_DEST_MUSL_PREFIX}/usr/local"

2
packages/musl_obstack.rb
View File

@@ -27,7 +27,7 @@ class Musl_obstack < Package
is_static
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
system "#{MUSL_ENV_OPTIONS} ./bootstrap.sh"
system "#{MUSL_ENV_OPTIONS} ./configure --prefix=#{CREW_MUSL_PREFIX}"
system "#{MUSL_ENV_OPTIONS} make"

4
packages/musl_perl.rb
View File

@@ -29,7 +29,7 @@ class Musl_perl < Package
depends_on 'musl_bz2' => :build
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
# Install manual files into #{CREW_MUSL_PREFIX}/share/man/man* even if groff is not installed.
system "#{MUSL_ENV_OPTIONS} \
./Configure \
@@ -88,7 +88,7 @@ EOF'
FileUtils.ln_sf "#{CREW_MUSL_PREFIX}/lib/libnsl.so.1", "#{CREW_DEST_MUSL_PREFIX}/lib/libnsl.so"
system "install -Dm755 cpanm #{CREW_DEST_MUSL_PREFIX}/bin/cpanm"
Dir.chdir(CREW_DEST_MUSL_PREFIX) do
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
Musl.patchelf
end
end

2
packages/musl_wolfssl.rb
View File

@@ -30,7 +30,7 @@ class Musl_wolfssl < Package
is_static
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
system "#{MUSL_ENV_OPTIONS} ./autogen.sh"
system "#{MUSL_ENV_OPTIONS} ./configure \
--prefix=#{CREW_MUSL_PREFIX} \

2
packages/musl_xz.rb
View File

@@ -28,7 +28,7 @@ class Musl_xz < Package
is_static
def self.build
load "#{CREW_LIB_PATH}lib/musl.rb"
load "#{CREW_LIB_PATH}/lib/musl.rb"
system 'NOCONFIGURE=1 ./autogen.sh --no-po4a'
system "#{MUSL_ENV_OPTIONS} ./configure --prefix=#{CREW_MUSL_PREFIX} \
--libdir=#{CREW_MUSL_PREFIX}/lib \

2
packages/wayland_proxy_virtwl.rb
View File

@@ -35,7 +35,7 @@ class Wayland_proxy_virtwl < Package
# ld.gold breaks logs 0.7.0 builds with ocaml 4.1.2
FileUtils.cp "#{CREW_PREFIX}/bin/ld.bfd", "#{CREW_DEST_PREFIX}/bin/ld"
end
system "PATH=#{CREW_DEST_PREFIX}/bin:$PATH OPAMROOT=#{@OPAMROOT} opam install . --root=#{@OPAMROOT} --destdir=#{CREW_DEST_DIR}#{@OPAMROOT} -y"
system "PATH=#{CREW_DEST_PREFIX}/bin:$PATH OPAMROOT=#{@OPAMROOT} opam install . --root=#{@OPAMROOT} --destdir=#{File.join(CREW_DEST_DIR, @OPAMROOT)} -y"
FileUtils.rm_f "#{CREW_DEST_PREFIX}/bin/ld"
Dir.chdir "#{CREW_DEST_PREFIX}/bin" do
FileUtils.ln_s '../share/opam/bin/wayland-proxy-virtwl', 'wayland-proxy-virtwl'