diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ed6fdf2..5024ff7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,7 @@ on: env: remote_build_dir: /home/${{ secrets.IBMI_USER }}/testbuild/ + BUILDLIB: MZNTEST jobs: test: @@ -48,7 +49,6 @@ jobs: IBMI_USER: ${{ secrets.IBMI_USER }} IBMI_PASSWORD: ${{ secrets.IBMI_PASSWORD }} IBMI_SSH_PORT: ${{ secrets.IBMI_SSH_PORT }} - BUILDLIB: MZNTEST - name: Test Manzan working-directory: test @@ -72,5 +72,4 @@ jobs: IBMI_HOST: ${{ secrets.IBMI_HOST }} IBMI_USER: ${{ secrets.IBMI_USER }} IBMI_PASSWORD: ${{ secrets.IBMI_PASSWORD }} - IBMI_SSH_PORT: ${{ secrets.IBMI_SSH_PORT }} - BUILDLIB: MZNTEST \ No newline at end of file + IBMI_SSH_PORT: ${{ secrets.IBMI_SSH_PORT }} \ No newline at end of file diff --git a/ile/Makefile b/ile/Makefile index 159de5a..13d9822 100644 --- a/ile/Makefile +++ b/ile/Makefile @@ -25,10 +25,10 @@ src/mzversion.h: system "CRTPGM PGM(${BUILDLIB}/$*) MODULE($(patsubst %.module,$(BUILDLIB)/%,$(notdir $^))) ACTGRP(*CALLER)" /qsys.lib/${BUILDLIB}.lib/%.module: src/%.cpp src/mzversion.h - system "CRTCPPMOD MODULE(${BUILDLIB}/$*) SRCSTMF('$<') OPTION(*EVENTF) SYSIFCOPT(*IFS64IO) DBGVIEW(*SOURCE) TERASPACE(*YES *TSIFC) STGMDL(*SNGLVL) DTAMDL(*p128) DEFINE(DEBUG_ENABLED)" + system "CRTCPPMOD MODULE(${BUILDLIB}/$*) SRCSTMF('$(CURDIR)/$<') OPTION(*EVENTF) SYSIFCOPT(*IFS64IO) DBGVIEW(*SOURCE) TERASPACE(*YES *TSIFC) STGMDL(*SNGLVL) DTAMDL(*p128) DEFINE(DEBUG_ENABLED)" /qsys.lib/${BUILDLIB}.lib/%.module: src/%.sqlc - system "CRTSQLCI OBJ(${BUILDLIB}/$*) SRCSTMF('$^') COMMIT(*NONE) DATFMT(*ISO) TIMFMT(*ISO) CVTCCSID(*JOB) COMPILEOPT('INCDIR(''src'')') SQLPATH(${BUILDLIB}) DFTRDBCOL(${BUILDLIB}) OPTION(*SQL)" + system "CRTSQLCI OBJ(${BUILDLIB}/$*) SRCSTMF('$(CURDIR)/$^') COMMIT(*NONE) DATFMT(*ISO) TIMFMT(*ISO) DBGVIEW(*SOURCE) CVTCCSID(*JOB) COMPILEOPT('INCDIR(''src'')') SQLPATH(${BUILDLIB}) DFTRDBCOL(${BUILDLIB}) OPTION(*SQL)" /qsys.lib/${BUILDLIB.lib}: -system "RUNSQL SQL('create schema ${BUILDLIB}') NAMING(*SYS)" @@ -42,7 +42,7 @@ src/mzversion.h: system -kKv "CRTMSGQ MSGQ(${BUILDLIB}/$*) TEXT('Testing queue') CCSID(1208)" /qsys.lib/${BUILDLIB}.lib/%.file: install_tasks/%.sql - system -kKv "RUNSQLSTM SRCSTMF('$<') COMMIT(*NONE) DFTRDBCOL(${BUILDLIB})" + system -kKv "RUNSQLSTM SRCSTMF('$(CURDIR)/$<') COMMIT(*NONE) DFTRDBCOL(${BUILDLIB})" echo "Success" uninstall: