From 655d6efc4159ab00257329c7415d9a7da4383c9b Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Wed, 21 Dec 2022 16:50:57 +0900 Subject: [PATCH 1/2] Implement the matrix build --- .github/workflows/cicd.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index ee645300..997fb98d 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -6,17 +6,29 @@ on: jobs: run-tests: + strategy: + matrix: + os: ["ubuntu:22.04", "almalinux:9"] runs-on: ubuntu-latest + container: + image: ${{ matrix.os }} steps: - # Checkout opensource COBOL - - name: Checkout opensource COBOL 4j - uses: actions/checkout@v2 - - name: Install dependencies + - name: Install dependencies on Ubuntu 22.04 + if: matrix.os == 'ubuntu:22.04' run: | - sudo apt-get update - sudo apt-get install default-jdk - sudo apt-get install -y build-essential bison flex gettext texinfo + apt-get update -y + apt-get install -y default-jdk + apt-get install -y build-essential bison flex gettext texinfo automake autoconf libtool + + - name: Install dependencies on AlmaLinux 9 + if: matrix.os == 'almalinux:9' + run: | + dnf -y update + dnf install -y java-17-openjdk-devel gcc gcc-c++ make bison flex automake autoconf libtool diffutils gettext + + - name: Checkout opensource COBOL 4j + uses: actions/checkout@v2 - name: Install opensource COBOL 4j run: | @@ -25,7 +37,7 @@ jobs: export CLASSPATH=":$HOME/.java_lib/sqlite.jar" ./configure --prefix=/usr/ make - sudo make install + make install export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar" - name: Make test scripts @@ -93,7 +105,7 @@ jobs: export CLASSPATH=":$HOME/.java_lib/sqlite.jar" ./configure --prefix=/usr/ --with-vbisam --enable-utf8 make - sudo make install + make install export CLASSPATH=":/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/sqlite.jar" ./i18n_utf8 || true cd ../ From 2261df83b3a95ee927effba8570ee9670b2cc1b2 Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Tue, 31 Jan 2023 10:08:26 +0900 Subject: [PATCH 2/2] Prepare to release v1.0.7 --- ChangeLog | 8 ++++++++ NEWS | 46 +++++++++++++++++++++++++++++++++++++++------- README.md | 2 +- README_JP.md | 2 +- configure | 28 ++++++++++++++-------------- configure.ac | 2 +- tests/package.m4 | 8 ++++---- 7 files changed, 68 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93ddc490..8bbbb243 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2023-01-31 OSS Consortium + + * opensource COBOL 4J v1.0.7 released. + +2022-12-29 OSS Consortium + + * opensource COBOL 4J v1.0.6 released. + 2022-11-22 OSS Consortium * opensource COBOL 4J v1.0.5 released. diff --git a/NEWS b/NEWS index e8ede7bb..3bb819eb 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,38 @@ NEWS - user visible changes -*- outline -*- -* opensource cobol 4j 1.0.5 +* opensource cobol 4J 1.0.7 + +** New Features + (1) Implement DELETE statement of SEQUENTIAL files. + (2) Improve Java interface. + (3) Add -java-package option + (4) Implement SET ENVIRONMENT statement + +** Bug fixes + (1) Fix a bug concerning the environment variables COB_OPEN_I_O and COB_OPEN_EXTEND. + (2) Fix the comparsion process of COMP-3 + (3) Fix EXIT PERFORM and EXIT PERFORM CYCLE + +** Miscellaneous + (1) Format all Java source code using Google Java Format + +----------------------------------------------------------------------- + +* opensource cobol 4J 1.0.6 + +** New Features + (1) Add -fshort-variable option + (2) make install command installs libcobj.jar in ${prefix}/lib/opensourcecobol4j + +** Bug fixes + (1) Fix FUNCTION CURRENT-DATE + +** Miscellaneous + (1) Build and run tests on AlmaLinux 9 + +----------------------------------------------------------------------- + +* opensource cobol 4J 1.0.5 ** New Features (1) -m option and cobjrun command (an experimental feature) @@ -30,7 +62,7 @@ NEWS - user visible changes -*- outline -*- ----------------------------------------------------------------------- -* opensource cobol 4j 1.0.4 +* opensource cobol 4J 1.0.4 ** New Features (1) Rename cobc, the compile command, to cobj. @@ -59,14 +91,14 @@ NEWS - user visible changes -*- outline -*- ----------------------------------------------------------------------- -* opensource cobol 4j 1.0.3 +* opensource cobol 4J 1.0.3 ** New features (1) Change the storage library for indexed file to SQLite. ----------------------------------------------------------------------- -* opensource cobol 4j 1.0.2 +* opensource cobol 4J 1.0.2 ** New features (1) Upgrade the license to GPL3. @@ -76,14 +108,14 @@ NEWS - user visible changes -*- outline -*- ----------------------------------------------------------------------- -* opensource cobol 4j 1.0.1 +* opensource cobol 4J 1.0.1 ** Bug fixes (1) Fix the transformation of call arguments ----------------------------------------------------------------------- -* opensource cobol 4j 1.0.0 +* opensource cobol 4J 1.0.0 ** Bug fixes (1) Fix the status code after opening indexed files. @@ -91,6 +123,6 @@ NEWS - user visible changes -*- outline -*- ----------------------------------------------------------------------- -* release opensource COBOL4J developers edition. +* release opensource COBOL 4J developers edition. ----------------------------------------------------------------------- diff --git a/README.md b/README.md index 4ba5a204..5b40740e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # opensource COBOL 4J -[日本語版README](https://github.com/opensourcecobol/opensourcecobol4j/blob/main/README_JP.md) +[日本語版README](./README_JP.md) "opensource COBOL 4J" is a COBOL compiler that translates COBOL parograms to Java programs. This compiler is deeply inspired by ["opensource COBOL"](https://github.com/opensourcecobol/opensource-cobol) which translates COBOL programs to C programs. diff --git a/README_JP.md b/README_JP.md index fc1542b9..8ce345fb 100644 --- a/README_JP.md +++ b/README_JP.md @@ -1,6 +1,6 @@ # opensource COBOL 4J -[English version README](https://github.com/opensourcecobol/opensourcecobol4j/blob/main/README.md) +[English version README](./README.md) opensource COBOL 4JはCOBOLソースコードをJavaソースコードに変換するCOBOLコンパイラです. opensource COBOL 4JはCOBOLからCに変換するCOBOLコンパイラ["opensource COBOL"](https://github.com/opensourcecobol/opensource-cobol)をもとに開発されています. diff --git a/configure b/configure index 000c5cc3..2396da5e 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.69 for opensource COBOL 4j 1.0.5. +# Generated by GNU Autoconf 2.69 for opensource COBOL 4J 1.0.7. # # Report bugs to . # @@ -588,10 +588,10 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='opensource COBOL 4j' -PACKAGE_TARNAME='opensource-cobol-4j-1.0.5' -PACKAGE_VERSION='1.0.5' -PACKAGE_STRING='opensource COBOL 4j 1.0.5' +PACKAGE_NAME='opensource COBOL 4J' +PACKAGE_TARNAME='opensource-cobol-4j-1.0.7' +PACKAGE_VERSION='1.0.7' +PACKAGE_STRING='opensource COBOL 4J 1.0.7' PACKAGE_BUGREPORT='ws-opensource-cobol-contact@osscons.jp' PACKAGE_URL='' @@ -1379,7 +1379,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.5 to adapt to many kinds of systems. +\`configure' configures opensource COBOL 4J 1.0.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1429,7 +1429,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.5] + [DATAROOTDIR/doc/opensource-cobol-4j-1.0.7] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1451,7 +1451,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of opensource COBOL 4j 1.0.5:";; + short | recursive ) echo "Configuration of opensource COBOL 4J 1.0.7:";; esac cat <<\_ACEOF @@ -1581,7 +1581,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -opensource COBOL 4j configure 1.0.5 +opensource COBOL 4J configure 1.0.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2133,7 +2133,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.5, which was +It was created by opensource COBOL 4J $as_me 1.0.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3023,8 +3023,8 @@ fi # Define the identity of the package. - PACKAGE='opensource-cobol-4j-1.0.5' - VERSION='1.0.5' + PACKAGE='opensource-cobol-4j-1.0.7' + VERSION='1.0.7' cat >>confdefs.h <<_ACEOF @@ -23482,7 +23482,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.5, which was +This file was extended by opensource COBOL 4J $as_me 1.0.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23548,7 +23548,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -opensource COBOL 4j config.status 1.0.5 +opensource COBOL 4J config.status 1.0.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index a29ccb27..ad30082e 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_PREREQ(2.59) -AC_INIT([opensource COBOL 4j],[1.0.5],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-4j-1.0.5]) +AC_INIT([opensource COBOL 4J],[1.0.7],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-4j-1.0.7]) AC_CONFIG_SRCDIR([libcob.h]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_TESTDIR([tests]) diff --git a/tests/package.m4 b/tests/package.m4 index a7246a52..e7ed9281 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.0.5]) -m4_define([AT_PACKAGE_VERSION], [1.0.5]) -m4_define([AT_PACKAGE_STRING], [opensource COBOL 4j 1.0.5]) +m4_define([AT_PACKAGE_NAME], [opensource COBOL 4J]) +m4_define([AT_PACKAGE_TARNAME], [opensource-cobol-4j-1.0.7]) +m4_define([AT_PACKAGE_VERSION], [1.0.7]) +m4_define([AT_PACKAGE_STRING], [opensource COBOL 4J 1.0.7]) m4_define([AT_PACKAGE_BUGREPORT], [ws-opensource-cobol-contact@osscons.jp])