From 8f7004feb28e53cc099aa4fbb1ebe70e9c68591a Mon Sep 17 00:00:00 2001 From: Martin Corino Date: Mon, 9 Nov 2020 14:56:59 +0100 Subject: [PATCH] Update versioning for AXCIOMA 2.1.0 release * brix/ciaox11/require.rb: * connectors/psdd4ccm/brix/psdd4ccm/require.rb: * connectors/psdd4ccm/middleware/zmq/brix/psdd4ccm_zmq/require.rb: * connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/config.rb: * ddsx11/vendors/ndds/brix/ndds/require.rb: * ddsx11/vendors/ndds/ridlbe/ccmx11/facets/dds4ndds/config.rb: * ridlbe/ccmx11/config.rb: * ridlbe/ccmx11/facets/ami4ccm/config.rb: * ridlbe/ccmx11/facets/corba4ccm/config.rb: * ridlbe/ccmx11/facets/dds/config.rb: * ridlbe/ccmx11/facets/dds4ccm/config.rb: --- brix/ciaox11/require.rb | 2 +- connectors/psdd4ccm/brix/psdd4ccm/require.rb | 2 +- .../zmq/brix/psdd4ccm_zmq/require.rb | 2 +- .../ridlbe/ccmx11/facets/psdd4ccm/config.rb | 2 +- ddsx11/vendors/ndds/brix/ndds/require.rb | 2 +- .../ridlbe/ccmx11/facets/dds4ndds/config.rb | 2 +- ridlbe/ccmx11/config.rb | 45 +++++++++++-------- ridlbe/ccmx11/facets/ami4ccm/config.rb | 2 +- ridlbe/ccmx11/facets/corba4ccm/config.rb | 2 +- ridlbe/ccmx11/facets/dds/config.rb | 2 +- ridlbe/ccmx11/facets/dds4ccm/config.rb | 2 +- 11 files changed, 36 insertions(+), 29 deletions(-) diff --git a/brix/ciaox11/require.rb b/brix/ciaox11/require.rb index 0765237b5..3d437fe54 100644 --- a/brix/ciaox11/require.rb +++ b/brix/ciaox11/require.rb @@ -15,7 +15,7 @@ module CIAOX11 TITLE = 'CIAOX11'.freeze DESC = 'BRIX11 CIAOX11 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(:ciaox11, ROOT, TITLE, DESC, COPYRIGHT, VERSION) do |cfg| diff --git a/connectors/psdd4ccm/brix/psdd4ccm/require.rb b/connectors/psdd4ccm/brix/psdd4ccm/require.rb index 43dc8024f..b5d88161f 100644 --- a/connectors/psdd4ccm/brix/psdd4ccm/require.rb +++ b/connectors/psdd4ccm/brix/psdd4ccm/require.rb @@ -17,7 +17,7 @@ module PSDD4CCM TITLE = 'PSDD4CCM'.freeze DESC = 'BRIX11 PSDD4CCM 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(:psdd4ccm, ROOT, TITLE, DESC, COPYRIGHT, VERSION) do |cfg| diff --git a/connectors/psdd4ccm/middleware/zmq/brix/psdd4ccm_zmq/require.rb b/connectors/psdd4ccm/middleware/zmq/brix/psdd4ccm_zmq/require.rb index 18dc98f77..726b99da1 100644 --- a/connectors/psdd4ccm/middleware/zmq/brix/psdd4ccm_zmq/require.rb +++ b/connectors/psdd4ccm/middleware/zmq/brix/psdd4ccm_zmq/require.rb @@ -17,7 +17,7 @@ module PSDD4CCM_ZMQ TITLE = 'PSDD4CCM_ZMQ' DESC = 'BRIX11 PSDD4CCM ZMQ brix collection' COPYRIGHT = "Copyright (c) 2014-#{Time.now.year} Remedy IT Expertise BV, The Netherlands" - VERSION = {major: 0, minor: 1, release: 0} + VERSION = {major: 1, minor: 0, release: 0} Collection.configure(:psdd4ccm_zmq, ROOT, TITLE, DESC, COPYRIGHT, VERSION) do |cfg| diff --git a/connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/config.rb b/connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/config.rb index 9263cb1aa..378bff50a 100644 --- a/connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/config.rb +++ b/connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/config.rb @@ -72,7 +72,7 @@ def self.add_extended_options(ol) # Configure facet # - Backend::Facet.configure('psdd4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, {major: 1, minor: 0, release: 0}) do |fctcfg| + Backend::Facet.configure('psdd4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |fctcfg| # setup facet option handling # diff --git a/ddsx11/vendors/ndds/brix/ndds/require.rb b/ddsx11/vendors/ndds/brix/ndds/require.rb index 70b4404c9..d013c63e1 100644 --- a/ddsx11/vendors/ndds/brix/ndds/require.rb +++ b/ddsx11/vendors/ndds/brix/ndds/require.rb @@ -17,7 +17,7 @@ module NDDS TITLE = 'NDDS'.freeze DESC = 'BRIX11 NDDS 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(:ndds, ROOT, TITLE, DESC, COPYRIGHT, VERSION) do |cfg| diff --git a/ddsx11/vendors/ndds/ridlbe/ccmx11/facets/dds4ndds/config.rb b/ddsx11/vendors/ndds/ridlbe/ccmx11/facets/dds4ndds/config.rb index eea08bf83..97e690851 100644 --- a/ddsx11/vendors/ndds/ridlbe/ccmx11/facets/dds4ndds/config.rb +++ b/ddsx11/vendors/ndds/ridlbe/ccmx11/facets/dds4ndds/config.rb @@ -19,7 +19,7 @@ module NDDS ## Configure facet # - Backend::Facet.configure('dds4ndds', File.dirname(__FILE__), TITLE, COPYRIGHT, {major: 1, minor: 0, release: 0}) do |fctcfg| + Backend::Facet.configure('dds4ndds', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |fctcfg| # optionally define dependencies on other facets # specify dependencies either as: diff --git a/ridlbe/ccmx11/config.rb b/ridlbe/ccmx11/config.rb index 21abc65f9..4f01fa666 100644 --- a/ridlbe/ccmx11/config.rb +++ b/ridlbe/ccmx11/config.rb @@ -89,31 +89,38 @@ def self.add_extended_options(ol) end end # add_extended_options - VERSION_REGEXP = /\#\s*define\s+CIAOX11_(\w+)_VERSION\s+(\d+)/ - - def self.determine_ciaox11_version() - x11_version = { - :major => 0, - :minor => 0, - :micro => 0 - } - - base = File.join(File.dirname(__FILE__), '..', '..', 'ciaox11','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+CIAOX11_(\w+)_VERSION\s+(\d+)/ + + def determine_ciaox11_version + x11_version = { + :major => 0, + :minor => 0, + :micro => 0 + } + + base = File.join(File.dirname(__FILE__), '..', '..', 'ciaox11','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 - end - x11_version[:release] ||= x11_version[:micro] - x11_version - end # determine_ciaox11_version + x11_version[:release] ||= x11_version[:micro] + x11_version + end # determine_ciaox11_version + private :determine_ciaox11_version + def ciaox11_version + @ciaox11_version ||= determine_ciaox11_version + end + end ## Configure C++11 backend # - Backend.configure('ccmx11', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.determine_ciaox11_version()) do |becfg| + Backend.configure('ccmx11', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |becfg| # load c++11 backend as base becfg.add_backend('c++11') diff --git a/ridlbe/ccmx11/facets/ami4ccm/config.rb b/ridlbe/ccmx11/facets/ami4ccm/config.rb index bcca7c60f..8783ba47e 100644 --- a/ridlbe/ccmx11/facets/ami4ccm/config.rb +++ b/ridlbe/ccmx11/facets/ami4ccm/config.rb @@ -17,7 +17,7 @@ module AMI4CCM ## Configure facet # - Backend::Facet.configure('ami4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, {major: 1, minor: 0, release: 0}) do |fctcfg| + Backend::Facet.configure('ami4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |fctcfg| def self.add_extended_options(ol) ol.for_switch '-G{generation options}', :type => String, :separator => true do |swcfg| diff --git a/ridlbe/ccmx11/facets/corba4ccm/config.rb b/ridlbe/ccmx11/facets/corba4ccm/config.rb index 9cfc3019f..742f7a16b 100644 --- a/ridlbe/ccmx11/facets/corba4ccm/config.rb +++ b/ridlbe/ccmx11/facets/corba4ccm/config.rb @@ -18,7 +18,7 @@ module CORBA ## Configure facet # - Backend::Facet.configure('corba4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, {major: 1, minor: 0, release: 0}) do |fctcfg| + Backend::Facet.configure('corba4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |fctcfg| def self.add_extended_options(ol) diff --git a/ridlbe/ccmx11/facets/dds/config.rb b/ridlbe/ccmx11/facets/dds/config.rb index 22ded0aae..5b0ee9b29 100644 --- a/ridlbe/ccmx11/facets/dds/config.rb +++ b/ridlbe/ccmx11/facets/dds/config.rb @@ -53,7 +53,7 @@ def self.add_extended_options(ol) ## Configure facet # - Backend::Facet.configure('dds', File.dirname(__FILE__), TITLE, COPYRIGHT, {major: 1, minor: 0, release: 0}) do |fctcfg| + Backend::Facet.configure('dds', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |fctcfg| # setup facet option handling # diff --git a/ridlbe/ccmx11/facets/dds4ccm/config.rb b/ridlbe/ccmx11/facets/dds4ccm/config.rb index 3eed9ba2c..c8f90b7a1 100644 --- a/ridlbe/ccmx11/facets/dds4ccm/config.rb +++ b/ridlbe/ccmx11/facets/dds4ccm/config.rb @@ -18,7 +18,7 @@ module DDS4CCM # Configure facet # - Backend::Facet.configure('dds4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, {major: 1, minor: 0, release: 0}) do |fctcfg| + Backend::Facet.configure('dds4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |fctcfg| # optionally define dependencies on other facets # specify dependencies either as: