opensourcecobol · yutaro-sakamoto · May 16, 2024 · Apr 19, 2024 · Apr 19, 2024 · May 1, 2024
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
@@ -0,0 +1,25 @@
+name: MSBuild
+
+on:
+  workflow_call:
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v1.0.2
+
+    - name: Restore NuGet packages
+      run: nuget restore ./win/
+
+    - name: Build
+      run: msbuild /p:AdditionalIncludePaths=./:./cobj/:./win:./lib win/opensourcecobol4j.sln
+
+    - name: exec cobj
+      run: |
+        cd win/x64/Debug
+        ./cobj.exe --version
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -67,5 +67,8 @@ jobs:
   javadoc:
     uses: ./.github/workflows/javadoc.yml
 
+  MSbuild:
+    uses: ./.github/workflows/msbuild.yml
+
   static-analysis:
     uses: ./.github/workflows/static-analysis.yml
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -66,5 +66,8 @@ jobs:
   javadoc:
     uses: ./.github/workflows/javadoc.yml
 
+  MSBuild:
+    uses: ./.github/workflows/msbuild.yml
+
   static-analysis:
     uses: ./.github/workflows/static-analysis.yml
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2024-04-30  OSS Consortium <ws-opensource-cobol-contact@osscons.jp>
+
+	* opensource COBOL 4J v1.0.22 released.
+
 2024-03-29  OSS Consortium <ws-opensource-cobol-contact@osscons.jp>
 
 	* opensource COBOL 4J v1.0.21 released.

diff --git a/README.md b/README.md
@@ -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.21.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.21.tar.gz
-tar zxvf opensourcecobol4j-v1.0.21.tar.gz
-cd opensourcecobol4j-1.0.21
+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
 ./configure --prefix=/usr/
 make
 sudo make install
@@ -72,7 +72,7 @@ In order to check installations of older versions,
 The docker container for opensource COBOL 4J is available.
 
 ```bash
-docker pull opensourcecobol/opensourcecobol4j:1.0.21
+docker pull opensourcecobol/opensourcecobol4j:1.0.22
 ```
 
 Execute the following commands in order to run the "Hello World" COBOL program.

diff --git a/README_JP.md b/README_JP.md
@@ -23,7 +23,7 @@ opensource COBOL 4J は下記の環境でテストされています.
 
 ## インストール
 
-opensource COBOL 4J v1.0.21はUbuntuとAlmaLinuxで動作を確認しています.  
+opensource COBOL 4J v1.0.22は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.0.21.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.21.tar.gz
-tar zxvf opensourcecobol4j-v1.0.21.tar.gz
-cd opensourcecobol4j-1.0.21
+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
 ./configure --prefix=/usr/
 make
 sudo make install
@@ -73,10 +73,10 @@ sudo make install
 
 ## Dockerによるインストール
 
-opensource COBOL 4J v1.0.21をインストールしたDockerイメージを利用できます.
+opensource COBOL 4J v1.0.22をインストールしたDockerイメージを利用できます.
 
 ```bash
-docker pull opensourcecobol/opensourcecobol4j:1.0.21
+docker pull opensourcecobol/opensourcecobol4j:1.0.22
 ```
 
 コンテナ内で下記のコマンドを実行すると、Hello Worldプログラムをコンパイル&実行できる。

diff --git a/cobj/cobj.c b/cobj/cobj.c
@@ -1363,8 +1363,8 @@ static char *cobc_temp_name(const char *ext) {
 #ifdef _WIN32
   char temp[MAX_PATH];
 
-  GetTempPath(MAX_PATH, temp);
-  GetTempFileName(temp, "cob", 0, buff);
+  GetTempPath2A(MAX_PATH, temp);
+  GetTempFileNameA(temp, "cob", 0, buff);
   DeleteFile(buff);
   strcpy(buff + strlen(buff) - 4, ext); /* replace ".tmp" by EXT */
 #else

diff --git a/cobj/cobj.h b/cobj/cobj.h
@@ -24,8 +24,17 @@
 
 #include <stdio.h>
 
-#include "lib/gettext.h"
+#ifdef _WIN32
+#include <libcobj.h>
+#else
 #include "libcobj.h"
+#endif
+
+#ifdef _WIN32
+#include <gettext.h>
+#else
+#include "lib/gettext.h"
+#endif
 
 #if !defined(__i386__) && !defined(__x86_64__) && !defined(__powerpc__) &&     \
     !defined(__powerpc64__) && !defined(__ppc__) && !defined(__amd64__)

diff --git a/cobj/codegen.c b/cobj/codegen.c
@@ -44,6 +44,11 @@
 #define INITIALIZE_ONE 1
 #define INITIALIZE_DEFAULT 2
 #define INITIALIZE_COMPOUND 3
+#define EXECUTION_NORMAL 0
+#define EXECUTION_LAST 1
+#define EXECUTION_ERROR_HANDLER 2
+#define BUF_SIZE 1024
+#define MAX_LITERAL_SIZE 64
 
 #ifndef __GNUC__
 static int inside_check = 0;
@@ -189,10 +194,6 @@ static void joutput_label_variable_name(char *s, int key,
                                         struct cb_label *section);
 static void joutput_label_variable_by_value(int value);
 
-const int EXECUTION_NORMAL = 0;
-const int EXECUTION_LAST = 1;
-const int EXECUTION_ERROR_HANDLER = 2;
-
 static char *get_java_identifier_field(struct cb_field *f) {
   char *buf = malloc(COB_SMALL_BUFF);
   if (cb_flag_serial_variable) {
@@ -627,13 +628,15 @@ static void joutput_edit_code_command(const char *target) {
     return;
   }
 
-  const int BUF_SIZE = 1024;
-
   char command[BUF_SIZE];
   char buf[BUF_SIZE];
   sprintf(command, "%s --target=%s", edit_code_command, target);
 
+#ifdef _WIN32
+  FILE *fp = _popen(command, "r");
+#else
   FILE *fp = popen(command, "r");
+#endif
   if (fp == NULL) {
     return;
   }
@@ -642,8 +645,11 @@ static void joutput_edit_code_command(const char *target) {
   while (fgets(buf, BUF_SIZE, fp) != NULL) {
     joutput("%s", buf);
   }
-
+#ifdef _WIN32
+  _pclose(fp);
+#else
   pclose(fp);
+#endif
 }
 
 /*
@@ -1188,7 +1194,6 @@ static struct literal_list *lookup_literal(cb_tree x) {
 }
 
 static void joutput_const_identifier(struct literal_list *l) {
-  const int MAX_LITERAL_SIZE = 64;
   char s[MAX_LITERAL_SIZE + 1];
   memset(s, 0, MAX_LITERAL_SIZE + 1);
   int i = 0;

diff --git a/cobj/flag-help.def b/cobj/flag-help.def
@@ -23,7 +23,11 @@
  * This file describes the options shown when executing cobj --help command
  */
 
+#ifdef _WIN32
+#include <gettext.h>
+#else
 #include "lib/gettext.h"
+#endif
 
 CB_FLAG (cb_flag_trace, "trace",
 	 N_("Generate trace code (Executed SECTION/PARAGRAPH)"))

diff --git a/cobj/flag.def b/cobj/flag.def
@@ -19,8 +19,11 @@
  * Boston, MA 02110-1301 USA
  */
 
-
+#ifdef _WIN32
+#include <gettext.h>
+#else
 #include "lib/gettext.h"
+#endif
 
 /* CB_FLAG (var, name, doc) */
 

diff --git a/cobj/warning-help.def b/cobj/warning-help.def
@@ -19,7 +19,11 @@
  * Boston, MA 02110-1301 USA
  */
 
+#ifdef _WIN32
+#include <gettext.h>
+#else
 #include "lib/gettext.h"
+#endif
 
 /* CB_WARNDEF (var, name, wall, doc) */
 

diff --git a/cobj/warning.def b/cobj/warning.def
@@ -19,7 +19,11 @@
  * Boston, MA 02110-1301 USA
  */
 
+#ifdef _WIN32
+#include <gettext.h>
+#else
 #include "lib/gettext.h"
+#endif
 
 /* CB_WARNDEF (var, name, wall, doc) */
 

diff --git 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.21.
+# Generated by GNU Autoconf 2.71 for opensource COBOL 4J 1.0.22.
 #
 # 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.21'
-PACKAGE_VERSION='1.0.21'
-PACKAGE_STRING='opensource COBOL 4J 1.0.21'
+PACKAGE_TARNAME='opensource-cobol-4j-1.0.22'
+PACKAGE_VERSION='1.0.22'
+PACKAGE_STRING='opensource COBOL 4J 1.0.22'
 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.21 to adapt to many kinds of systems.
+\`configure' configures opensource COBOL 4J 1.0.22 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.21]
+                          [DATAROOTDIR/doc/opensource-cobol-4j-1.0.22]
   --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.21:";;
+     short | recursive ) echo "Configuration of opensource COBOL 4J 1.0.22:";;
    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.21
+opensource COBOL 4J configure 1.0.22
 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.21, which was
+It was created by opensource COBOL 4J $as_me 1.0.22, 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.21'
- VERSION='1.0.21'
+ PACKAGE='opensource-cobol-4j-1.0.22'
+ VERSION='1.0.22'
 
 
 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.21, which was
+This file was extended by opensource COBOL 4J $as_me 1.0.22, 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.21
+opensource COBOL 4J config.status 1.0.22
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
@@ -19,7 +19,7 @@
 
 AC_PREREQ(2.59)
 
-AC_INIT([opensource COBOL 4J],[1.0.21],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-4j-1.0.21])
+AC_INIT([opensource COBOL 4J],[1.0.22],[ws-opensource-cobol-contact@osscons.jp],[opensource-cobol-4j-1.0.22])
 AC_CONFIG_SRCDIR([libcobj.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_TESTDIR([tests])

diff --git a/lib/getopt.c b/lib/getopt.c
@@ -213,8 +213,6 @@ static char *posixly_correct;
 
 # if HAVE_STRING_H
 #  include <string.h>
-# else
-#  include <strings.h>
 # endif
 
 /* Avoid depending on library functions or files

diff --git a/libcobj/app/build.gradle.kts b/libcobj/app/build.gradle.kts
@@ -64,7 +64,7 @@ publishing {
         register<MavenPublication>("gpr") {
             groupId = "jp.osscons.opensourcecobol"
             artifactId = "libcobj"
-            version = "1.0.21"
+            version = "1.0.22"
             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
@@ -41,5 +41,5 @@ public class Const {
   // TODO 標準パスの設定
   public static final String COB_LIBRARY_PATH = "";
 
-  public static final String version = "1.0.21";
+  public static final String version = "1.0.22";
 }