Merge pull request #108 from mcorino/mco-prepare-210-release

Update versioning for AXCIOMA 2.1.0 release
RemedyIT · Nov 9, 2020 · dde6f84 · dde6f84
2 parents f76de9a + 948feeb
commit dde6f84
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 25 deletions.
diff --git a/brix/taox11/require.rb b/brix/taox11/require.rb
@@ -15,7 +15,7 @@ module TAOX11
     TITLE = 'TAOX11'.freeze
     DESC = 'BRIX11 TAOX11 brix collection'.freeze
     COPYRIGHT = "Copyright (c) 2014-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
-    VERSION = {major: 0, minor: 1, release: 0}
+    VERSION = {major: 1, minor: 0, release: 0}
 
     Collection.configure(:taox11, ROOT, TITLE, DESC, COPYRIGHT, VERSION) do |cfg|
 

diff --git a/ridlbe/base/config.rb b/ridlbe/base/config.rb
@@ -12,15 +12,39 @@ module IDL
   module Base
     COPYRIGHT = "Copyright (c) 2007-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
     TITLE = 'RIDL backend base'.freeze
-    VERSION = {
-        :major => 1,
-        :minor => 0,
-        :release => 0
-    }
+
+    class << self
+
+      VERSION_REGEXP = /\#\s*define\s+TAOX11_(\w+)_VERSION\s+(\d+)/
+
+      def determine_taox11_version
+        x11_version = {
+          :major => 0,
+          :minor => 0,
+          :beta => 0
+        }
+
+        base = File.join(File.dirname(__FILE__),'..','..','tao','x11','versionx11.h')
+        File.open(base, "r") do |file|
+          while (line = file.gets)
+            if VERSION_REGEXP =~ line
+              x11_version[$1.downcase.to_sym] = $2.to_i
+            end
+          end
+        end
+        x11_version[:release] ||= x11_version[:beta]
+        x11_version
+      end # determine_taox11_version
+      private :determine_taox11_version
+
+      def taox11_version
+        @taox11_version ||= determine_taox11_version
+      end
+    end
 
     ## Configure backend
     #
-    Backend.configure('base', File.dirname(__FILE__), TITLE, COPYRIGHT, VERSION) do |becfg|
+    Backend.configure('base', File.dirname(__FILE__), TITLE, COPYRIGHT, Base.taox11_version) do |becfg|
 
       # setup backend option handling
       #

diff --git a/ridlbe/c++11/config.rb b/ridlbe/c++11/config.rb
@@ -192,30 +192,38 @@ def self.add_extended_options(ol, idl_params)
       end
     end # add_extended_options
 
-    VERSION_REGEXP = /\#\s*define\s+TAOX11_(\w+)_VERSION\s+(\d+)/
-
-    def self.determine_taox11_version()
-      x11_version = {
-        :major => 0,
-        :minor => 0,
-        :beta => 0
-      }
-
-      base = File.join(File.dirname(__FILE__),'..','..','tao','x11','versionx11.h')
-      File.open(base, "r") do |file|
-        while (line = file.gets)
-          if VERSION_REGEXP =~ line
-            x11_version[$1.downcase.to_sym] = $2.to_i
+    class << self
+
+      VERSION_REGEXP = /\#\s*define\s+TAOX11_(\w+)_VERSION\s+(\d+)/
+
+      def determine_taox11_version
+        x11_version = {
+          :major => 0,
+          :minor => 0,
+          :beta => 0
+        }
+
+        base = File.join(File.dirname(__FILE__),'..','..','tao','x11','versionx11.h')
+        File.open(base, "r") do |file|
+          while (line = file.gets)
+            if VERSION_REGEXP =~ line
+              x11_version[$1.downcase.to_sym] = $2.to_i
+            end
           end
         end
+        x11_version[:release] ||= x11_version[:beta]
+        x11_version
+      end # determine_taox11_version
+      private :determine_taox11_version
+
+      def taox11_version
+        @taox11_version ||= determine_taox11_version
       end
-      x11_version[:release] ||= x11_version[:beta]
-      x11_version
-    end # determine_taox11_version
+    end
 
     ## Configure C++11 backend
     #
-    Backend.configure('c++11', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::Cxx11.determine_taox11_version) do |becfg|
+    Backend.configure('c++11', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::Cxx11.taox11_version) do |becfg|
 
       # load base backend framework
       becfg.add_backend('base')