Skip to content

Release v1.1.0 #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 31, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -3,6 +3,17 @@
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.0] - 2024-05-31
New! opensource COBOL 4J supports Windows! (#377)
### Added
* Add a command line option `-Wimplicit-define` option (#386)
### Fix
* Fix READ PREVIOUS statement after START statement with <= operator (#379)
* Fix Java code generated by cobj-api (#380)
* "-" in Java variables are converted to "_"
### Miscellaneous
* Refactor libcobj/ (#387)
* Support Ubuntu 24.04 (#375)
## [1.0.22] - 2024-04-30
### Added
* Add cobj-api command (#370)
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2024-05-31 OSS Consortium <ws-opensource-cobol-contact@osscons.jp>

* opensource COBOL 4J v1.1.0 released.

2024-04-30 OSS Consortium <ws-opensource-cobol-contact@osscons.jp>

* opensource COBOL 4J v1.0.22 released.
14 changes: 14 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -2,6 +2,20 @@ NEWS - user visible changes -*- outline -*-

-----------------------------------------------------------------------

* opensource COBOL 4J 1.1.0

** New Features
(1) Support Windows
(2) Add `-Wimplicit-define`
** Bug Fixes
(1) Fix READ PREVIOUS statement after START statement with <= operator
(2) Fix Java code generated by cobj-api. Symbols "-" in Java variables are converted to "_"
** Miscellaneous
(1) Refactor libcobj/
(2) Support Ubuntu 24.04

-----------------------------------------------------------------------

* opensource COBOL 4J 1.0.22

** New Features
23 changes: 18 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ opensource COBOL 4J is tested with the following platforms and dependencies
In order to check requirements of older versions,
see [doc/requirements-all.md](./doc/requirements-all.md).

## Installation
## Installation (Linux)

### Install dependencies

@@ -53,9 +53,9 @@ dnf install -y java-21-amazon-corretto-devel gcc make bison flex automake autoco

### Install opensource COBOL 4J
```
curl -L -o opensourcecobol4j-v1.0.22.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.22.tar.gz
tar zxvf opensourcecobol4j-v1.0.22.tar.gz
cd opensourcecobol4j-1.0.22
curl -L -o opensourcecobol4j-v1.1.0.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.0.tar.gz
tar zxvf opensourcecobol4j-v1.1.0.tar.gz
cd opensourcecobol4j-1.1.0
./configure --prefix=/usr/
make
sudo make install
@@ -67,12 +67,25 @@ Add /usr/lib/opensourcecobol4j/libcobj.jar to the environment variable $CLASSPAT
In order to check installations of older versions,
[doc/installation/](./doc/installation) directory respectively


## Installation (Windows)

1. Visit the [Release page](https://github.com/opensourcecobol/opensourcecobol4j/releases/tag/v1.1.0)
1. Download Source code and extract it.
1. Download `cobj.exe`.
1. Download `libcobj.jar`.
1. Rename the directory `opensourcecobol4j-1.1.0\opensourcecobol4j-1.1.0` to `opensourcecobol4j-1.1.0\opensourcecobol4j`.
1. Move the directory `opensourcecobol4j-1.1.0\opensourcecobol4j` to `C:\`.
1. Make sure that there exists a directory `C:\opensourcecobol4j\config`.
1. Update the environment variable `Path` so that it contains the directory containing `cobj.exe`
1. Update the environment variable `CLASSPATH` so that it contains the path to `libcobj.jar`.

### Install with Docker

The docker container for opensource COBOL 4J is available.

```bash
docker pull opensourcecobol/opensourcecobol4j:1.0.22
docker pull opensourcecobol/opensourcecobol4j:1.1.0
```

Execute the following commands in order to run the "Hello World" COBOL program.
26 changes: 19 additions & 7 deletions README_JP.md
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ opensource COBOL 4J は下記の環境でテストされています.

## インストール

opensource COBOL 4J v1.0.22はUbuntuとAlmaLinuxで動作を確認しています.
opensource COBOL 4J v1.1.0はUbuntuとAlmaLinuxで動作を確認しています.

## 手動インストール

@@ -52,14 +52,14 @@ dnf -y update
dnf install -y java-21-amazon-corretto-devel gcc make bison flex automake autoconf diffutils gettext tar gzip
```

### opensource COBOL 4Jのインストール
### opensource COBOL 4Jのインストール (Linux)

下記のコマンドを実行する

```
curl -L -o opensourcecobol4j-v1.0.22.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.22.tar.gz
tar zxvf opensourcecobol4j-v1.0.22.tar.gz
cd opensourcecobol4j-1.0.22
curl -L -o opensourcecobol4j-v1.1.0.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.0.tar.gz
tar zxvf opensourcecobol4j-v1.1.0.tar.gz
cd opensourcecobol4j-1.1.0
./configure --prefix=/usr/
make
sudo make install
@@ -71,12 +71,24 @@ sudo make install

古いバージョンのインストール方法は、[doc/installation_jp](./doc/installation_jp)をご覧ください.

## opensource COBOL 4Jのインストール (Windows)

1. [リリースページ](https://github.com/opensourcecobol/opensourcecobol4j/releases/tag/v1.1.0)を開く
1. ソースコードをダウンロードして、回答する。
1. `cobj.exe`をダウンロードする.
1. `libcobj.jar`をダウンロードする.
1. `opensourcecobol4j-1.1.0\opensourcecobol4j-1.1.0`ディレクトリを`opensourcecobol4j-1.1.0\opensourcecobol4j`にリネームする。
1. `opensourcecobol4j-1.1.0\opensourcecobol4j`ディレクトリを`C:\`に移動する.
1. これによりディレクトリ`C:\opensourcecobol4j\config`が存在することを確認する.
1. 環境変数`Path`を設定して`cobj.exe`にパスを通す.
1. 環境変数`CLASSPATH`を設定して`libcobj.jar`にパスを通す.

## Dockerによるインストール

opensource COBOL 4J v1.0.22をインストールしたDockerイメージを利用できます.
opensource COBOL 4J v1.1.0をインストールしたDockerイメージを利用できます.

```bash
docker pull opensourcecobol/opensourcecobol4j:1.0.22
docker pull opensourcecobol/opensourcecobol4j:1.1.0
```

コンテナ内で下記のコマンドを実行すると、Hello Worldプログラムをコンパイル&実行できる。
14 changes: 8 additions & 6 deletions ReleaseNote.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
New! opensource COBOL 4J supports Windows!
# Added
* Add cobj-api command (#370)
* With cobj-api, you can easily generate an Spring boot Java file that calls the program generated by cobj.
* See https://github.com/opensourcecobol/opensourcecobol4j?tab=readme-ov-file#cobj-api
* Implement a -Wstrict-typing (#369)
* Add a command line option `-Wimplicit-define` option
# Fix
* Fix READ PREVIOUS statement after START statement with <= operator
* Fix Java code generated by cobj-api
* "-" in Java variables are converted to "_"
# Miscellaneous
* Simplify generated Java code based on SonarQube analysis (#366)
* Improve the error message for record keys with duplicates (#368)
* Refactor libcobj/
* Support Ubuntu 24.04
26 changes: 13 additions & 13 deletions configure
Original file line number Diff line number Diff line change
@@ -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.22.
# Generated by GNU Autoconf 2.71 for opensource COBOL 4J 1.1.0.
#
# Report bugs to <ws-opensource-cobol-contact@osscons.jp>.
#
@@ -620,9 +620,9 @@ MAKEFLAGS=

# Identity of this package.
PACKAGE_NAME='opensource COBOL 4J'
PACKAGE_TARNAME='opensource-cobol-4j-1.0.22'
PACKAGE_VERSION='1.0.22'
PACKAGE_STRING='opensource COBOL 4J 1.0.22'
PACKAGE_TARNAME='opensource-cobol-4j-1.1.0'
PACKAGE_VERSION='1.1.0'
PACKAGE_STRING='opensource COBOL 4J 1.1.0'
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.0.22 to adapt to many kinds of systems.
\`configure' configures opensource COBOL 4J 1.1.0 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.0.22]
[DATAROOTDIR/doc/opensource-cobol-4j-1.1.0]
--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.0.22:";;
short | recursive ) echo "Configuration of opensource COBOL 4J 1.1.0:";;
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.0.22
opensource COBOL 4J configure 1.1.0
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.0.22, which was
It was created by opensource COBOL 4J $as_me 1.1.0, 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.0.22'
VERSION='1.0.22'
PACKAGE='opensource-cobol-4j-1.1.0'
VERSION='1.1.0'


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.0.22, which was
This file was extended by opensource COBOL 4J $as_me 1.1.0, 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.0.22
opensource COBOL 4J config.status 1.1.0
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"

2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@

AC_PREREQ(2.59)

AC_INIT([opensource COBOL 4J],[1.0.22],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-4j-1.0.22])
AC_INIT([opensource COBOL 4J],[1.1.0],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-4j-1.1.0])
AC_CONFIG_SRCDIR([libcobj.h])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_TESTDIR([tests])
4 changes: 4 additions & 0 deletions doc/requirements-all.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
| version (opensource COBOL 4J) | OS | version (JDK) |
| -- | -- | -- |
| 1.1.0 | Windows | 21 |
| 1.1.0 | Ubuntu 24.04 | 21 |
| 1.1.0 | AlmaLinux 9 | 11 |
| 1.1.0 | Amazon Linux 2023 | 21 |
| 1.0.22 | Ubuntu 22.04 | 21 |
| 1.0.22 | AlmaLinux 9 | 11 |
| 1.0.22 | Amazon Linux 2023 | 21 |
2 changes: 1 addition & 1 deletion libcobj/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ publishing {
register<MavenPublication>("gpr") {
groupId = "jp.osscons.opensourcecobol"
artifactId = "libcobj"
version = "1.0.22"
version = "1.1.0"
from(components["java"])
}
}
Original file line number Diff line number Diff line change
@@ -41,5 +41,5 @@ public class Const {
// TODO 標準パスの設定
public static final String COB_LIBRARY_PATH = "";

public static final String version = "1.0.22";
public static final String version = "1.1.0";
}
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ public static void getOptions(String[] args) {
System.exit(0);
return;
} else if (cmd.hasOption("v")) {
System.out.println("1.0.22");
System.out.println("1.1.0");
System.exit(0);
return;
} else if (cmd.getOptionValue("java-package") != null) {
8 changes: 4 additions & 4 deletions tests/command-line-options.src/info-java-dir.at
Original file line number Diff line number Diff line change
@@ -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.0.22",
"opensourcecobol4j_version": "1.1.0",
"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.0.22",
"opensourcecobol4j_version": "1.1.0",
"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.0.22",
"opensourcecobol4j_version": "1.1.0",
"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.0.22",
"opensourcecobol4j_version": "1.1.0",
"program_id": "prog",
"procedure_division_using_parameters": @<:@
@:>@
6 changes: 3 additions & 3 deletions tests/package.m4
Original file line number Diff line number Diff line change
@@ -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.22])
m4_define([AT_PACKAGE_VERSION], [1.0.22])
m4_define([AT_PACKAGE_STRING], [opensource COBOL 4J 1.0.22])
m4_define([AT_PACKAGE_TARNAME], [opensource-cobol-4j-1.1.0])
m4_define([AT_PACKAGE_VERSION], [1.1.0])
m4_define([AT_PACKAGE_STRING], [opensource COBOL 4J 1.1.0])
m4_define([AT_PACKAGE_BUGREPORT], [ws-opensource-cobol-contact@osscons.jp])