Skip to content

Commit d040b23

Browse files
author
mcorino
authored
Merge pull request #139 from mcorino/mco-prepare-210-release
Update versioning for AXCIOMA 2.1.0 release
2 parents 887dada + 8f7004f commit d040b23

File tree

11 files changed

+36
-29
lines changed

11 files changed

+36
-29
lines changed

‎brix/ciaox11/require.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module CIAOX11
1515
TITLE = 'CIAOX11'.freeze
1616
DESC = 'BRIX11 CIAOX11 brix collection'.freeze
1717
COPYRIGHT = "Copyright (c) 2014-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
18-
VERSION = {major: 0, minor: 1, release: 0}
18+
VERSION = {major: 1, minor: 0, release: 0}
1919

2020
Collection.configure(:ciaox11, ROOT, TITLE, DESC, COPYRIGHT, VERSION) do |cfg|
2121

‎connectors/psdd4ccm/brix/psdd4ccm/require.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module PSDD4CCM
1717
TITLE = 'PSDD4CCM'.freeze
1818
DESC = 'BRIX11 PSDD4CCM brix collection'.freeze
1919
COPYRIGHT = "Copyright (c) 2014-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
20-
VERSION = {major: 0, minor: 1, release: 0}
20+
VERSION = {major: 1, minor: 0, release: 0}
2121

2222
Collection.configure(:psdd4ccm, ROOT, TITLE, DESC, COPYRIGHT, VERSION) do |cfg|
2323

‎connectors/psdd4ccm/middleware/zmq/brix/psdd4ccm_zmq/require.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module PSDD4CCM_ZMQ
1717
TITLE = 'PSDD4CCM_ZMQ'
1818
DESC = 'BRIX11 PSDD4CCM ZMQ brix collection'
1919
COPYRIGHT = "Copyright (c) 2014-#{Time.now.year} Remedy IT Expertise BV, The Netherlands"
20-
VERSION = {major: 0, minor: 1, release: 0}
20+
VERSION = {major: 1, minor: 0, release: 0}
2121

2222
Collection.configure(:psdd4ccm_zmq, ROOT, TITLE, DESC, COPYRIGHT, VERSION) do |cfg|
2323

‎connectors/psdd4ccm/ridlbe/ccmx11/facets/psdd4ccm/config.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def self.add_extended_options(ol)
7272

7373
# Configure facet
7474
#
75-
Backend::Facet.configure('psdd4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, {major: 1, minor: 0, release: 0}) do |fctcfg|
75+
Backend::Facet.configure('psdd4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |fctcfg|
7676

7777
# setup facet option handling
7878
#

‎ddsx11/vendors/ndds/brix/ndds/require.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module NDDS
1717
TITLE = 'NDDS'.freeze
1818
DESC = 'BRIX11 NDDS brix collection'.freeze
1919
COPYRIGHT = "Copyright (c) 2014-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
20-
VERSION = {major: 0, minor: 1, release: 0}
20+
VERSION = {major: 1, minor: 0, release: 0}
2121

2222
Collection.configure(:ndds, ROOT, TITLE, DESC, COPYRIGHT, VERSION) do |cfg|
2323

‎ddsx11/vendors/ndds/ridlbe/ccmx11/facets/dds4ndds/config.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module NDDS
1919

2020
## Configure facet
2121
#
22-
Backend::Facet.configure('dds4ndds', File.dirname(__FILE__), TITLE, COPYRIGHT, {major: 1, minor: 0, release: 0}) do |fctcfg|
22+
Backend::Facet.configure('dds4ndds', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |fctcfg|
2323

2424
# optionally define dependencies on other facets
2525
# specify dependencies either as:

‎ridlbe/ccmx11/config.rb‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -89,31 +89,38 @@ def self.add_extended_options(ol)
8989
end
9090
end # add_extended_options
9191

92-
VERSION_REGEXP = /\#\s*define\s+CIAOX11_(\w+)_VERSION\s+(\d+)/
93-
94-
def self.determine_ciaox11_version()
95-
x11_version = {
96-
:major => 0,
97-
:minor => 0,
98-
:micro => 0
99-
}
100-
101-
base = File.join(File.dirname(__FILE__), '..', '..', 'ciaox11','versionx11.h')
102-
File.open(base, "r") do |file|
103-
while (line = file.gets)
104-
if VERSION_REGEXP =~ line
105-
x11_version[$1.downcase.to_sym] = $2.to_i
92+
class << self
93+
94+
VERSION_REGEXP = /\#\s*define\s+CIAOX11_(\w+)_VERSION\s+(\d+)/
95+
96+
def determine_ciaox11_version
97+
x11_version = {
98+
:major => 0,
99+
:minor => 0,
100+
:micro => 0
101+
}
102+
103+
base = File.join(File.dirname(__FILE__), '..', '..', 'ciaox11','versionx11.h')
104+
File.open(base, "r") do |file|
105+
while (line = file.gets)
106+
if VERSION_REGEXP =~ line
107+
x11_version[$1.downcase.to_sym] = $2.to_i
108+
end
106109
end
107110
end
108-
end
109-
x11_version[:release] ||= x11_version[:micro]
110-
x11_version
111-
end # determine_ciaox11_version
111+
x11_version[:release] ||= x11_version[:micro]
112+
x11_version
113+
end # determine_ciaox11_version
114+
private :determine_ciaox11_version
112115

116+
def ciaox11_version
117+
@ciaox11_version ||= determine_ciaox11_version
118+
end
119+
end
113120

114121
## Configure C++11 backend
115122
#
116-
Backend.configure('ccmx11', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.determine_ciaox11_version()) do |becfg|
123+
Backend.configure('ccmx11', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |becfg|
117124

118125
# load c++11 backend as base
119126
becfg.add_backend('c++11')

‎ridlbe/ccmx11/facets/ami4ccm/config.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module AMI4CCM
1717

1818
## Configure facet
1919
#
20-
Backend::Facet.configure('ami4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, {major: 1, minor: 0, release: 0}) do |fctcfg|
20+
Backend::Facet.configure('ami4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |fctcfg|
2121

2222
def self.add_extended_options(ol)
2323
ol.for_switch '-G{generation options}', :type => String, :separator => true do |swcfg|

‎ridlbe/ccmx11/facets/corba4ccm/config.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ module CORBA
1818

1919
## Configure facet
2020
#
21-
Backend::Facet.configure('corba4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, {major: 1, minor: 0, release: 0}) do |fctcfg|
21+
Backend::Facet.configure('corba4ccm', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |fctcfg|
2222

2323
def self.add_extended_options(ol)
2424

‎ridlbe/ccmx11/facets/dds/config.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def self.add_extended_options(ol)
5353

5454
## Configure facet
5555
#
56-
Backend::Facet.configure('dds', File.dirname(__FILE__), TITLE, COPYRIGHT, {major: 1, minor: 0, release: 0}) do |fctcfg|
56+
Backend::Facet.configure('dds', File.dirname(__FILE__), TITLE, COPYRIGHT, IDL::CCMX11.ciaox11_version) do |fctcfg|
5757

5858
# setup facet option handling
5959
#

0 commit comments

Comments
 (0)