From 3c0df621cb4f799b27e7c5230845af4915f8892b Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Tue, 30 Jul 2024 10:42:55 +0900 Subject: [PATCH 1/5] [Update]: change the version numbers to 1.1.2 --- README.md | 8 +++--- README_JP.md | 12 ++++----- configure | 26 +++++++++---------- configure.ac | 2 +- libcobj/app/build.gradle.kts | 2 +- .../opensourcecobol/libcobj/Const.java | 2 +- .../user_util/cobj_api/ApiFilesOptions.java | 2 +- .../command-line-options.src/info-java-dir.at | 8 +++--- tests/package.m4 | 6 ++--- win/config.h | 8 +++--- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 08bc1094..3dc8b582 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,9 @@ dnf install -y java-21-amazon-corretto-devel gcc make bison flex automake autoco ### Install opensource COBOL 4J ``` -curl -L -o opensourcecobol4j-v1.1.1.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.1.tar.gz -tar zxvf opensourcecobol4j-v1.1.1.tar.gz -cd opensourcecobol4j-1.1.1 +curl -L -o opensourcecobol4j-v1.1.2.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.2.tar.gz +tar zxvf opensourcecobol4j-v1.1.2.tar.gz +cd opensourcecobol4j-1.1.2 ./configure --prefix=/usr/ make sudo make install @@ -113,7 +113,7 @@ Then, libcobj.jar will be created in `libcobj/app/build/libs/`. The docker container for opensource COBOL 4J is available. ```bash -docker pull opensourcecobol/opensourcecobol4j:1.1.1 +docker pull opensourcecobol/opensourcecobol4j:1.1.2 ``` Execute the following commands in order to run the "Hello World" COBOL program. diff --git a/README_JP.md b/README_JP.md index ee6af7c8..5adc8cbb 100644 --- a/README_JP.md +++ b/README_JP.md @@ -23,7 +23,7 @@ opensource COBOL 4J は下記の環境でテストされています. ## インストール -opensource COBOL 4J v1.1.1はUbuntuとAlmaLinuxで動作を確認しています. +opensource COBOL 4J v1.1.2はUbuntuとAlmaLinuxで動作を確認しています. ## 手動インストール @@ -57,9 +57,9 @@ dnf install -y java-21-amazon-corretto-devel gcc make bison flex automake autoco 下記のコマンドを実行する ``` -curl -L -o opensourcecobol4j-v1.1.1.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.1.tar.gz -tar zxvf opensourcecobol4j-v1.1.1.tar.gz -cd opensourcecobol4j-1.1.1 +curl -L -o opensourcecobol4j-v1.1.2.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.2.tar.gz +tar zxvf opensourcecobol4j-v1.1.2.tar.gz +cd opensourcecobol4j-1.1.2 ./configure --prefix=/usr/ make sudo make install @@ -113,10 +113,10 @@ https://www.oracle.com/java/technologies/downloads/?er=221886#java8-windows ## Dockerによるインストール -opensource COBOL 4J v1.1.1をインストールしたDockerイメージを利用できます. +opensource COBOL 4J v1.1.2をインストールしたDockerイメージを利用できます. ```bash -docker pull opensourcecobol/opensourcecobol4j:1.1.1 +docker pull opensourcecobol/opensourcecobol4j:1.1.2 ``` コンテナ内で下記のコマンドを実行すると、Hello Worldプログラムをコンパイル&実行できる. diff --git a/configure b/configure index 42187e90..ab62668d 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for opensource COBOL 4J 1.1.1. +# Generated by GNU Autoconf 2.71 for opensource COBOL 4J 1.1.2. # # Report bugs to . # @@ -620,9 +620,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='opensource COBOL 4J' -PACKAGE_TARNAME='opensource-cobol-4j-1.1.1' -PACKAGE_VERSION='1.1.1' -PACKAGE_STRING='opensource COBOL 4J 1.1.1' +PACKAGE_TARNAME='opensource-cobol-4j-1.1.2' +PACKAGE_VERSION='1.1.2' +PACKAGE_STRING='opensource COBOL 4J 1.1.2' PACKAGE_BUGREPORT='ws-opensource-cobol-contact@osscons.jp' PACKAGE_URL='' @@ -1411,7 +1411,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures opensource COBOL 4J 1.1.1 to adapt to many kinds of systems. +\`configure' configures opensource COBOL 4J 1.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1461,7 +1461,7 @@ Fine tuning of the installation directories: --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] --docdir=DIR documentation root - [DATAROOTDIR/doc/opensource-cobol-4j-1.1.1] + [DATAROOTDIR/doc/opensource-cobol-4j-1.1.2] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1483,7 +1483,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of opensource COBOL 4J 1.1.1:";; + short | recursive ) echo "Configuration of opensource COBOL 4J 1.1.2:";; esac cat <<\_ACEOF @@ -1611,7 +1611,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -opensource COBOL 4J configure 1.1.1 +opensource COBOL 4J configure 1.1.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2099,7 +2099,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by opensource COBOL 4J $as_me 1.1.1, which was +It was created by opensource COBOL 4J $as_me 1.1.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3397,8 +3397,8 @@ fi # Define the identity of the package. - PACKAGE='opensource-cobol-4j-1.1.1' - VERSION='1.1.1' + PACKAGE='opensource-cobol-4j-1.1.2' + VERSION='1.1.2' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -24216,7 +24216,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by opensource COBOL 4J $as_me 1.1.1, which was +This file was extended by opensource COBOL 4J $as_me 1.1.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24284,7 +24284,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -opensource COBOL 4J config.status 1.1.1 +opensource COBOL 4J config.status 1.1.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 5e77113b..77876630 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_PREREQ(2.59) -AC_INIT([opensource COBOL 4J],[1.1.1],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-4j-1.1.1]) +AC_INIT([opensource COBOL 4J],[1.1.2],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-4j-1.1.2]) AC_CONFIG_SRCDIR([libcobj.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_TESTDIR([tests]) diff --git a/libcobj/app/build.gradle.kts b/libcobj/app/build.gradle.kts index 5fa4b6bf..d317d07f 100644 --- a/libcobj/app/build.gradle.kts +++ b/libcobj/app/build.gradle.kts @@ -74,7 +74,7 @@ publishing { register("gpr") { groupId = "jp.osscons.opensourcecobol" artifactId = "libcobj" - version = "1.1.1" + version = "1.1.2" from(components["java"]) } } diff --git a/libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/Const.java b/libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/Const.java index e7aa2292..b308ad9e 100644 --- a/libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/Const.java +++ b/libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/Const.java @@ -23,5 +23,5 @@ public class Const { /** TODO: 準備中 */ - public static final String version = "1.1.1"; + public static final String version = "1.1.2"; } diff --git a/libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/user_util/cobj_api/ApiFilesOptions.java b/libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/user_util/cobj_api/ApiFilesOptions.java index 78c1878e..fedff8f8 100644 --- a/libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/user_util/cobj_api/ApiFilesOptions.java +++ b/libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/user_util/cobj_api/ApiFilesOptions.java @@ -45,7 +45,7 @@ static void getOptions(String[] args) { System.exit(0); return; } else if (cmd.hasOption("v")) { - System.out.println("1.1.1"); + System.out.println("1.1.2"); System.exit(0); return; } else if (cmd.getOptionValue("java-package") != null) { diff --git a/tests/command-line-options.src/info-java-dir.at b/tests/command-line-options.src/info-java-dir.at index 8b7f5939..75663668 100644 --- a/tests/command-line-options.src/info-java-dir.at +++ b/tests/command-line-options.src/info-java-dir.at @@ -28,7 +28,7 @@ AT_DATA([prog.cbl], [ AT_CHECK([${COBJ} -info-json-dir=./ callee.cbl prog.cbl]) AT_CHECK([cat info_callee.json], [0], [{ - "opensourcecobol4j_version": "1.1.1", + "opensourcecobol4j_version": "1.1.2", "program_id": "callee", "procedure_division_using_parameters": @<:@ { @@ -45,7 +45,7 @@ AT_CHECK([cat info_callee.json], [0], AT_CHECK([cat info_prog.json], [0], [{ - "opensourcecobol4j_version": "1.1.1", + "opensourcecobol4j_version": "1.1.2", "program_id": "prog", "procedure_division_using_parameters": @<:@ @:>@ @@ -64,7 +64,7 @@ AT_CHECK([${COBJ} -info-json-dir=bbb callee.cbl prog.cbl]) AT_CHECK([cat bbb/info_callee.json], [0], [{ - "opensourcecobol4j_version": "1.1.1", + "opensourcecobol4j_version": "1.1.2", "program_id": "callee", "procedure_division_using_parameters": @<:@ { @@ -81,7 +81,7 @@ AT_CHECK([cat bbb/info_callee.json], [0], AT_CHECK([cat bbb/info_prog.json], [0], [{ - "opensourcecobol4j_version": "1.1.1", + "opensourcecobol4j_version": "1.1.2", "program_id": "prog", "procedure_division_using_parameters": @<:@ @:>@ diff --git a/tests/package.m4 b/tests/package.m4 index b0086d04..4b0b60db 100644 --- a/tests/package.m4 +++ b/tests/package.m4 @@ -1,6 +1,6 @@ # Signature of the current package. m4_define([AT_PACKAGE_NAME], [opensource COBOL 4J]) -m4_define([AT_PACKAGE_TARNAME], [opensource-cobol-4j-1.1.1]) -m4_define([AT_PACKAGE_VERSION], [1.1.1]) -m4_define([AT_PACKAGE_STRING], [opensource COBOL 4J 1.1.1]) +m4_define([AT_PACKAGE_TARNAME], [opensource-cobol-4j-1.1.2]) +m4_define([AT_PACKAGE_VERSION], [1.1.2]) +m4_define([AT_PACKAGE_STRING], [opensource COBOL 4J 1.1.2]) m4_define([AT_PACKAGE_BUGREPORT], [ws-opensource-cobol-contact@osscons.jp]) diff --git a/win/config.h b/win/config.h index 3dce1590..98802e06 100644 --- a/win/config.h +++ b/win/config.h @@ -299,7 +299,7 @@ #define ICONV_CONST /* Name of package */ -#define PACKAGE "opensource-cobol4j-1.1.1" +#define PACKAGE "opensource-cobol4j-1.1.2" /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "ws-opensource-cobol-contact@osscons.jp" @@ -308,13 +308,13 @@ #define PACKAGE_NAME "opensource COBOL 4J" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "opensource COBOL 4J 1.1.1" +#define PACKAGE_STRING "opensource COBOL 4J 1.1.2" /* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "opensource-cobol4j-1.1.1" +#define PACKAGE_TARNAME "opensource-cobol4j-1.1.2" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.1.1" +#define PACKAGE_VERSION "1.1.2" /* Define a patch level */ #define PATCH_LEVEL 0 From f417f20438c63b7116d4a99cfc7c4bab41fe186e Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Tue, 30 Jul 2024 10:51:50 +0900 Subject: [PATCH 2/5] [Doc]: update requirements-all.md --- doc/requirements-all.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/requirements-all.md b/doc/requirements-all.md index d3786409..d9647262 100644 --- a/doc/requirements-all.md +++ b/doc/requirements-all.md @@ -1,5 +1,9 @@ | version (opensource COBOL 4J) | OS | version (JDK) | | -- | -- | -- | +| 1.1.2 | Windows | 21 | +| 1.1.2 | Ubuntu 24.04 | 21 | +| 1.1.2 | AlmaLinux 9 | 11 | +| 1.1.2 | Amazon Linux 2023 | 21 | | 1.1.1 | Windows | 21 | | 1.1.1 | Ubuntu 24.04 | 21 | | 1.1.1 | AlmaLinux 9 | 11 | From 384af949ae63ddfb85068a919f72a7c92310bfca Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Tue, 30 Jul 2024 11:10:38 +0900 Subject: [PATCH 3/5] [Doc]: Update ChangeLog, CHANGELOD.md and NEWS --- CHANGELOG.md | 12 +++++++++++- ChangeLog | 4 ++++ NEWS | 14 ++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f8d31f7..f905f513 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [1.1.2] - 2024-07-31 +### Added +* Add a new command line option `-Wtruncate` (#459) +### Fix +* Fix `CALL (an integer) BY CONTENT` (#453) +### Miscellaneous +* Change `-m` option so that it becomes an alias of `-jar` (#456) + * Thanks to this change, generated jar files contains only class files +* Improve code generated by cobj-api (#452) +* Show an error message when SCREEN SECTION is found (#454) ## [1.1.1] - 2024-06-28 ### Added * Release [API reference](https://opensourcecobol.github.io/opensourcecobol4j/javadoc/libcobj/index.html) of the runtime library `libcobj.jar` (#445) @@ -12,7 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [1.1.0] - 2024-05-31 New! opensource COBOL 4J supports Windows! (#377) ### Added -* Add a command line option `-Wimplicit-define` option (#386) +* Add a command line option `-Wimplicit-define` (#386) ### Fix * Fix READ PREVIOUS statement after START statement with <= operator (#379) * Fix Java code generated by cobj-api (#380) diff --git a/ChangeLog b/ChangeLog index 56cb6b8c..7d3632c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2024-07-31 OSS Consortium + + * opensource COBOL 4J v1.1.2 released. + 2024-06-28 OSS Consortium * opensource COBOL 4J v1.1.1 released. diff --git a/NEWS b/NEWS index 1dd7d9c6..5ba91b8c 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,20 @@ NEWS - user visible changes -*- outline -*- ----------------------------------------------------------------------- +* opensource COBOL 4J 1.1.2 + +** New Features + (1) Add a new command line option `-Wtruncate` (#459) +** Bug Fixes + (1) Fix `CALL (an integer) BY CONTENT` (#453) +** Miscellaneous + (1) Change `-m` option so that it becomes an alias of `-jar` (#456) + Thanks to this change, generated jar files contains only class files + (2) Improve code generated by cobj-api (#452) + (3) Show an error message when SCREEN SECTION is found (#454) + +----------------------------------------------------------------------- + * opensource COBOL 4J 1.1.1 ** New Features From 9537ca2ccb70f63b50b8c3f85b0669f4e42c436f Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Tue, 30 Jul 2024 11:14:12 +0900 Subject: [PATCH 4/5] [Doc]: update ReleaseNote.md --- ReleaseNote.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/ReleaseNote.md b/ReleaseNote.md index e206dda3..557babcc 100644 --- a/ReleaseNote.md +++ b/ReleaseNote.md @@ -1,5 +1,10 @@ # Added -* Release [API refenrence](https://opensourcecobol.github.io/opensourcecobol4j/javadoc/libcobj/index.html) of the runtime library `libcobj.jar` -* opensource COBOL 4J on Windows passed COBOL85 test suites +* Add a new command line option `-Wtruncate` + * When -Wtruncate is enabled, cobj warns data truncations of MOVE statements +# Fix +* Fix `CALL (an integer) BY CONTENT` # Miscellaneous -* Upgrade dependencies of `libcobj.jar` to the latest versions \ No newline at end of file +* Change `-m` option so that it becomes an alias of `-jar` + * Thanks to this change, generated jar files contains only class files +* Improve code generated by cobj-api +* Show an error message when SCREEN SECTION is found \ No newline at end of file From 374449d1959250de77436f344adaef85fe5226f3 Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Tue, 30 Jul 2024 16:50:43 +0900 Subject: [PATCH 5/5] [Doc]: update changelogs --- CHANGELOG.md | 5 ++--- NEWS | 12 ++++++------ ReleaseNote.md | 13 ++++++------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f905f513..ad2a502c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Added * Add a new command line option `-Wtruncate` (#459) ### Fix +* Change `-m` option so that generated jar files contains only class files. Now `-m` becomes an alias of `-jar`. (#456) * Fix `CALL (an integer) BY CONTENT` (#453) +* Show an error message when SCREEN SECTION is found (#454) ### Miscellaneous -* Change `-m` option so that it becomes an alias of `-jar` (#456) - * Thanks to this change, generated jar files contains only class files * Improve code generated by cobj-api (#452) -* Show an error message when SCREEN SECTION is found (#454) ## [1.1.1] - 2024-06-28 ### Added * Release [API reference](https://opensourcecobol.github.io/opensourcecobol4j/javadoc/libcobj/index.html) of the runtime library `libcobj.jar` (#445) diff --git a/NEWS b/NEWS index 5ba91b8c..10265a63 100644 --- a/NEWS +++ b/NEWS @@ -5,14 +5,14 @@ NEWS - user visible changes -*- outline -*- * opensource COBOL 4J 1.1.2 ** New Features - (1) Add a new command line option `-Wtruncate` (#459) + (1) Add a new command line option `-Wtruncate` ** Bug Fixes - (1) Fix `CALL (an integer) BY CONTENT` (#453) + (1) Fix `CALL (an integer) BY CONTENT`. + (2) Change `-m` option so that generated jar files contains only class files. + Now `-m` becomes an alias of `-jar`. + (3) Show an error message when SCREEN SECTION is found. ** Miscellaneous - (1) Change `-m` option so that it becomes an alias of `-jar` (#456) - Thanks to this change, generated jar files contains only class files - (2) Improve code generated by cobj-api (#452) - (3) Show an error message when SCREEN SECTION is found (#454) + (1) Improve code generated by cobj-api. ----------------------------------------------------------------------- diff --git a/ReleaseNote.md b/ReleaseNote.md index 557babcc..c48dd1a6 100644 --- a/ReleaseNote.md +++ b/ReleaseNote.md @@ -1,10 +1,9 @@ # Added -* Add a new command line option `-Wtruncate` - * When -Wtruncate is enabled, cobj warns data truncations of MOVE statements +* Add a new command line option `-Wtruncate`. + * When `-Wtruncate` is enabled, cobj warns data truncations of MOVE statements. # Fix -* Fix `CALL (an integer) BY CONTENT` +* Fix `CALL (an integer) BY CONTENT`. +* Change `-m` option so that generated jar files contains only class files. Now `-m` becomes an alias of `-jar`. +* Show an error message when SCREEN SECTION is found. # Miscellaneous -* Change `-m` option so that it becomes an alias of `-jar` - * Thanks to this change, generated jar files contains only class files -* Improve code generated by cobj-api -* Show an error message when SCREEN SECTION is found \ No newline at end of file +* Improve code generated by cobj-api. \ No newline at end of file