@profoundlogic/codermake 2.0.4 → 2.0.6

package/dist/makefiles/ibmi.mk

@@ -218,7 +218,7 @@ define BUILD_DSPF_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SET_LIBL)
-system "crtdspf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
+system "crtdspf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(basename $(notdir $<)))"
 endef
 
 # Build display file from RDF (Rich Display File) JSON
@@ -236,7 +236,7 @@ define BUILD_PF_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SET_LIBL)
-system "crtpf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) aut(*change)"
+system "crtpf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(basename $(notdir $<))) aut(*change)"
 endef
 
 # Build logical file
@@ -244,7 +244,7 @@ define BUILD_LF_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SET_LIBL)
-system "crtlf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
+system "crtlf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(basename $(notdir $<)))"
 endef
 
 # Build printer file
@@ -252,7 +252,7 @@ define BUILD_PRTF_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SET_LIBL)
-system "crtprtf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
+system "crtprtf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(basename $(notdir $<)))"
 endef
 
 # Build SQL table

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)
@@ -307,7 +316,7 @@ $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtdspf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
+  system "crtdspf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(basename $(notdir $<)))"
 EOF
 touch '$@'
 endef
@@ -331,7 +340,7 @@ $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtpf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
+  system "crtpf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(basename $(notdir $<)))"
 EOF
 touch '$@'
 endef
@@ -342,7 +351,7 @@ $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtlf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
+  system "crtlf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(basename $(notdir $<)))"
 EOF
 touch '$@'
 endef
@@ -353,7 +362,7 @@ $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qddssrc)
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtprtf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc)"
+  system "crtprtf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(basename $(notdir $<)))"
 EOF
 touch '$@'
 endef

package/package.json

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