Merge pull request #93 from essentialkaos/develop

Version 2.1.0
essentialkaos · Jan 23, 2023 · ea33f83 · ea33f83
2 parents 880c0a8 + 283b662
commit ea33f83
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 12 deletions.
diff --git a/SOURCES/defs/3.2-dev b/SOURCES/defs/3.2-dev
@@ -3,8 +3,11 @@
 
 deps(rpm): make gcc gcc-c++ zlib-devel readline-devel tk-devel ca-certificates git
 deps(rpm): autoconf glibc-devel ncurses-devel bison libffi-devel libyaml-devel
+deps(rpm): rustc
+
 deps(deb): build-essential zlib1g-dev libreadline6-dev tk-dev ca-certificates git
 deps(deb): autoconf libc6-dev libncurses5-dev bison libffi-dev libyaml-dev
+deps(deb): rustc
 
 deps(bin): ruby
 

diff --git a/SOURCES/defs/3.2.0 b/SOURCES/defs/3.2.0
@@ -6,8 +6,11 @@ eol(security): 2026-03-31
 
 deps(rpm): make gcc gcc-c++ zlib-devel readline-devel tk-devel ca-certificates
 deps(rpm): autoconf glibc-devel ncurses-devel bison libffi-devel libyaml-devel
+deps(rpm): rust
+
 deps(deb): build-essential zlib1g-dev libreadline6-dev tk-dev ca-certificates
 deps(deb): autoconf libc6-dev libncurses5-dev bison libffi-dev libyaml-dev
+deps(deb): rustc
 
 CONFOPTS(openssl-1.1.1s): {os_name}-{os_arch} --openssldir={prefix}/openssl/ssl zlib-dynamic no-ssl3 shared -fPIC
 MAKEOPTS(openssl-1.1.1s): -j 1

diff --git a/SOURCES/defs/3.2.0-jemalloc b/SOURCES/defs/3.2.0-jemalloc
@@ -5,7 +5,7 @@ eol(normal): 2025-03-31
 eol(security): 2026-03-31
 
 deps(rpm): make gcc gcc-c++ zlib-devel readline-devel tk-devel ca-certificates libyaml-devel
-deps(rpm): autoconf glibc-devel ncurses-devel bison libffi-devel jemalloc-devel
+deps(rpm): autoconf glibc-devel ncurses-devel bison libffi-devel jemalloc-devel rust
 
 CONFOPTS(openssl-1.1.1s): {os_name}-{os_arch} --openssldir={prefix}/openssl/ssl zlib-dynamic no-ssl3 shared -fPIC
 MAKEOPTS(openssl-1.1.1s): -j 1

diff --git a/SOURCES/defs/3.2.0-railsexpress b/SOURCES/defs/3.2.0-railsexpress
@@ -6,8 +6,11 @@ eol(security): 2026-03-31
 
 deps(rpm): make gcc gcc-c++ zlib-devel readline-devel tk-devel ca-certificates
 deps(rpm): autoconf glibc-devel ncurses-devel bison libffi-devel libyaml-devel
+deps(rpm): rust
+
 deps(deb): build-essential zlib1g-dev libreadline6-dev tk-dev ca-certificates
 deps(deb): autoconf libc6-dev libncurses5-dev bison libffi-dev libyaml-dev
+deps(deb): rustc
 
 CONFOPTS(openssl-1.1.1s): {os_name}-{os_arch} --openssldir={prefix}/openssl/ssl zlib-dynamic no-ssl3 shared -fPIC
 MAKEOPTS(openssl-1.1.1s): -j 1

diff --git a/SOURCES/libexec/build.shx b/SOURCES/libexec/build.shx
@@ -221,6 +221,7 @@ build.printEnvInfo() {
  show " ${CL_BOLD}Prefix: ${CL_NORM} $prefix ${CL_DARK}(prefix)${CL_NORM}"
  show " ${CL_BOLD}GCC: ${CL_NORM} ${gcc_version:-${CL_GREY}—${CL_NORM}} ${CL_DARK}(gcc_version)${CL_NORM}"
  show " ${CL_BOLD}Clang: ${CL_NORM} ${clang_version:-${CL_GREY}—${CL_NORM}} ${CL_DARK}(clang_version)${CL_NORM}"
+ show " ${CL_BOLD}Rust: ${CL_NORM} ${rust_version:-${CL_GREY}—${CL_NORM}} ${CL_DARK}(rust_version)${CL_NORM}"
  show " ${CL_BOLD}Java: ${CL_NORM} ${java_version:-${CL_GREY}—${CL_NORM}} ${CL_DARK}(java_version)${CL_NORM}"
  show " ${CL_BOLD}Ruby: ${CL_NORM} ${ruby_version:-${CL_GREY}—${CL_NORM}} ${CL_DARK}(ruby_version)${CL_NORM}"
  show " ${CL_BOLD}OSName: ${CL_NORM} ${os_name} ${CL_DARK}(os_name)${CL_NORM}"

diff --git a/SOURCES/libexec/facts.shx b/SOURCES/libexec/facts.shx
@@ -56,12 +56,17 @@ os_dist=""
 # Current OS kernel version (String)
 os_kern=""
 
+################################################################################
+
 # GCC version (String)
 gcc_version=""
 
 # Clang version (String)
 clang_version=""
 
+# Rust version (String)
+rust_version=""
+
 # Java version (String)
 java_version=""
 
@@ -119,6 +124,7 @@ facts.collect() {
 
  gcc_version=$(facts.getGCCVersion)
  clang_version=$(facts.getClangVersion)
+ rust_version=$(facts.getRustVersion)
  java_version=$(facts.getJavaVersion)
  ruby_version=$(facts.getRubyVersion)
 }
@@ -169,7 +175,7 @@ facts.getGCCVersion() {
  fi
 }
 
-# Find clang version
+# Find Clang version
 #
 # Code: No
 # Echo: Version (String)
@@ -179,6 +185,16 @@ facts.getClangVersion() {
  fi
 }
 
+# Find Rust version
+#
+# Code: No
+# Echo: Version (String)
+facts.getRustVersion() {
+ if system.hasApp "rustc" ; then
+ rustc --version | cut -f2 -d' '
+ fi
+}
+
 # Find Java version
 #
 # Code: No

diff --git a/SOURCES/mass-builder b/SOURCES/mass-builder
@@ -131,13 +131,13 @@ prepare() {
  yum -y install --enablerepo=kaos-testing autoconf bison gcc gcc-c++ \
  openssl-devel glibc-devel libffi-devel \
  ncurses-devel readline-devel tk-devel \
- zlib-devel libyaml-devel git patch
+ zlib-devel libyaml-devel rustc git patch
  else
  yum -y install rbenv rbbuild jre11 jemalloc-devel nano
  yum -y install autoconf bison gcc gcc-c++ \
  openssl-devel glibc-devel libffi-devel \
  ncurses-devel readline-devel tk-devel \
- zlib-devel libyaml-devel git patch
+ zlib-devel libyaml-devel rustc git patch
  fi
 
  # Use devtoolset for build on EL7
@@ -198,7 +198,7 @@ build() {
  has_errors=true
  fi
 
- if ! command -v ruby &> /dev/null ; then
+ if ! ruby --version &> /dev/null ; then
  if [[ -z "$is_ruby_set" ]] ; then
  setGlobalRubyVersion "$version"
  fi
@@ -401,10 +401,6 @@ getGraceFileSize() {
 # Code: Yes
 # Echo: No
 setGlobalRubyVersion() {
- if [[ $(rbenv global 2>/dev/null) != "system" ]] ; then
- return 0
- fi
-
  if ! rbenv global "$1" &> /dev/null ; then
  return 1
  fi

diff --git a/SOURCES/rbbuild b/SOURCES/rbbuild
@@ -13,7 +13,7 @@ fi
 APP="RBBuild"
 
 # App version (String)
-VER="2.0.0"
+VER="2.1.0"
 
 ################################################################################
 

diff --git a/rbbuild-defs.spec b/rbbuild-defs.spec
@@ -2,7 +2,7 @@
 
 Summary: Def files for rbbuild utility
 Name: rbbuild-defs
-Version: 2.0.0
+Version: 2.0.1
 Release: 0%{?dist}
 License: Apache License, Version 2.0
 Vendor: ESSENTIAL KAOS
@@ -50,6 +50,9 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Mon Jan 23 2023 Anton Novojilov <andy@essentialkaos.com> - 2.0.1-0
+- Added rustc to dependencies for 3.2.0
+
 * Fri Dec 30 2022 Anton Novojilov <andy@essentialkaos.com> - 2.0.0-0
 - Added 2.7.6-railsexpress
 - Added 2.7.7

diff --git a/rbbuild.spec b/rbbuild.spec
@@ -2,7 +2,7 @@
 
 Summary: Utility for compiling and installing different ruby versions
 Name: rbbuild
-Version: 2.0.0
+Version: 2.1.0
 Release: 0%{?dist}
 License: Apache License, Version 2.0
 Vendor: ESSENTIAL KAOS
@@ -57,6 +57,9 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Mon Jan 23 2023 Anton Novojilov <andy@essentialkaos.com> - 2.1.0-0
+- Gathering and printing information about rust version
+
 * Fri Dec 30 2022 Anton Novojilov <andy@essentialkaos.com> - 2.0.0-0
 - Brand new version rewritten from scratch
 - Using zstandart compression by default