From 8b335e21e86556ff4932c93f7522d0201fab987b Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Thu, 28 Sep 2023 10:22:06 +0900 Subject: [PATCH 1/8] [Update]: Change the version number to 1.0.15 --- configure | 26 +++++++++++++------------- configure.ac | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 483820a2..537badb0 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.0.14. +# Generated by GNU Autoconf 2.71 for opensource COBOL 4J 1.0.15. # # Report bugs to . # @@ -620,9 +620,9 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='opensource COBOL 4J' -PACKAGE_TARNAME='opensource-cobol-4j-1.0.14' -PACKAGE_VERSION='1.0.14' -PACKAGE_STRING='opensource COBOL 4J 1.0.14' +PACKAGE_TARNAME='opensource-cobol-4j-1.0.15' +PACKAGE_VERSION='1.0.15' +PACKAGE_STRING='opensource COBOL 4J 1.0.15' PACKAGE_BUGREPORT='ws-opensource-cobol-contact@osscons.jp' PACKAGE_URL='' @@ -1414,7 +1414,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.0.14 to adapt to many kinds of systems. +\`configure' configures opensource COBOL 4J 1.0.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1464,7 +1464,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.0.14] + [DATAROOTDIR/doc/opensource-cobol-4j-1.0.15] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1486,7 +1486,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of opensource COBOL 4J 1.0.14:";; + short | recursive ) echo "Configuration of opensource COBOL 4J 1.0.15:";; esac cat <<\_ACEOF @@ -1617,7 +1617,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -opensource COBOL 4J configure 1.0.14 +opensource COBOL 4J configure 1.0.15 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2105,7 +2105,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.0.14, which was +It was created by opensource COBOL 4J $as_me 1.0.15, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3403,8 +3403,8 @@ fi # Define the identity of the package. - PACKAGE='opensource-cobol-4j-1.0.14' - VERSION='1.0.14' + PACKAGE='opensource-cobol-4j-1.0.15' + VERSION='1.0.15' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -25367,7 +25367,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.0.14, which was +This file was extended by opensource COBOL 4J $as_me 1.0.15, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25435,7 +25435,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.0.14 +opensource COBOL 4J config.status 1.0.15 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 0f576d7a..86ff3abe 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_PREREQ(2.59) -AC_INIT([opensource COBOL 4J],[1.0.14],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-4j-1.0.14]) +AC_INIT([opensource COBOL 4J],[1.0.15],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-4j-1.0.15]) AC_CONFIG_SRCDIR([libcobj.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_TESTDIR([tests]) From a976093e545509d6889e069a38ab7e3e111879e1 Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Thu, 28 Sep 2023 10:55:59 +0900 Subject: [PATCH 2/8] [Update]: change CHANGELOG.md, ChangeLog and NEWS --- CHANGELOG.md | 14 ++++++++++++++ ChangeLog | 4 ++++ NEWS | 17 +++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2dd0320..3ecc4b13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,20 @@ 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.0.15] - 2023-08-31 +### Added +- Add new intrinsic functions + - EXCEPTION-FILE (#218) + - EXCEPTION-LOCATION (218) + - EXCEPTION-STATEMENT (#221) + - EXCEPTION-STATUS (#221) + - FRACTION-PART (#224) +- Add `-Wredefinition` option (#223) +- Implement `FD` clause with `EXTERNAL` specified (#222) +### Fixed +- Fix a build error on some platforms (#225) +### Changed +- Improve the readability of CALL statements (#202) ## [1.0.14] - 2023-08-31 ### Added diff --git a/ChangeLog b/ChangeLog index 80cc2c72..9eccad64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2023-09-29 OSS Consortium + + * opensource COBOL 4J v1.0.15 released. + 2023-08-31 OSS Consortium * opensource COBOL 4J v1.0.14 released. diff --git a/NEWS b/NEWS index 7487264b..9ce9e8c1 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,23 @@ NEWS - user visible changes -*- outline -*- ----------------------------------------------------------------------- +* opensource COBOL 4J 1.0.15 + +** New Features + (1) Add new intrinsic functions + (a) EXCEPTION-FILE + (b) EXCEPTION-LOCATION + (c) EXCEPTION-STATEMENT + (d) EXCEPTION-STATUS + (e) FRACTION-PART + (2) Add -Wredefinition option + (3) Implement FD clause with EXTERNAL specified + +** Bug fixes + (1) Fix a build error on some platforms + +----------------------------------------------------------------------- + * opensource COBOL 4J 1.0.14 ** New Features From 8d8589e3fda1dd81a79ee1b99e4696f8a16c7673 Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Thu, 28 Sep 2023 11:59:27 +0900 Subject: [PATCH 3/8] [Add]: add a contributing guieline (#220) --- CONTRIBUTING.md | 51 +++++++++++++++++++++++++++++++++++++++++ CONTRIBUTING_JP.md | 57 ++++++++++++++++++++++++++++++++++++++++++++++ README.md | 5 ++-- README_JP.md | 5 ++-- 4 files changed, 114 insertions(+), 4 deletions(-) create mode 100644 CONTRIBUTING.md create mode 100644 CONTRIBUTING_JP.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..09f586e1 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,51 @@ +Thank you for considering to contribute to opensource COBOL 4J. +A summary of how to contribute is below. + +# Issues + +Although any topics related to opensource COBOL 4J can be posted in [Issues](https://github.com/opensourcecobol/opensourcecobol4j/issues), please submit ones written in English or Japanese. + +# Pull Requests + +We will check pull requests which pass all CI checks which run tests and static code analysis. +The static analysis checks whether C and Java source files are respectively formated with [clang-format](https://clang.llvm.org/docs/ClangFormat.html) and [google-java-format](https://github.com/google/google-java-format) and [PMD](https://pmd.github.io/) finds no error and warning in Java source files. + +The below sections describe how to setup and run static code analysis. + +## Setup static analysis tools + +### clang-format + +Run `sudo apt install clang-format` in Ubuntu to install `clang-format`. + +### google-java-format + +Run the following command to download `google-java-format`. +```sh +curl -L -o google-java-format.jar https://github.com/google/google-java-format/releases/download/v1.15.0/google-java-format-1.15.0-all-deps.jar +``` +Then set the environment variable `PATH_GOOGLE_JAVA_FORMAT` to the file path of the jar file. + +### PMD + +Run the following commands to install `PMD`. +```sh +curl -L -o pmd-bin-6.52.0.zip https://github.com/pmd/pmd/releases/download/pmd_releases%2F6.52.0/pmd-bin-6.52.0.zip +unzip pmd-bin-6.52.0.zip +mv pmd-bin-6.52 /usr/local/bin/ +rm pmd-bin-6.52.0.zip +``` + +## Run static analysis + +### clang-format and google-java-format + +Run `./format` in the top directory of opensource COBOL 4J. +If you would like to check whether all files are formated, run `./check-format` in the top directory of opensource COBOL 4J. + +### PMD + +Run the following command in the top directory of opensource COBOL 4J. +``` +/usr/local/bin/pmd-bin-6.52.0/bin/run.sh -d libcobj/src -R .github/ruleset.xml -f text +``` diff --git a/CONTRIBUTING_JP.md b/CONTRIBUTING_JP.md new file mode 100644 index 00000000..28a6febb --- /dev/null +++ b/CONTRIBUTING_JP.md @@ -0,0 +1,57 @@ +opensource COBOL 4Jへのコントリビュートを検討頂きありがとうございます。 +下記にコントリビュートの手順を示します。 + +# Issues + +opensource COBOL 4Jに関するトピックを投稿してください。ただし、英語か日本語での記載をお願いします。 + +# Pull Requests + +We will check pull requests which pass all CI checks which run tests and static code analysis. +The static analysis checks whether C and Java source files are respectively formated with [clang-format](https://clang.llvm.org/docs/ClangFormat.html) and [google-java-format](https://github.com/google/google-java-format) and [PMD](https://pmd.github.io/) finds no error and warning in Java source files. + +The below sections describe how to setup and run static code analysis. + +CIはテストとコードの静的解析を実行します。 +CIの静的解析はCとJavaのソースコードがそれぞれ[clang-format](https://clang.llvm.org/docs/ClangFormat.html) and [google-java-format](https://github.com/google/google-java-format)で整形されているか、 +[PMD](https://pmd.github.io/)によるJavaソースコードの静的解析でエラーや警告が表示されないかをチェックします。 + +下記にそれぞれのツールのセットアップと使用方法を説明します。 + +## セットアップ + +### clang-format + +Ubuntuでは`sudo apt install clang-format`コマンドを実行すれば`clang-format`をインストールできます。 + +### google-java-format + +下記のコマンドを実行して`google-java-format`をダウンロードしてください。 +```sh +curl -L -o google-java-format.jar https://github.com/google/google-java-format/releases/download/v1.15.0/google-java-format-1.15.0-all-deps.jar +``` +さらに環境変数`PATH_GOOGLE_JAVA_FORMAT`に上記のjarファイルのファイルパスを設定してください。 + +### PMD + +下記のコマンドを実行して`PMD`をインストールしてください。 +```sh +curl -L -o pmd-bin-6.52.0.zip https://github.com/pmd/pmd/releases/download/pmd_releases%2F6.52.0/pmd-bin-6.52.0.zip +unzip pmd-bin-6.52.0.zip +mv pmd-bin-6.52 /usr/local/bin/ +rm pmd-bin-6.52.0.zip +``` + +## 静的解析の実行 + +### clang-formatとgoogle-java-format + +opensource COBOL 4Jのトップディレクトリで`./format`を実行してください。 +`./check-format`を実行することで、フォーマットが完了したかを確認できます。 + +### PMD + +opensource COBOL 4Jのトップディレクトリで下記のコマンドを実行してください。 +``` +/usr/local/bin/pmd-bin-6.52.0/bin/run.sh -d libcobj/src -R .github/ruleset.xml -f text +``` diff --git a/README.md b/README.md index 7c7eccbd..d5319c81 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,7 @@ rw 4 0 4 0 0 0 0 0 0 REPORT total 21 0 21 0 0 0 0 0 0 ``` -# Contributors +# Contributing -See https://github.com/opensourcecobol/opensourcecobol4j/graphs/contributors +Guidelines for contributing to opensource COBOL 4J can be found in [CONTRIBUTING.md](./CONTRIBUTING.md). +Contributors are listed in https://github.com/opensourcecobol/opensourcecobol4j/graphs/contributors diff --git a/README_JP.md b/README_JP.md index 03a0aca8..cb053530 100644 --- a/README_JP.md +++ b/README_JP.md @@ -81,6 +81,7 @@ rw 4 0 4 0 0 0 0 0 0 REPORT total 21 0 21 0 0 0 0 0 0 ``` -# コントリビュータ +# コントリビューㇳ -https://github.com/opensourcecobol/opensourcecobol4j/graphs/contributors を参照してください. +コントリビュータの一覧は https://github.com/opensourcecobol/opensourcecobol4j/graphs/contributors に掲載されています。 +コントリビュータ向けのガイドラインは[CONTRIBUTING_JP.md](./CONTRIBUTING_JP.md)を参照してください。 \ No newline at end of file From bbc7d2eaf83840e37ebb23c9b883a1429a7cfdaf Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Thu, 28 Sep 2023 13:22:49 +0900 Subject: [PATCH 4/8] [Update]: change CONTRIBUTING.md slightly --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 09f586e1..fd2847e5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -Thank you for considering to contribute to opensource COBOL 4J. +Thank you for your interest in contributing to opensource COBOL 4J. A summary of how to contribute is below. # Issues From 8859b853616f26c236c6bc33854c95028a784924 Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Thu, 28 Sep 2023 13:25:23 +0900 Subject: [PATCH 5/8] [Update]: change CHANGELOG.md and NEWS slightly --- CHANGELOG.md | 1 + NEWS | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ecc4b13..586a853e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - FRACTION-PART (#224) - Add `-Wredefinition` option (#223) - Implement `FD` clause with `EXTERNAL` specified (#222) +- Add a guideline for contributing (#226) ### Fixed - Fix a build error on some platforms (#225) ### Changed diff --git a/NEWS b/NEWS index 9ce9e8c1..562bcffd 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,9 @@ NEWS - user visible changes -*- outline -*- ** Bug fixes (1) Fix a build error on some platforms +** Miscellaneous + (1) Add a guidelines for contributing + ----------------------------------------------------------------------- * opensource COBOL 4J 1.0.14 From f4dbef96b98f1707d88ad2f842ae501d6cbe2b34 Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Thu, 28 Sep 2023 13:59:12 +0900 Subject: [PATCH 6/8] [Update]: CHANGELOG.md slightly --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 586a853e..7143d936 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,8 +16,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Add a guideline for contributing (#226) ### Fixed - Fix a build error on some platforms (#225) -### Changed -- Improve the readability of CALL statements (#202) ## [1.0.14] - 2023-08-31 ### Added From c6c2c16cf89003da917a4c7926f9de42b205aa38 Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Thu, 28 Sep 2023 16:54:22 +0900 Subject: [PATCH 7/8] [Update]: change CHANGELOG.md, CONTRIBUTING_JP.md and NEWS slightly --- CHANGELOG.md | 4 ++-- CONTRIBUTING_JP.md | 6 ------ NEWS | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7143d936..d7705e25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ 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.0.15] - 2023-08-31 +## [1.0.15] - 2023-09-29 ### Added - Add new intrinsic functions - EXCEPTION-FILE (#218) @@ -12,7 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - EXCEPTION-STATUS (#221) - FRACTION-PART (#224) - Add `-Wredefinition` option (#223) -- Implement `FD` clause with `EXTERNAL` specified (#222) +- Implement `FD` with `EXTERNAL` clause (#222) - Add a guideline for contributing (#226) ### Fixed - Fix a build error on some platforms (#225) diff --git a/CONTRIBUTING_JP.md b/CONTRIBUTING_JP.md index 28a6febb..3aae6638 100644 --- a/CONTRIBUTING_JP.md +++ b/CONTRIBUTING_JP.md @@ -6,12 +6,6 @@ opensource COBOL 4Jへのコントリビュートを検討頂きありがとう opensource COBOL 4Jに関するトピックを投稿してください。ただし、英語か日本語での記載をお願いします。 # Pull Requests - -We will check pull requests which pass all CI checks which run tests and static code analysis. -The static analysis checks whether C and Java source files are respectively formated with [clang-format](https://clang.llvm.org/docs/ClangFormat.html) and [google-java-format](https://github.com/google/google-java-format) and [PMD](https://pmd.github.io/) finds no error and warning in Java source files. - -The below sections describe how to setup and run static code analysis. - CIはテストとコードの静的解析を実行します。 CIの静的解析はCとJavaのソースコードがそれぞれ[clang-format](https://clang.llvm.org/docs/ClangFormat.html) and [google-java-format](https://github.com/google/google-java-format)で整形されているか、 [PMD](https://pmd.github.io/)によるJavaソースコードの静的解析でエラーや警告が表示されないかをチェックします。 diff --git a/NEWS b/NEWS index 562bcffd..2aac7492 100644 --- a/NEWS +++ b/NEWS @@ -12,7 +12,7 @@ NEWS - user visible changes -*- outline -*- (d) EXCEPTION-STATUS (e) FRACTION-PART (2) Add -Wredefinition option - (3) Implement FD clause with EXTERNAL specified + (3) Implement FD with EXTERNAL clause ** Bug fixes (1) Fix a build error on some platforms From fb4371e92df8fdcb6ff66cbd3d94b29e38b35749 Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Fri, 29 Sep 2023 11:22:13 +0900 Subject: [PATCH 8/8] [Fix]: change CONTRIBUTING.md --- CONTRIBUTING.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fd2847e5..530b9254 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,8 +7,8 @@ Although any topics related to opensource COBOL 4J can be posted in [Issues](htt # Pull Requests -We will check pull requests which pass all CI checks which run tests and static code analysis. -The static analysis checks whether C and Java source files are respectively formated with [clang-format](https://clang.llvm.org/docs/ClangFormat.html) and [google-java-format](https://github.com/google/google-java-format) and [PMD](https://pmd.github.io/) finds no error and warning in Java source files. +We will check pull requests that passed all CI checks running both tests and static code analysis. +The static analysis checks whether C and Java source files are formatted using [clang-format](https://clang.llvm.org/docs/ClangFormat.html) and [google-java-format](https://github.com/google/google-java-format) respectively, and whether [PMD](https://pmd.github.io/) finds no error and warning in Java source files. The below sections describe how to setup and run static code analysis. @@ -20,7 +20,7 @@ Run `sudo apt install clang-format` in Ubuntu to install `clang-format`. ### google-java-format -Run the following command to download `google-java-format`. +Run the following command to download `google-java-format`: ```sh curl -L -o google-java-format.jar https://github.com/google/google-java-format/releases/download/v1.15.0/google-java-format-1.15.0-all-deps.jar ``` @@ -28,7 +28,7 @@ Then set the environment variable `PATH_GOOGLE_JAVA_FORMAT` to the file path of ### PMD -Run the following commands to install `PMD`. +Run the following commands to install `PMD`: ```sh curl -L -o pmd-bin-6.52.0.zip https://github.com/pmd/pmd/releases/download/pmd_releases%2F6.52.0/pmd-bin-6.52.0.zip unzip pmd-bin-6.52.0.zip @@ -41,11 +41,11 @@ rm pmd-bin-6.52.0.zip ### clang-format and google-java-format Run `./format` in the top directory of opensource COBOL 4J. -If you would like to check whether all files are formated, run `./check-format` in the top directory of opensource COBOL 4J. +If you want to make sure all files are formatted, run `./check-format` in the top directory of opensource COBOL 4J. ### PMD -Run the following command in the top directory of opensource COBOL 4J. +Run the following command in the top directory of opensource COBOL 4J: ``` /usr/local/bin/pmd-bin-6.52.0/bin/run.sh -d libcobj/src -R .github/ruleset.xml -f text ```