Skip to content

Commit 74bb8d9

Browse files
committed
Remove version restrictions
We want to be able to use the MOZJS version as the major version and the minor version for bugfixes. No micro version. - Give GJS_VERSION the value of the major version - Remove the unneeded restriction in unit tests
1 parent daa4057 commit 74bb8d9

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

installed-tests/js/testSystem.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@ describe('System.addressOf()', function () {
1616
});
1717
});
1818

19-
describe('System.version', function () {
20-
it('gives a plausible number', function () {
21-
expect(System.version).not.toBeLessThan(14700);
22-
expect(System.version).toBeLessThan(80000);
23-
});
24-
});
25-
2619
describe('System.refcount()', function () {
2720
it('gives the correct number', function () {
2821
let o = new GObject.Object({});

meson.build

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,11 +306,8 @@ header_conf = configuration_data()
306306

307307
versions = meson.project_version().split('.')
308308
major_version = versions[0].to_int()
309-
minor_version = versions[1].to_int()
310-
micro_version = versions[2].to_int()
311-
int_version = (major_version * 100 + minor_version) * 100 + micro_version
312309
header_conf.set_quoted('VERSION', meson.project_version())
313-
header_conf.set('GJS_VERSION', int_version,
310+
header_conf.set('GJS_VERSION', major_version,
314311
description: 'The GJS version as an integer')
315312
header_conf.set_quoted('PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(),
316313
meson.project_version()))

0 commit comments

Comments
 (0)