@profoundlogic/codermake 2.0.3 → 2.0.5

package/dist/makefiles/base.mk

@@ -63,6 +63,20 @@ else
   endef
 endif
 
+######
+# IBM i release detection. Sets shell variables IBMI_VERSION and IBMI_RELEASE
+# from `uname -v` and `uname -r` respectively. On IBM i these correspond to V
+# and R in V_R_M_ (e.g. on IBM i 7.5: IBMI_VERSION=7, IBMI_RELEASE=5).
+#
+# Must run in the shell that targets the IBM i: directly in the recipe for
+# local builds (ibmi.mk), or inside the remote shell body of REMOTE_BUILD for
+# remote builds (unix.mk) — running it on the host in unix.mk would detect the
+# wrong system.
+######
+define DETECT_IBMI_RELEASE
+IBMI_VERSION=$$(uname -v); IBMI_RELEASE=$$(uname -r)
+endef
+
 ######
 # RPG /COPY preprocessor - converts source member style directives to IFS paths
 # $(1) = space-separated list of source files involved in the recipe

package/dist/makefiles/ibmi.mk

@@ -163,10 +163,14 @@ system "crtcblmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') tgtccsid
 endef
 
 # Build ILE CL program (bound)
+# tgtccsid(*job) is only supported on IBM i 7.5 and later.
 define BUILD_CLLE_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtbndcl pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)"
+$(DETECT_IBMI_RELEASE)
+TGTCCSID_PARM=
+if [ "$$IBMI_VERSION" -gt 7 ] || { [ "$$IBMI_VERSION" -eq 7 ] && [ "$$IBMI_RELEASE" -ge 5 ]; }; then TGTCCSID_PARM="tgtccsid(*job)"; fi
+system "crtbndcl pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') $$TGTCCSID_PARM output(*print) dbgview(*all)"
 endef
 
 # Build OPM CL program
@@ -178,10 +182,14 @@ system "crtclpgm pgm($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qcls
 endef
 
 # Build ILE CL module
+# tgtccsid(*job) is only supported on IBM i 7.5 and later.
 define BUILD_CLLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtclmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)"
+$(DETECT_IBMI_RELEASE)
+TGTCCSID_PARM=
+if [ "$$IBMI_VERSION" -gt 7 ] || { [ "$$IBMI_VERSION" -eq 7 ] && [ "$$IBMI_RELEASE" -ge 5 ]; }; then TGTCCSID_PARM="tgtccsid(*job)"; fi
+system "crtclmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') $$TGTCCSID_PARM output(*print) dbgview(*all)"
 endef
 
 # Build program from modules

package/dist/makefiles/unix.mk

@@ -110,6 +110,15 @@ endef
 
 ######
 # Reusable utility for remote builds via SSH.
+#
+# Source files are bundled into a tar locally, streamed over SSH, and extracted
+# on the IBM i. Extraction uses PASE tar (/QOpenSys/usr/bin/tar) rather than
+# QShell tar (/usr/bin/tar). QShell tar tags extracted stream files with the
+# job CCSID (e.g. 37 EBCDIC) regardless of the file's actual byte content,
+# which corrupts UTF-8 source containing extended characters (Ó, Í, Ú, Á, É,
+# Ñ, ...): the bytes survive but the wrong CCSID tag causes the RPG compiler
+# to read garbled source. PASE tar tags extracted files with CCSID 1208 (UTF-8),
+# which matches what local editors produce.
 ######
 ######
 # $(1) = source root directory to tar from (use '.' for current directory)
@@ -126,7 +135,7 @@ EXIT_CODE=0
   cat "$$TAR_FILE" | $(SSH) "cat > '$$REMOTE_DIR/sources.tar'" && \
   $(SSH) "REMOTE_DIR=$$REMOTE_DIR $(QSHELL)" <<'EOF'
     cd $$REMOTE_DIR
-    tar -xf sources.tar
+    /QOpenSys/usr/bin/tar -xf sources.tar
     cd $$REMOTE_DIR
     $(SET_LIBL)
     $(3)
@@ -238,9 +247,15 @@ touch '$@'
 endef
 
 # Build ILE CL program (bound)
+# tgtccsid(*job) is only supported on IBM i 7.5 and later, so detect the
+# target's release inside the remote shell and gate the parameter on it.
 define BUILD_CLLE_PGM
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtbndcl pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),\
+  $(DETECT_IBMI_RELEASE); \
+  TGTCCSID_PARM=; \
+  if [ "$$IBMI_VERSION" -gt 7 ] || { [ "$$IBMI_VERSION" -eq 7 ] && [ "$$IBMI_RELEASE" -ge 5 ]; }; then TGTCCSID_PARM="tgtccsid(*job)"; fi; \
+  system "crtbndcl pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') $$TGTCCSID_PARM output(*print) dbgview(*all)")
 touch '$@'
 endef
 
@@ -256,9 +271,15 @@ touch '$@'
 endef
 
 # Build ILE CL module
+# tgtccsid(*job) is only supported on IBM i 7.5 and later, so detect the
+# target's release inside the remote shell and gate the parameter on it.
 define BUILD_CLLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtclmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),\
+  $(DETECT_IBMI_RELEASE); \
+  TGTCCSID_PARM=; \
+  if [ "$$IBMI_VERSION" -gt 7 ] || { [ "$$IBMI_VERSION" -eq 7 ] && [ "$$IBMI_RELEASE" -ge 5 ]; }; then TGTCCSID_PARM="tgtccsid(*job)"; fi; \
+  system "crtclmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') $$TGTCCSID_PARM output(*print) dbgview(*all)")
 touch '$@'
 endef
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@profoundlogic/codermake",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Make wrapper framework for IBM i development that simplifies build rules",
   "main": "dist/bin/index.js",
   "type": "module",