Billy Barrow 4 روز پیش
والد
کامیت
fbd2e4fe2d
3فایلهای تغییر یافته به همراه15 افزوده شده و 12 حذف شده
  1. 6 6
      MANIFEST.usm
  2. 8 5
      src/lib/meson.build
  3. 1 1
      src/tests/meson.build

+ 6 - 6
MANIFEST.usm

@@ -1,15 +1,15 @@
 {
   "name": "invercargill",
-  "version": "0.0.1",
+  "version": "1.0.0",
   "summary": "Enumerable library for vala",
   "licences": [ {"name": "LGPLv3", "category": "libre", "text": "LICENSE"} ],
   "flags": [],
   "provides": {
-    "lib:libinvercargill.so": "as-expected",
-    "inc:invercargill.h": "as-expected",
-    "vapi:invercargill.vapi": "as-expected",
-    "gir:invercargill-1.0.gir": "as-expected",
-    "typelib:invercargill-1.0.typelib": "as-expected",
+    "lib:libinvercargill-1.so": "as-expected",
+    "inc:invercargill-1.h": "as-expected",
+    "vapi:invercargill-1.vapi": "as-expected",
+    "gir:invercargill-1.gir": "as-expected",
+    "typelib:invercargill-1.typelib": "as-expected",
     "pc:invercargill.pc": "as-expected"
   },
   "depends": {

+ 8 - 5
src/lib/meson.build

@@ -1,6 +1,9 @@
 
 # Library version
-invercargill_version = '0.1'
+invercargill_major = '1'
+invercargill_minor = '0'
+invercargill_patch = '0'
+invercargill_version = '@0@.@1@.@2@'.format(invercargill_major, invercargill_minor, invercargill_patch)
 
 dependencies = [
     dependency('glib-2.0'),
@@ -128,10 +131,10 @@ sources += files('Operators/Equality.vala')
 sources += files('Operators/Hash.vala')
 sources += files('Operators/Stringify.vala')
 
-invercargill = shared_library('invercargill-@0@'.format(invercargill_version), sources,
+invercargill = shared_library('invercargill-@0@'.format(invercargill_major), sources,
     dependencies: dependencies,
     install: true,
-    vala_gir: 'invercargill-@0@.gir'.format(invercargill_version),
+    vala_gir: 'invercargill-@0@.gir'.format(invercargill_major),
     install_dir: [true, true, true, true]
 )
 invercargill_dep = declare_dependency(link_with: invercargill, include_directories: include_directories('.'))
@@ -142,8 +145,8 @@ pkg.generate(invercargill,
     name : 'invercargill',)
     
 g_ir_compiler = find_program('g-ir-compiler')
-custom_target('invercargill typelib', command: [g_ir_compiler, '--shared-library=libinvercargill-@0@.so'.format(invercargill_version), '--output', '@OUTPUT@', meson.current_build_dir() / 'invercargill-@0@.gir'.format(invercargill_version)],
-              output: 'invercargill-@0@.typelib'.format(invercargill_version),
+custom_target('invercargill typelib', command: [g_ir_compiler, '--shared-library=libinvercargill-@0@.so'.format(invercargill_major), '--output', '@OUTPUT@', meson.current_build_dir() / 'invercargill-@0@.gir'.format(invercargill_major)],
+              output: 'invercargill-@0@.typelib'.format(invercargill_major),
               depends: invercargill,
               install: true,
               install_dir: get_option('libdir') / 'girepository-1.0')

+ 1 - 1
src/tests/meson.build

@@ -39,4 +39,4 @@ sources += files('Speed/Set.vala')
 sources += files('Speed/SortedSeries.vala')
 sources += files('Speed/Buffer.vala')
 
-executable('invercargill-test-suite', sources, dependencies: dependencies, install: true)
+executable('invercargill-test-suite', sources, dependencies: dependencies, install: false)