diff --git a/.profile b/.profile index 7d31e9bb..9a59b105 100644 --- a/.profile +++ b/.profile @@ -10,7 +10,7 @@ ys-local() { YS() ( set -e base=$YAMLSCRIPT_ROOT/ys - libyamlscript_version=0.1.43 + libyamlscript_version=0.1.44 jar=yamlscript.cli-$libyamlscript_version-SNAPSHOT-standalone.jar make --no-print-directory -C "$base" jar java -jar "$base/target/uberjar/$jar" "$@" diff --git a/.version.sh b/.version.sh index 04428233..96a00471 100644 --- a/.version.sh +++ b/.version.sh @@ -1,6 +1,6 @@ # Used by util/version-bump to update versions in repo -v_api=0.1.43 +v_api=0.1.44 v_perl=$v_api v_python=$v_api diff --git a/Changes b/Changes index f1b4f503..5800260e 100644 --- a/Changes +++ b/Changes @@ -1,4 +1,11 @@ +- version: 0.1.44 + date: Mon Mar 18 08:14:24 AM PDT 2024 + changes: + - make: Change reference to yamlscript-java to yamlscript + - make: Refactor 'make release' + - ys: Fix for --binary compilation + - version: 0.1.43 date: Sun Mar 17 03:34:47 PM PDT 2024 changes: diff --git a/Meta b/Meta index 86fe261d..4acb14a2 100644 --- a/Meta +++ b/Meta @@ -1,7 +1,7 @@ =meta: 0.0.2 name: YAMLScript -version: 0.1.43 +version: 0.1.44 abstract: Program in YAML homepage: https://yamlscript.org license: mit diff --git a/ReadMe.md b/ReadMe.md index 8a9dbf6b..05c1d96c 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -225,7 +225,7 @@ Make sure `~/.local/bin` is in your `PATH` environment variable. You can use the following environment variables to control the installation: * `PREFIX=...` - The directory to install to. Default: `~/.local` -* `VERSION=...` - The YAMLScript version to install. Default: `0.1.43` +* `VERSION=...` - The YAMLScript version to install. Default: `0.1.44` * `BIN=1` - Only install the `PREFIX/bin/ys` command line tool. * `LIB=1` - Only install the `PREFIX/lib/libyamlscript` shared library. * `DEBUG=1` - Print the Bash commands that are being run. diff --git a/clojure/deps.edn b/clojure/deps.edn index c8344654..b4524987 100644 --- a/clojure/deps.edn +++ b/clojure/deps.edn @@ -4,4 +4,4 @@ org.clojure/data.json {:mvn/version "2.4.0"}, org.json/json {:mvn/version "20240205"}, net.java.dev.jna/jna {:mvn/version "5.14.0"}, - org.yamlscript/yamlscript {:mvn/version "0.1.43"}}} + org.yamlscript/yamlscript {:mvn/version "0.1.44"}}} diff --git a/clojure/project.clj b/clojure/project.clj index e7514099..d416e1e6 100644 --- a/clojure/project.clj +++ b/clojure/project.clj @@ -1,7 +1,7 @@ ;; This code is licensed under MIT license (See License for details) ;; Copyright 2023-2024 Ingy dot Net -(defproject org.yamlscript/clj-yamlscript "0.1.43" +(defproject org.yamlscript/clj-yamlscript "0.1.44" :description "YAMLScript is a functional programming language whose syntax is encoded in YAML." @@ -23,7 +23,7 @@ [org.clojure/data.json "2.4.0"] [org.json/json "20240205"] [net.java.dev.jna/jna "5.14.0"] - [org.yamlscript/yamlscript "0.1.43"]] + [org.yamlscript/yamlscript "0.1.44"]] :deploy-repositories [["releases" diff --git a/common/install.mk b/common/install.mk index 39f0b8d2..e395ad40 100644 --- a/common/install.mk +++ b/common/install.mk @@ -3,7 +3,7 @@ SHELL := bash ROOT := $(shell \ cd '$(abspath $(dir $(lastword $(MAKEFILE_LIST))))' && pwd -P) -YAMLSCRIPT_VERSION := 0.1.43 +YAMLSCRIPT_VERSION := 0.1.44 YS := $(wildcard ys) LIBYAMLSCRIPT := $(firstword $(wildcard libyamlscript.*)) diff --git a/common/project.clj b/common/project.clj index f4fa1f1a..10403d4b 100644 --- a/common/project.clj +++ b/common/project.clj @@ -1,7 +1,7 @@ ;; This code is licensed under MIT license (See License for details) ;; Copyright 2023-2024 Ingy dot Net -(defproject yamlscript/docker "0.1.43" +(defproject yamlscript/docker "0.1.44" :description "Program in YAML" :dependencies [#__ diff --git a/core/project.clj b/core/project.clj index 94adc753..0c34ef1b 100644 --- a/core/project.clj +++ b/core/project.clj @@ -1,7 +1,7 @@ ;; This code is licensed under MIT license (See License for details) ;; Copyright 2023-2024 Ingy dot Net -(defproject yamlscript/core "0.1.43" +(defproject yamlscript/core "0.1.44" :description "Program in YAML" :url "https://github.com/yaml/yamlscript" diff --git a/core/src/yamlscript/runtime.clj b/core/src/yamlscript/runtime.clj index 046150e6..878b597c 100644 --- a/core/src/yamlscript/runtime.clj +++ b/core/src/yamlscript/runtime.clj @@ -27,7 +27,7 @@ :refer [abspath get-yspath]])) -(def ys-version "0.1.43") +(def ys-version "0.1.44") (def ARGS (sci/new-dynamic-var 'ARGS)) (def ARGV (sci/new-dynamic-var 'ARGV)) diff --git a/java/Makefile b/java/Makefile index 1a493fc3..0c8657f8 100644 --- a/java/Makefile +++ b/java/Makefile @@ -2,7 +2,7 @@ include ../common/base.mk include $(COMMON)/binding.mk include $(COMMON)/java.mk -YAMLSCRIPT_JAVA_JAR := target/yamlscript-0.1.43.jar +YAMLSCRIPT_JAVA_JAR := target/yamlscript-0.1.44.jar #------------------------------------------------------------------------------ diff --git a/java/pom.xml b/java/pom.xml index 9bc7d10b..3fb4a28b 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -12,7 +12,7 @@ yamlscript - 0.1.43 + 0.1.44 yamlscript diff --git a/java/src/main/java/org/yamlscript/yamlscript/YAMLScript.java b/java/src/main/java/org/yamlscript/yamlscript/YAMLScript.java index 9022982c..ce7b2aa3 100644 --- a/java/src/main/java/org/yamlscript/yamlscript/YAMLScript.java +++ b/java/src/main/java/org/yamlscript/yamlscript/YAMLScript.java @@ -13,7 +13,7 @@ */ public class YAMLScript { - public static String YAMLSCRIPT_VERSION = "0.1.43"; + public static String YAMLSCRIPT_VERSION = "0.1.44"; public static Object load(String ysCode) { diff --git a/libyamlscript/deps.edn b/libyamlscript/deps.edn index 2b125fe9..0c8a9d7d 100644 --- a/libyamlscript/deps.edn +++ b/libyamlscript/deps.edn @@ -3,7 +3,7 @@ {org.clojure/clojure {:mvn/version "1.11.1"}, org.babashka/sci {:mvn/version "0.8.40"}, org.clojure/data.json {:mvn/version "2.4.0"}, - yamlscript/compiler {:mvn/version "0.1.43"}}, + yamlscript/compiler {:mvn/version "0.1.44"}}, :aliases {:lein2deps {:deps diff --git a/libyamlscript/project.clj b/libyamlscript/project.clj index 99967fcb..e8cb70aa 100644 --- a/libyamlscript/project.clj +++ b/libyamlscript/project.clj @@ -1,7 +1,7 @@ ;; This code is licensed under MIT license (See License for details) ;; Copyright 2023-2024 Ingy dot Net -(defproject yamlscript/libyamlscript "0.1.43" +(defproject yamlscript/libyamlscript "0.1.44" :description "Shared Library for YAMLScript" :url "https://yamlscript.org" @@ -20,7 +20,7 @@ [[org.clojure/clojure "1.11.1"] [org.babashka/sci "0.8.41"] [org.clojure/data.json "2.4.0"] - [yamlscript/core "0.1.43"]] + [yamlscript/core "0.1.44"]] :plugins [[lein-exec "0.3.7"] diff --git a/perl-alien/Changes b/perl-alien/Changes index a395b26f..6b7cfc3f 100644 --- a/perl-alien/Changes +++ b/perl-alien/Changes @@ -1,4 +1,10 @@ +--- +version: 0.1.44 +date: Mon Mar 18 08:14:24 AM PDT 2024 +changes: +- libyamlscript 0.1.44 + --- version: 0.1.43 date: Sun Mar 17 03:34:47 PM PDT 2024 diff --git a/perl-alien/Meta b/perl-alien/Meta index 71047067..1ec4a04f 100644 --- a/perl-alien/Meta +++ b/perl-alien/Meta @@ -3,7 +3,7 @@ base: ../Meta name: Alien-YAMLScript -version: 0.1.43 +version: 0.1.44 language: perl diff --git a/perl-alien/alienfile b/perl-alien/alienfile index 9801fcd7..cff95767 100644 --- a/perl-alien/alienfile +++ b/perl-alien/alienfile @@ -1,6 +1,6 @@ use alienfile; -my $libyamlscript_version = '0.1.43'; +my $libyamlscript_version = '0.1.44'; # Always use a share install # We cannot use a system install, because we need to know exactly diff --git a/perl-alien/lib/Alien/YAMLScript.pm b/perl-alien/lib/Alien/YAMLScript.pm index 8b6f94b9..dda54a86 100644 --- a/perl-alien/lib/Alien/YAMLScript.pm +++ b/perl-alien/lib/Alien/YAMLScript.pm @@ -3,11 +3,11 @@ use warnings; package Alien::YAMLScript; -our $VERSION = '0.1.43'; +our $VERSION = '0.1.44'; use parent 'Alien::Base'; -our $libyamlscript_version = '0.1.43'; +our $libyamlscript_version = '0.1.44'; die "Alien::YAMLScript $VERSION requires libyamlscript $libyamlscript_version" . "but you have " . __PACKAGE__->version diff --git a/perl/Changes b/perl/Changes index 8dc832e2..90f1b4a4 100644 --- a/perl/Changes +++ b/perl/Changes @@ -1,4 +1,10 @@ +--- +version: 0.1.44 +date: Mon Mar 18 08:14:24 AM PDT 2024 +changes: +- libyamlscript 0.1.44 + --- version: 0.1.43 date: Sun Mar 17 03:34:47 PM PDT 2024 diff --git a/perl/Meta b/perl/Meta index 48c48c9e..9c246794 100644 --- a/perl/Meta +++ b/perl/Meta @@ -3,7 +3,7 @@ base: ../Meta name: YAMLScript -version: 0.1.43 +version: 0.1.44 language: perl @@ -12,7 +12,7 @@ author: requires: perl: 5.16.0 - Alien::YAMLScript: 0.1.43 + Alien::YAMLScript: 0.1.44 FFI::CheckLib: 0.31 FFI::Platypus: 2.08 Cpanel::JSON::XS: 4.37 diff --git a/perl/lib/YAMLScript.pm b/perl/lib/YAMLScript.pm index e98cf7c7..64f8b1c1 100644 --- a/perl/lib/YAMLScript.pm +++ b/perl/lib/YAMLScript.pm @@ -7,9 +7,9 @@ use FFI::CheckLib (); use FFI::Platypus; use Cpanel::JSON::XS (); -our $VERSION = '0.1.43'; +our $VERSION = '0.1.44'; -our $libyamlscript_version = '0.1.43'; +our $libyamlscript_version = '0.1.44'; #------------------------------------------------------------------------------ diff --git a/python/lib/yamlscript/__init__.py b/python/lib/yamlscript/__init__.py index b1938222..efdc9545 100644 --- a/python/lib/yamlscript/__init__.py +++ b/python/lib/yamlscript/__init__.py @@ -16,7 +16,7 @@ # This value is automatically updated by 'make bump'. # The version number is used to find the correct shared library file. # We currently only support binding to an exact version of libyamlscript. -yamlscript_version = '0.1.43' +yamlscript_version = '0.1.44' import os, sys import ctypes diff --git a/python/setup.py b/python/setup.py index 8b92e623..1e4d1e04 100644 --- a/python/setup.py +++ b/python/setup.py @@ -1,4 +1,4 @@ -version = '0.1.43' +version = '0.1.44' from setuptools import setup import pathlib diff --git a/raku/META6.json b/raku/META6.json index c0d30a86..22bc9192 100644 --- a/raku/META6.json +++ b/raku/META6.json @@ -1,6 +1,6 @@ { "api": 0 , "name": "YAMLScript" -, "version": "0.1.43" +, "version": "0.1.44" , "description": "Program in YAML" , "auth": "zef:ingy" , "provides": diff --git a/raku/lib/YAMLScript.rakumod b/raku/lib/YAMLScript.rakumod index def0136c..ceccf037 100644 --- a/raku/lib/YAMLScript.rakumod +++ b/raku/lib/YAMLScript.rakumod @@ -2,7 +2,7 @@ unit class YAMLScript; use NativeCall; -constant YAMLSCRIPT_VERSION = v0.1.43; +constant YAMLSCRIPT_VERSION = v0.1.44; sub from-j($t) { ::("Rakudo::Internals::JSON").from-json($t); } diff --git a/ruby/ChangeLog.md b/ruby/ChangeLog.md index bc195086..47715f1a 100644 --- a/ruby/ChangeLog.md +++ b/ruby/ChangeLog.md @@ -1,3 +1,7 @@ +## [0.1.44] - 2024-03-18 + +- libyamlscript 0.1.44 + ## [0.1.43] - 2024-03-17 - libyamlscript 0.1.43 diff --git a/ruby/lib/yamlscript.rb b/ruby/lib/yamlscript.rb index ec3c9568..2dad2ed0 100644 --- a/ruby/lib/yamlscript.rb +++ b/ruby/lib/yamlscript.rb @@ -16,7 +16,7 @@ class YAMLScript # TODO: This value is automatically updated by 'make bump'. # The version number is used to find the correct shared library file. # We currently only support binding to an exact version of libyamlscript. - YAMLSCRIPT_VERSION = '0.1.43' + YAMLSCRIPT_VERSION = '0.1.44' # A low-level interface to the native library module LibYAMLScript diff --git a/ruby/lib/yamlscript/version.rb b/ruby/lib/yamlscript/version.rb index 9c3e20db..e5cbcb28 100644 --- a/ruby/lib/yamlscript/version.rb +++ b/ruby/lib/yamlscript/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true class YAMLScript - VERSION = "0.1.43" + VERSION = "0.1.44" end diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 4676ecda..e12e8439 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -174,7 +174,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "yamlscript" -version = "0.1.43" +version = "0.1.44" dependencies = [ "dlopen", "libc", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index c5dfe679..8dced770 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yamlscript" -version = "0.1.43" +version = "0.1.44" edition = "2021" description = "Program in YAML" license = "MIT" diff --git a/rust/src/lib.rs b/rust/src/lib.rs index df2356ea..6ce53eaf 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -63,7 +63,7 @@ use serde::Deserialize; use crate::error::LibYAMLScriptError; /// The name of the yamlscript library to load. -const LIBYAMLSCRIPT_FILENAME: &str = "libyamlscript.so.0.1.43"; +const LIBYAMLSCRIPT_FILENAME: &str = "libyamlscript.so.0.1.44"; /// A wrapper around libyamlscript. pub struct YAMLScript { diff --git a/www/src/index.md b/www/src/index.md index 3cdfc8d4..22e7bf2c 100644 --- a/www/src/index.md +++ b/www/src/index.md @@ -226,7 +226,7 @@ or: ```text $ ys --version -YAMLScript 0.1.43 +YAMLScript 0.1.44 ``` @@ -255,9 +255,9 @@ For Python you would do: ```bash $ pip install yamlscript -Successfully installed yamlscript-0.1.43 -$ curl -sSL yamlscript.org/install | VERSION=0.1.43 install -Installed ~/.local/lib/libyamlscript.so - version 0.1.43 +Successfully installed yamlscript-0.1.44 +$ curl -sSL yamlscript.org/install | VERSION=0.1.44 install +Installed ~/.local/lib/libyamlscript.so - version 0.1.44 ``` For some other language, use that language's library installer. diff --git a/www/src/install b/www/src/install index d754a8ff..ac6a1148 100644 --- a/www/src/install +++ b/www/src/install @@ -4,7 +4,7 @@ set -e -u -o pipefail -LIBYAMLSCRIPT_VERSION=0.1.43 +LIBYAMLSCRIPT_VERSION=0.1.44 VERSION=${VERSION:-$LIBYAMLSCRIPT_VERSION} export VERSION diff --git a/ys/deps.edn b/ys/deps.edn index eef613dc..1fdbbaed 100644 --- a/ys/deps.edn +++ b/ys/deps.edn @@ -7,7 +7,7 @@ org.babashka/sci {:mvn/version "0.8.41"}, babashka/process {:mvn/version "0.5.21"}, clj-commons/clj-yaml {:mvn/version "1.0.27"}, - yamlscript/core {:mvn/version "0.1.43"}}, + yamlscript/core {:mvn/version "0.1.44"}}, :aliases {:lein2deps {:deps diff --git a/ys/project.clj b/ys/project.clj index 4660351e..a8dda6ba 100644 --- a/ys/project.clj +++ b/ys/project.clj @@ -1,7 +1,7 @@ ;; This code is licensed under MIT license (See License for details) ;; Copyright 2023-2024 Ingy dot Net -(defproject yamlscript.cli "0.1.43-SNAPSHOT" +(defproject yamlscript.cli "0.1.44-SNAPSHOT" :description "YAMLScript Command Line Tool" :url "https://github.com/yaml/yamlscript" @@ -24,7 +24,7 @@ [org.babashka/sci "0.8.41"] [babashka/process "0.5.21"] [clj-commons/clj-yaml "1.0.27"] - [yamlscript/core "0.1.43"]] + [yamlscript/core "0.1.44"]] :main ^:skip-aot yamlscript.cli diff --git a/ys/share/ys-0.bash b/ys/share/ys-0.bash index 1ca13a5a..ebfcf382 100755 --- a/ys/share/ys-0.bash +++ b/ys/share/ys-0.bash @@ -4,7 +4,7 @@ set -euo pipefail [[ ${YS_SH_DEBUG-} ]] && set -x -yamlscript_version=0.1.43 +yamlscript_version=0.1.44 main() ( setup "$@" diff --git a/ys/src/yamlscript/cli.clj b/ys/src/yamlscript/cli.clj index be525eb8..4a026902 100644 --- a/ys/src/yamlscript/cli.clj +++ b/ys/src/yamlscript/cli.clj @@ -21,7 +21,7 @@ [clojure.string :as str] [clojure.tools.cli :as cli])) -(def yamlscript-version "0.1.43") +(def yamlscript-version "0.1.44") (def testing (atom false)) diff --git a/ys/test/cli-usage.t b/ys/test/cli-usage.t index f8c57d9c..33c1280e 100644 --- a/ys/test/cli-usage.t +++ b/ys/test/cli-usage.t @@ -2,11 +2,11 @@ source test/init -VERSION=0.1.43 +VERSION=0.1.44 cmd='ys --version' -is "$($cmd)" "YAMLScript 0.1.43" "$cmd" +is "$($cmd)" "YAMLScript 0.1.44" "$cmd" cmd='ys'