Skip to content

Commit

Permalink
Release v1.1.0 (#91)
Browse files Browse the repository at this point in the history
* [Update]: update README.md and workflow files

* [Doc]: improve CHANGELOG.md and NEWS
  • Loading branch information
yutaro-sakamoto authored Aug 30, 2024
1 parent 39e5cce commit fb917e4
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
run: |
cp "$COBOL4J_LIBCOBJ_JAR_PATH" dblibj/lib
sudo mkdir -p "$OCESQL4J_LIB_DIR"
sudo curl -L -o "$OCESQL4J_POSTGRESQL_JAR_PATH" https://jdbc.postgresql.org/download/postgresql-42.2.24.jre6.jar
sudo curl -L -o "$OCESQL4J_POSTGRESQL_JAR_PATH" https://jdbc.postgresql.org/download/postgresql-42.2.24.jar
sudo cp "$OCESQL4J_POSTGRESQL_JAR_PATH" dblibj/lib
sh configure CFLAGS='-fprofile-arcs -ftest-coverage -Werror' --prefix=/usr/
make
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
run: |
cp "$COBOL4J_LIBCOBJ_JAR_PATH" dblibj/lib
sudo mkdir -p "$OCESQL4J_LIB_DIR"
sudo curl -L -o "$OCESQL4J_POSTGRESQL_JAR_PATH" https://jdbc.postgresql.org/download/postgresql-42.2.24.jre6.jar
sudo curl -L -o "$OCESQL4J_POSTGRESQL_JAR_PATH" https://jdbc.postgresql.org/download/postgresql-42.2.24.jar
sudo cp "$OCESQL4J_POSTGRESQL_JAR_PATH" dblibj/lib
cd dblibj/
sbt doc
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [1.1.0] - 2024-08-30

### Added
- Support Windows (#82)
- Support Windows with Visual Studio 2022(#82)

### Optimized
- Implemente caches for prepared statements (#58)
Expand Down
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ NEWS - user visible changes -*- outline -*-
* Open COBOL ESQL 4J 1.1.0

** New Features
(1) Support Windows
(1) Support Windows with Visual Studio 2022

** Optimized
(1) Implemente caches for prepared statements
Expand Down
37 changes: 28 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,21 @@ Open COBOL ESQL 4J (OCESQL 4J) consits of open-source Embedded SQL pre-compiler

See [Installation guides of opensource COBOL 4J](https://github.com/opensourcecobol/opensourcecobol4j/wiki).

### Copy libcobj.jar
### Prepare jar files

Copy libcobj.jar, which is the runtime library of opensource COBOL 4J, to `dblibj/lib/libcobj.jar`.
After you complete the installation procedure described in [Installation guides of opensource COBOL 4J](https://github.com/opensourcecobol/opensourcecobol4j/wiki), you can find libcobj.jar in `/usr/lib/opensourcecobol4j/`.

In addtion, execute the following command to prepare postgresql jdbc driver.

```sh
# Move to the root directory of Open-COBOL-ESQL-4J
cd Open-COBOL-ESQL-4J/
mkdir -p /usr/lib/Open-COBOL-ESQL-4J/
curl -L -o /usr/lib/Open-COBOL-ESQL-4J/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.2.24.jar
cp /usr/lib/Open-COBOL-ESQL-4J/postgresql.jar dblibj/lib
```

### sbt

See [the official Installation guide](https://www.scala-sbt.org/1.x/docs/Installing-sbt-on-Linux.html).
Expand All @@ -52,18 +62,27 @@ make
make install
```

Then, add `/usr/lib/Open-COBOL-ESQL-4J/ocesql4j.jar` to $CLASSPATH.
Then, add `/usr/lib/Open-COBOL-ESQL-4J/ocesql4j.jar` and `/usr/lib/Open-COBOL-ESQL-4J/postgresql.jar` to $CLASSPATH.

```sh
export CLASSPATH="$CLASSPATH":/usr/lib/Open-COBOL-ESQL-4J/ocesql4j.jar
export CLASSPATH="$CLASSPATH":/usr/lib/Open-COBOL-ESQL-4J/ocesql4j.jar:/usr/lib/Open-COBOL-ESQL-4J/postgresql.jar
```

## Installation (Windows)
### Install opensource COBOL 4J

See [README.md of opensource COBOL 4J](https://github.com/opensourcecobol/opensourcecobol4j/blob/develop/README.md).

### Copy libcobj.jar
Copy "libcobj.jar", generated by the installation of opensourcecobol4j, into "dblibj/lib".
### Prepare jar files
Copy "libcobj.jar", generated by the installation of opensourcecobol4j, into "dblibj\lib".
In addtion, execute the following command to prepare postgresql jdbc driver.

```powershell
cd Open-COBOL-ESQL-4J
mkdir C:\ocesql4j\lib
curl -L -o C:\ocesql4j\lib\postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.2.24.jar
copy C:\ocesql4j\lib\postgresql.jar dblibj\lib
```

### sbt
Download [here](https://www.scala-sbt.org/download/) and install it.
Expand All @@ -80,7 +99,7 @@ The Windows version of Open COBOL ESQL 4J uses the CL compiler included in Visua
![alt text](image/readme1.png)
4. Click "Build" -> "Build Solution".
![alt text](image/readme2.png)
After the build is completed, "cobj.exe" will be created in `win/x64/Debug` or `win/x64/Release`.
After the build is completed, "cobj.exe" will be created in `win\x64\Debug` or `win\x64\Release`.

#### Build Scala Files
2. Open PowerShell.
Expand All @@ -95,7 +114,7 @@ After the build is completed, "cobj.exe" will be created in `win/x64/Debug` or `
```

#### Place files in the appropriate location
1. If you build in Debug mode, change the 5th line of "win/install.ps1" from `\x64\Release\cobj.exe` to `\x64\Debug\cobj.exe`.
1. If you build in Debug mode, change the 5th line of "win\install.ps1" from `\x64\Release\cobj.exe` to `\x64\Debug\cobj.exe`.
2. Open PowerShell
3. Move to "win" directory and execute "install.ps1".
```
Expand All @@ -112,5 +131,5 @@ After the build is completed, "cobj.exe" will be created in `win/x64/Debug` or `
* If you want to change the location of the files, modify "install.ps1".
#### Set the environment variables
1. Add C:\ocesql4j\bin to "PATH".
2. Add C:\ocesql4j\lib\ocesql4j.jar to "CLASSPATH".
1. Add `C:\ocesql4j\bin` to "PATH".
2. Add `C:\ocesql4j\lib\ocesql4j.jar` and `C:\ocesql4j\lib\postgresql.jar` to "CLASSPATH".

0 comments on commit fb917e4

Please sign in to comment.