Skip to content

Commit a7cbec4

Browse files
yutaro-sakamotoyutaro-sakamoto
authored
v1.0.2 (#34)
v1.0.2
2 parents 2755b00 + 9720db6 commit a7cbec4

File tree

14 files changed

+6520
-4933
lines changed

14 files changed

+6520
-4933
lines changed

‎.github/workflows/ci.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,21 @@ jobs:
4949
curl -L -o ~/.java_lib/sqlite.jar https://github.com/xerial/sqlite-jdbc/releases/download/3.36.0.3/sqlite-jdbc-3.36.0.3.jar
5050
curl -L -o ~/.java_lib/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.2.24.jre6.jar
5151
52-
# Checkout opensource COBOL 4j v1.0.5
53-
- name: Checkout opensourcecobol4j (fix/comp3 branch)
52+
# Checkout opensource COBOL 4j v1.0.10
53+
- name: Checkout opensourcecobol4j
5454
run: |
55-
curl -L -o opensourcecobol4j.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.5.tar.gz
55+
curl -L -o opensourcecobol4j.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.10.tar.gz
5656
tar zxf opensourcecobol4j.tar.gz
57-
mv opensourcecobol4j-1.0.5 opensourcecobol4j
57+
mv opensourcecobol4j-1.0.10 opensourcecobol4j
5858
59-
# Install opensource COBOL 4j v1.0.5
60-
- name: Install opensource COBOL (fix/comp3 branch)
59+
# Install opensource COBOL 4j v1.0.10
60+
- name: Install opensource COBOL
6161
run: |
6262
cd opensourcecobol4j
6363
./configure --prefix=/usr/
6464
export CLASSPATH="$CLASSPATH:$HOME/.java_lib/sqlite.jar"
6565
make
6666
sudo make install
67-
cp libcobj/build/libcobj.jar ~/.java_lib
6867
cd ../
6968
7069
# Build and Install Open-COBOL-ESQL-4j
@@ -73,15 +72,17 @@ jobs:
7372
sh configure --prefix=/usr/
7473
make
7574
sudo make install
76-
cp ~/.java_lib/{libcobj,postgresql}.jar dblibj/lib
75+
cp ~/.java_lib/postgresql.jar dblibj/lib
76+
cp /usr/lib/opensourcecobol4j/libcobj.jar dblibj/lib
7777
cd dblibj
78-
export CLASSPATH="$HOME/.java_lib/sqlite.jar:$HOME/.java_lib/postgresql.jar:$HOME/.java_lib/libcobj.jar"
78+
export CLASSPATH="$HOME/.java_lib/sqlite.jar:$HOME/.java_lib/postgresql.jar:/usr/lib/opensourcecobol4j/libcobj.jar"
7979
sbt assembly
80-
cp target/scala-2.13/ocesql4j.jar ~/.java_lib
80+
cp target/scala-2.13/ocesql4j.jar ~/.java_lib
81+
8182
# Run Autotest
8283
- name: Run tests
8384
run: |
84-
export CLASSPATH=":$HOME/.java_lib/sqlite.jar:$HOME/.java_lib/postgresql.jar:$HOME/.java_lib/libcobj.jar:$HOME/.java_lib/ocesql4j.jar"
85+
export CLASSPATH=":$HOME/.java_lib/sqlite.jar:$HOME/.java_lib/postgresql.jar:/usr/lib/opensourcecobol4j/libcobj.jar:$HOME/.java_lib/ocesql4j.jar"
8586
cd tests
8687
cp ../.github/workflows/ubuntu-test-settings/embed_db_info.sh embed_db_info.sh
8788
make

‎ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2023-04-30 OSS Consortium <[email protected]>
2+
3+
* Open COBOL ESQL 4J v1.0.2 released.
4+
15
2022-11-22 OSS Consortium <[email protected]>
26

37
* Open COBOL ESQL 4J v1.0.1 released.

‎Makefile.in

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.16.1 from Makefile.am.
1+
# Makefile.in generated by automake 1.16.5 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2021 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -135,8 +135,8 @@ am__recursive_targets = \
135135
$(am__extra_recursive_targets)
136136
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
137137
cscope distdir distdir-am dist dist-all distcheck
138-
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
139-
$(LISP)config.h.in
138+
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
139+
config.h.in
140140
# Read a list of newline-separated strings from the standard input,
141141
# and print each of them once, without duplicates. Input order is
142142
# *not* preserved.
@@ -153,9 +153,6 @@ am__define_uniq_tagged_files = \
153153
unique=`for i in $$list; do \
154154
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
155155
done | $(am__uniquify_input)`
156-
ETAGS = etags
157-
CTAGS = ctags
158-
CSCOPE = cscope
159156
DIST_SUBDIRS = ocesql tests
160157
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
161158
COPYING ChangeLog INSTALL NEWS README compile config.guess \
@@ -198,6 +195,8 @@ am__relativize = \
198195
DIST_ARCHIVES = $(distdir).tar.gz
199196
GZIP_ENV = --best
200197
DIST_TARGETS = dist-gzip
198+
# Exists only to be overridden by the user if desired.
199+
AM_DISTCHECK_DVI_TARGET = dvi
201200
distuninstallcheck_listfiles = find . -type f -print
202201
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
203202
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -216,6 +215,8 @@ CCDEPMODE = @CCDEPMODE@
216215
CFLAGS = @CFLAGS@
217216
CPP = @CPP@
218217
CPPFLAGS = @CPPFLAGS@
218+
CSCOPE = @CSCOPE@
219+
CTAGS = @CTAGS@
219220
CXX = @CXX@
220221
CXXCPP = @CXXCPP@
221222
CXXDEPMODE = @CXXDEPMODE@
@@ -230,6 +231,7 @@ ECHO_C = @ECHO_C@
230231
ECHO_N = @ECHO_N@
231232
ECHO_T = @ECHO_T@
232233
EGREP = @EGREP@
234+
ETAGS = @ETAGS@
233235
EXEEXT = @EXEEXT@
234236
FGREP = @FGREP@
235237
GREP = @GREP@
@@ -320,6 +322,7 @@ pdfdir = @pdfdir@
320322
prefix = @prefix@
321323
program_transform_name = @program_transform_name@
322324
psdir = @psdir@
325+
runstatedir = @runstatedir@
323326
sbindir = @sbindir@
324327
sharedstatedir = @sharedstatedir@
325328
srcdir = @srcdir@
@@ -500,7 +503,6 @@ cscopelist-am: $(am__tagged_files)
500503
distclean-tags:
501504
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
502505
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
503-
504506
distdir: $(BUILT_SOURCES)
505507
$(MAKE) $(AM_MAKEFLAGS) distdir-am
506508

@@ -584,6 +586,10 @@ dist-xz: distdir
584586
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
585587
$(am__post_remove_distdir)
586588

589+
dist-zstd: distdir
590+
tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
591+
$(am__post_remove_distdir)
592+
587593
dist-tarZ: distdir
588594
@echo WARNING: "Support for distribution archives compressed with" \
589595
"legacy program 'compress' is deprecated." >&2
@@ -626,6 +632,8 @@ distcheck: dist
626632
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
627633
*.zip*) \
628634
unzip $(distdir).zip ;;\
635+
*.tar.zst*) \
636+
zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
629637
esac
630638
chmod -R a-w $(distdir)
631639
chmod u+w $(distdir)
@@ -641,7 +649,7 @@ distcheck: dist
641649
$(DISTCHECK_CONFIGURE_FLAGS) \
642650
--srcdir=../.. --prefix="$$dc_install_base" \
643651
&& $(MAKE) $(AM_MAKEFLAGS) \
644-
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
652+
&& $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
645653
&& $(MAKE) $(AM_MAKEFLAGS) check \
646654
&& $(MAKE) $(AM_MAKEFLAGS) install \
647655
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
@@ -803,18 +811,18 @@ uninstall-am:
803811
am--refresh check check-am clean clean-cscope clean-generic \
804812
clean-libtool cscope cscopelist-am ctags ctags-am dist \
805813
dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
806-
dist-xz dist-zip distcheck distclean distclean-generic \
807-
distclean-hdr distclean-libtool distclean-tags distcleancheck \
808-
distdir distuninstallcheck dvi dvi-am html html-am info \
809-
info-am install install-am install-data install-data-am \
810-
install-dvi install-dvi-am install-exec install-exec-am \
811-
install-html install-html-am install-info install-info-am \
812-
install-man install-pdf install-pdf-am install-ps \
813-
install-ps-am install-strip installcheck installcheck-am \
814-
installdirs installdirs-am maintainer-clean \
815-
maintainer-clean-generic mostlyclean mostlyclean-generic \
816-
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
817-
uninstall-am
814+
dist-xz dist-zip dist-zstd distcheck distclean \
815+
distclean-generic distclean-hdr distclean-libtool \
816+
distclean-tags distcleancheck distdir distuninstallcheck dvi \
817+
dvi-am html html-am info info-am install install-am \
818+
install-data install-data-am install-dvi install-dvi-am \
819+
install-exec install-exec-am install-html install-html-am \
820+
install-info install-info-am install-man install-pdf \
821+
install-pdf-am install-ps install-ps-am install-strip \
822+
installcheck installcheck-am installdirs installdirs-am \
823+
maintainer-clean maintainer-clean-generic mostlyclean \
824+
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
825+
tags tags-am uninstall uninstall-am
818826

819827
.PRECIOUS: Makefile
820828

‎NEWS

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
NEWS - user visible changes -*- outline -*-
22

3+
* Open COBOL ESQL 4J 1.0.2
4+
5+
** New Features
6+
(1) Open COBOL ESQL 4J accepts `EXEC SQL INCLUDE "filename" END EXEC`
7+
8+
** Bug fixes
9+
(1) Fix the bug related to the installation
10+
11+
-----------------------------------------------------------------------
12+
313
* Open COBOL ESQL 4J 1.0.1
414

515
** New Features

0 commit comments

Comments
 (0)