Skip to content

Commit 80edaf2

Browse files
committed
Remove SNAPSHOT from shared library name
1 parent 113b5af commit 80edaf2

File tree

11 files changed

+49
-48
lines changed

11 files changed

+49
-48
lines changed

common/common.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include $M/shell.mk
22

33
VERSION := $(shell grep '^version:' $(ROOT)/Meta | cut -d' ' -f2)
4-
LIBYAMLSTAR-VERSION := $(VERSION)-SNAPSHOT
4+
LIBYAMLSTAR-VERSION := $(VERSION)
55
LIBYAMLSTAR-SO := $(LIBYS)/lib/libyamlstar.$(SO)
66
LIBYAMLSTAR-SO-VERSION := $(LIBYS)/lib/libyamlstar.$(SO).$(LIBYAMLSTAR-VERSION)
77
LIBYAMLSTAR-HEADER := $(LIBYS)/lib/libyamlstar.h

fortran/Makefile

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,17 @@ include $(COMMON)/binding.mk
66
MAKES-CLEAN := \
77
build \
88

9-
# override LIBYAMLSTAR-SO :=
10-
9+
DEPS := \
10+
$(FPM) \
11+
$(LIBYAMLSTAR-SO) \
1112

1213
ifeq ($(OS-NAME),windows)
13-
test: $(FPM) $(LIBYAMLSTAR-SO)
14-
PATH="$(LIBYS)/lib:$$PATH" fpm test --flag "-L$(LIBYS)/lib"
15-
else
16-
test: $(FPM) $(LIBYAMLSTAR-SO)
17-
fpm test --flag "-L$(LIBYS)/lib"
14+
override export PATH := "$(LIBYS)/lib:$$PATH"
1815
endif
1916

20-
ifeq ($(OS-NAME),windows)
21-
build: $(FPM) $(LIBYAMLSTAR-SO)
22-
PATH="$(LIBYS)/lib:$$PATH" fpm build --flag "-L$(LIBYS)/lib"
23-
else
24-
build: $(FPM) $(LIBYAMLSTAR-SO)
17+
18+
test: $(DEPS)
19+
fpm test --flag "-L$(LIBYS)/lib"
20+
21+
build: $(DEPS)
2522
fpm build --flag "-L$(LIBYS)/lib"
26-
endif

go/yamlstar.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
)
4040

4141
// Version is the version of the yamlstar library this binding works with.
42-
const Version = "0.1.0-SNAPSHOT"
42+
const Version = "0.1.0"
4343

4444
// ErrNotInitialized is returned when the library failed to initialize.
4545
var ErrNotInitialized = errors.New("yamlstar: library not initialized")

libyamlstar/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@ MAKES-REALCLEAN := \
1515
# Library paths and names
1616
API-VERSION := 0
1717

18+
# JAR files still use -SNAPSHOT (from project.clj)
19+
# but .so files use clean version
1820
LIB-DIR := lib
1921
LIB-NAME := $(LIB-DIR)/libyamlstar
2022
LIB-SO := $(LIB-NAME).$(SO)
2123
LIB-SO-VERSIONED := $(LIB-NAME).$(SO).$(LIBYAMLSTAR-VERSION)
22-
LIB-JAR := target/libyamlstar-$(LIBYAMLSTAR-VERSION)-standalone.jar
24+
LIB-JAR := target/libyamlstar-$(LIBYAMLSTAR-VERSION)-SNAPSHOT-standalone.jar
2325

2426
# Core dependency jar in local maven repository
25-
CORE-JAR := $(MAVEN-REPOSITORY)/yamlstar/core/$(LIBYAMLSTAR-VERSION)/core-$(LIBYAMLSTAR-VERSION).jar
27+
CORE-JAR := $(MAVEN-REPOSITORY)/yamlstar/core/$(LIBYAMLSTAR-VERSION)-SNAPSHOT/core-$(LIBYAMLSTAR-VERSION)-SNAPSHOT.jar
2628

2729
# Header files generated by native-image --shared
2830
LIB-HEADERS := \

nodejs/lib/yamlstar/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const yamlstarVersion = '0.1.0-SNAPSHOT';
1+
const yamlstarVersion = '0.1.0';
22

33
const ffi = require('@makeomatic/ffi-napi');
44
const ref = require('ref-napi');

perl/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
/cpan/MYMETA.json
55
/cpan/MYMETA.yml
66
/cpan/Makefile
7+
/cpan/YAMLStar-*.tar
78
/cpan/YAMLStar-*.tar.gz
89
/cpan/lib/
910
/cpan/t/
11+
/cpan/blib/
12+
/cpan/pm_to_blib

perl/Makefile

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,49 @@ CPAN-DEPS := \
1010
Moo \
1111
Test2::V0 \
1212

13-
PERL-LOCAL-LIB := local
13+
PERL-LOCAL := $(ROOT)/perl/local
14+
PERL-LOCAL-LIB := $(PERL-LOCAL)/lib/perl5
15+
PERL-LOCAL-BIN := $(PERL-LOCAL)/bin
1416

1517
MAKES-CLEAN := \
1618
cpan/LICENSE \
1719
cpan/MANIFEST \
20+
cpan/MANIFEST.bak \
1821
cpan/MYMETA.json \
1922
cpan/MYMETA.yml \
2023
cpan/Makefile \
24+
cpan/YAMLStar-*.tar \
2125
cpan/YAMLStar-*.tar.gz \
2226
cpan/lib/ \
2327
cpan/t/ \
28+
cpan/blib/ \
29+
cpan/pm_to_blib \
2430

2531
MAKES-REALCLEAN := \
26-
$(PERL-LOCAL-LIB) \
32+
$(PERL-LOCAL) \
2733

28-
export PERL5LIB := $(PERL-LOCAL-LIB)/lib/perl5
34+
override export PATH := $(PERL-LOCAL-BIN):$(PATH)
35+
export PERL5LIB := $(PERL-LOCAL-LIB)
2936
export PERL5OPT :=
3037

38+
TEST-DEPS := \
39+
$(PERL-LOCAL) \
40+
$(LIBYAMLSTAR-SO) \
3141

3242
ifeq ($(OS-NAME),windows)
3343
test:
3444
@echo "Skipping Perl tests on Windows (Strawberry Perl cpanm issues)"
3545
else
36-
test: $(PERL-LOCAL-LIB) $(LIBYAMLSTAR-SO)
46+
test: $(TEST-DEPS)
3747
prove -l$(if $v,v) test/
3848
endif
3949

4050
build: $(LIBYAMLSTAR-SO)
4151

42-
$(PERL-LOCAL-LIB): $(PERL)
52+
$(PERL-LOCAL): $(PERL)
4353
cpanm -L $@ -n $(CPAN-DEPS)
4454

45-
release-cpan: $(PERL)
55+
release-cpan: cpan-test cpan-dist
4656
$(ROOT)/util/release release-perl
4757

4858
cpan-build:
@@ -51,10 +61,10 @@ cpan-build:
5161
cp test/yamlstar.t cpan/t/
5262
cp License cpan/LICENSE
5363

54-
cpan-test: cpan-build $(PERL)
64+
cpan-test: cpan-build $(TEST-DEPS)
5565
cd cpan && perl Makefile.PL && make && make test
5666

57-
cpan-dist: cpan-build $(PERL)
67+
cpan-dist: cpan-build $(PERL) $(PERL-LOCAL)
5868
cd cpan && perl Makefile.PL && make manifest && make dist
5969

6070
cpan-clean:

python/lib/yamlstar/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"""
1111

1212
# Version matching the yamlstar shared library
13-
yamlstar_version = '0.1.0-SNAPSHOT'
13+
yamlstar_version = '0.1.0'
1414

1515
import os
1616
import sys

rust/ReadMe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ make native
5858
**Option 2: Install to system**
5959
```bash
6060
# Copy to system library directory
61-
sudo cp libyamlstar/lib/libyamlstar.so.0.1.0-SNAPSHOT /usr/local/lib/
61+
sudo cp libyamlstar/lib/libyamlstar.so.0.1.0 /usr/local/lib/
6262
```
6363

6464
**Option 3: Use LD_LIBRARY_PATH**

rust/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ use crate::error::LibYSError;
5050
const LIBYAMLSTAR_BASENAME: &str = "libyamlstar";
5151

5252
/// The version of the yamlstar library this binding works with.
53-
pub const LIBYAMLSTAR_VERSION: &str = "0.1.0-SNAPSHOT";
53+
pub const LIBYAMLSTAR_VERSION: &str = "0.1.0";
5454

5555
/// The extension of the YAMLStar library. On Linux, it's a `.so` file.
5656
#[cfg(target_os = "linux")]

0 commit comments

Comments
 (0)