@profoundlogic/codermake 2.0.6 → 2.0.8

package/dist/makefiles/base.mk

@@ -20,6 +20,23 @@ MAKEFLAGS += --output-sync=target
 ######
 output_lib_of = $(patsubst %.lib,%,$(notdir $(patsubst %/,%,$(dir $(1)))))
 
+######
+# Helpers for names containing literal dollar signs.
+#
+# Rules.mk must use GNU Make's standard escaping (`$$`) for file and object
+# names containing `$`. Once Make expands automatic variables such as `$@` and
+# `$<`, those values contain a literal `$`. Any value inserted into unquoted or
+# double-quoted shell code must escape that dollar as `\$` so the shell does not
+# treat it as an environment variable reference. Values inserted into
+# single-quoted shell strings should use the raw form. Remote clean uses an
+# unquoted local here-doc that is evaluated again by QShell, so it needs one
+# additional backslash layer.
+######
+ibmi_name = $(basename $(notdir $(1)))
+shell_escape_dollars = $(subst $$,\$$,$(1))
+remote_shell_escape_dollars = $(subst $$,\\\$$,$(1))
+ibmi_name_sh = $(call shell_escape_dollars,$(call ibmi_name,$(1)))
+
 ######
 # Utility to set the IBM i library list. Three modes selected at parse time:
 #
@@ -84,7 +101,7 @@ endef
 #   '.' if no preprocessing needed, or a generated temp dir path if any file was preprocessed
 ######
 define RPG_PREPROCESS_SOURCES
-RPG_SRC_ROOT=$$('$(CODERMAKE_NODE)' '$(CODERMAKE_PACKAGE_DIR)/bin/preprocess-rpg-copy.js' $(1) --temp-prefix tmp/rpg-pp)
+RPG_SRC_ROOT=$$('$(CODERMAKE_NODE)' '$(CODERMAKE_PACKAGE_DIR)/bin/preprocess-rpg-copy.js' $(call shell_escape_dollars,$(1)) --temp-prefix tmp/rpg-pp)
 endef
 
 ######
@@ -105,8 +122,8 @@ endef
 # consumer programs. CODERMAKE_LIBRARY_LIST is the appropriate way to control
 # resolution when conflicts exist across mapped libraries.
 ######
-BNDSRVPGM_PARM = $(if $(filter %.srvpgm,$^ $|),bndsrvpgm($(foreach s,$(filter %.srvpgm,$^ $|),$(basename $(notdir $(s))))),)
-BNDDIR_PARM = $(if $(filter %.bnddir,$^ $|),bnddir($(foreach d,$(filter %.bnddir,$^ $|),$(basename $(notdir $(d))))),)
+BNDSRVPGM_PARM = $(if $(filter %.srvpgm,$^ $|),bndsrvpgm($(foreach s,$(filter %.srvpgm,$^ $|),$(call ibmi_name_sh,$(s)))),)
+BNDDIR_PARM = $(if $(filter %.bnddir,$^ $|),bnddir($(foreach d,$(filter %.bnddir,$^ $|),$(call ibmi_name_sh,$(d)))),)
 
 ######
 # MODULE() parameter for CRTPGM / CRTSRVPGM.
@@ -118,7 +135,7 @@ BNDDIR_PARM = $(if $(filter %.bnddir,$^ $|),bnddir($(foreach d,$(filter %.bnddir
 # In single-library mode we keep today's unqualified form.
 ######
 ifdef CODERMAKE_LIBRARY_MAP
-  MODULE_PARM = module($(foreach m,$(filter %.module,$^),($(call output_lib_of,$m)/$(basename $(notdir $m)))))
+  MODULE_PARM = module($(foreach m,$(filter %.module,$^),($(call output_lib_of,$(m))/$(call ibmi_name_sh,$(m)))))
 else
-  MODULE_PARM = module($(foreach m,$(filter %.module,$^),$(basename $(notdir $m))))
+  MODULE_PARM = module($(foreach m,$(filter %.module,$^),$(call ibmi_name_sh,$(m))))
 endif

package/dist/makefiles/ibmi.mk

@@ -42,9 +42,9 @@ MKDIR := /QOpenSys/usr/bin/mkdir
 # $(2) = source file name (e.g., qddssrc, qrpglesrc)
 ######
 define CREATE_SOURCE_MEMBER
-test -e $(TARGET_LIB_PATH)/$(2).file || system "crtsrcpf file($(TARGET_LIB)/$(2))"
-test -e $(TARGET_LIB_PATH)/$(2).file/$(basename $(notdir $(1))).mbr || system "addpfm file($(TARGET_LIB)/$(2)) mbr($(basename $(notdir $(1)))) srctype($(subst .,,$(suffix $(1))))"
-cat '$(1)' | Rfile -Qw '$(TARGET_LIB)/$(2)($(basename $(notdir $(1))))'
+test -e '$(TARGET_LIB_PATH)/$(2).file' || system "crtsrcpf file($(TARGET_LIB)/$(2))"
+test -e '$(TARGET_LIB_PATH)/$(2).file/$(call ibmi_name,$(1)).mbr' || system "addpfm file($(TARGET_LIB)/$(2)) mbr($(call ibmi_name_sh,$(1))) srctype($(subst .,,$(suffix $(1))))"
+cat '$(1)' | Rfile -Qw '$(TARGET_LIB)/$(2)($(call ibmi_name,$(1)))'
 endef
 
 ######
@@ -55,7 +55,7 @@ endef
 define BUILD_FROM_CL_FILE
 rm -rf '$(1)'
 export LIBRARY=$(TARGET_LIB)
-export NAME=$(basename $(notdir $(1)))
+export NAME='$(call ibmi_name,$(1))'
 (
   $(SET_LIBL)
   echo "$(file < $(2))" | while IFS= read -r line; do
@@ -71,7 +71,7 @@ endef
 ######
 LOG_DIR = tmp/logs$(if $(TARGET_LIBRARY),/$(TARGET_LIBRARY))
 define SETUP_LOG
-@echo "Creating $(1)"
+@echo "Creating $(call shell_escape_dollars,$(1))"
 $(MKDIR) -p '$(LOG_DIR)'
 /usr/bin/touch -C 1208 '$(LOG_DIR)/$(1).log'
 exec > '$(LOG_DIR)/$(1).log' 2>&1
@@ -117,7 +117,7 @@ define BUILD_RPGLE_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(call RPG_PREPROCESS_SOURCES,$< $(filter-out $(TARGET_LIB_PATH)/%,$^))
 $(SET_LIBL)
-system "crtbndrpg pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$$RPG_SRC_ROOT/$<') incdir('$$RPG_SRC_ROOT') tgtccsid(*job) output(*print) dbgview(*all)"
+system "crtbndrpg pgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcstmf('$$RPG_SRC_ROOT/$(call shell_escape_dollars,$<)') incdir('$$RPG_SRC_ROOT') tgtccsid(*job) output(*print) dbgview(*all)"
 $(call RPG_CLEANUP_SOURCES)
 endef
 
@@ -126,7 +126,7 @@ define BUILD_SQLRPGLE_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(call RPG_PREPROCESS_SOURCES,$< $(filter-out $(TARGET_LIB_PATH)/%,$^))
 $(SET_LIBL)
-system "crtsqlrpgi obj($(TARGET_LIB)/$(basename $(@F))) objtype(*pgm) srcstmf('$$RPG_SRC_ROOT/$<') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''$$RPG_SRC_ROOT'') tgtccsid(*job) output(*print)') dbgview(*source)"
+system "crtsqlrpgi obj($(TARGET_LIB)/$(call ibmi_name_sh,$@)) objtype(*pgm) srcstmf('$$RPG_SRC_ROOT/$(call shell_escape_dollars,$<)') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''$$RPG_SRC_ROOT'') tgtccsid(*job) output(*print)') dbgview(*source)"
 $(call RPG_CLEANUP_SOURCES)
 endef
 
@@ -135,7 +135,7 @@ define BUILD_RPGLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
 $(call RPG_PREPROCESS_SOURCES,$< $(filter-out $(TARGET_LIB_PATH)/%,$^))
 $(SET_LIBL)
-system "crtrpgmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$$RPG_SRC_ROOT/$<') incdir('$$RPG_SRC_ROOT') tgtccsid(*job) output(*print) dbgview(*all)"
+system "crtrpgmod module($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcstmf('$$RPG_SRC_ROOT/$(call shell_escape_dollars,$<)') incdir('$$RPG_SRC_ROOT') tgtccsid(*job) output(*print) dbgview(*all)"
 $(call RPG_CLEANUP_SOURCES)
 endef
 
@@ -144,7 +144,7 @@ define BUILD_SQLRPGLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
 $(call RPG_PREPROCESS_SOURCES,$< $(filter-out $(TARGET_LIB_PATH)/%,$^))
 $(SET_LIBL)
-system "crtsqlrpgi obj($(TARGET_LIB)/$(basename $(@F))) objtype(*module) srcstmf('$$RPG_SRC_ROOT/$<') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''$$RPG_SRC_ROOT'') tgtccsid(*job) output(*print)') dbgview(*source)"
+system "crtsqlrpgi obj($(TARGET_LIB)/$(call ibmi_name_sh,$@)) objtype(*module) srcstmf('$$RPG_SRC_ROOT/$(call shell_escape_dollars,$<)') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''$$RPG_SRC_ROOT'') tgtccsid(*job) output(*print)') dbgview(*source)"
 $(call RPG_CLEANUP_SOURCES)
 endef
 
@@ -152,14 +152,14 @@ endef
 define BUILD_CBLLE_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtbndcbl pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') tgtccsid(*job) output(*print) dbgview(*all)"
+system "crtbndcbl pgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcstmf('$(call shell_escape_dollars,$<)') tgtccsid(*job) output(*print) dbgview(*all)"
 endef
 
 # Build ILE COBOL module
 define BUILD_CBLLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtcblmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') tgtccsid(*job) output(*print) dbgview(*all)"
+system "crtcblmod module($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcstmf('$(call shell_escape_dollars,$<)') tgtccsid(*job) output(*print) dbgview(*all)"
 endef
 
 # Build ILE CL program (bound)
@@ -170,7 +170,7 @@ $(SET_LIBL)
 $(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)"
+system "crtbndcl pgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcstmf('$(call shell_escape_dollars,$<)') incdir('.') $$TGTCCSID_PARM output(*print) dbgview(*all)"
 endef
 
 # Build OPM CL program
@@ -178,7 +178,7 @@ define BUILD_CLP_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qclsrc)
 $(SET_LIBL)
-system "crtclpgm pgm($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qclsrc) output(*print)"
+system "crtclpgm pgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qclsrc) output(*print)"
 endef
 
 # Build ILE CL module
@@ -189,28 +189,28 @@ $(SET_LIBL)
 $(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)"
+system "crtclmod module($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcstmf('$(call shell_escape_dollars,$<)') incdir('.') $$TGTCCSID_PARM output(*print) dbgview(*all)"
 endef
 
 # Build program from modules
 define BUILD_MODULE_TO_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtpgm pgm($(TARGET_LIB)/$(basename $(@F))) $(MODULE_PARM) $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
+system "crtpgm pgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) $(MODULE_PARM) $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
 endef
 
 # Build service program from modules
 define BUILD_MODULE_TO_SRVPGM
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtsrvpgm srvpgm($(TARGET_LIB)/$(basename $(@F))) $(MODULE_PARM) export(*srcfile) srcstmf('$(filter %.exports %.bnd,$^)') $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
+system "crtsrvpgm srvpgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) $(MODULE_PARM) export(*srcfile) srcstmf('$(call shell_escape_dollars,$(filter %.exports %.bnd,$^))') $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
 endef
 
 # Build service program from modules (export all procedures)
 define BUILD_MODULE_TO_SRVPGM_ALL
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtsrvpgm srvpgm($(TARGET_LIB)/$(basename $(@F))) $(MODULE_PARM) export(*all) $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
+system "crtsrvpgm srvpgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) $(MODULE_PARM) export(*all) $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
 endef
 
 # Build display file
@@ -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) srcmbr($(basename $(notdir $<)))"
+system "crtdspf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
 endef
 
 # Build display file from RDF (Rich Display File) JSON
@@ -227,7 +227,7 @@ $(call SETUP_LOG,$(notdir $@))
 '$(CODERMAKE_NODE)' '$(CODERMAKE_PACKAGE_DIR)/bin/rdf-to-dds.js' '$<' 'tmp/$(basename $(@F)).dspf'
 $(call CREATE_SOURCE_MEMBER,tmp/$(basename $(@F)).dspf,qddssrc)
 $(SET_LIBL)
-system "crtdspf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) enhdsp(*yes)"
+system "crtdspf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) enhdsp(*yes)"
 rm -f 'tmp/$(basename $(@F)).dspf'
 endef
 
@@ -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) srcmbr($(basename $(notdir $<))) aut(*change)"
+system "crtpf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<)) 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) srcmbr($(basename $(notdir $<)))"
+system "crtlf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
 endef
 
 # Build printer file
@@ -252,35 +252,67 @@ 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) srcmbr($(basename $(notdir $<)))"
+system "crtprtf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
+endef
+
+# Build System/38 display file
+define BUILD_DSPF38_TO_FILE
+$(call SETUP_LOG,$(notdir $@))
+$(call CREATE_SOURCE_MEMBER,$<,qddssrc)
+$(SET_LIBL)
+system "qsys38/crtdspf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
+endef
+
+# Build System/38 physical file
+define BUILD_PF38_TO_FILE
+$(call SETUP_LOG,$(notdir $@))
+$(call CREATE_SOURCE_MEMBER,$<,qddssrc)
+$(SET_LIBL)
+system "qsys38/crtpf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
+endef
+
+# Build System/38 logical file
+define BUILD_LF38_TO_FILE
+$(call SETUP_LOG,$(notdir $@))
+$(call CREATE_SOURCE_MEMBER,$<,qddssrc)
+$(SET_LIBL)
+system "qsys38/crtlf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
+endef
+
+# Build System/38 printer file
+define BUILD_PRTF38_TO_FILE
+$(call SETUP_LOG,$(notdir $@))
+$(call CREATE_SOURCE_MEMBER,$<,qddssrc)
+$(SET_LIBL)
+system "qsys38/crtprtf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
 endef
 
 # Build SQL table
 define BUILD_SQLTABLE_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))"
+system "runsqlstm srcstmf('$(call shell_escape_dollars,$<)') commit(*none) dftrdbcol($(TARGET_LIB))"
 endef
 
 # Build SQL index
 define BUILD_SQLINDEX_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))"
+system "runsqlstm srcstmf('$(call shell_escape_dollars,$<)') commit(*none) dftrdbcol($(TARGET_LIB))"
 endef
 
 # Build SQL view
 define BUILD_SQLVIEW_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))"
+system "runsqlstm srcstmf('$(call shell_escape_dollars,$<)') commit(*none) dftrdbcol($(TARGET_LIB))"
 endef
 
 # Build SQL procedure
 define BUILD_SQLPROC_TO_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))"
+system "runsqlstm srcstmf('$(call shell_escape_dollars,$<)') commit(*none) dftrdbcol($(TARGET_LIB))"
 endef
 
 # Build message file from CL commands
@@ -299,7 +331,7 @@ endef
 define BUILD_MENU
 $(call SETUP_LOG,$(notdir $@))
 $(SET_LIBL)
-system "crtmnu menu($(TARGET_LIB)/$(basename $(@F))) type(*dspf) dspf($(basename $(notdir $(filter %.file,$^)))) msgf($(basename $(notdir $(filter %.msgf,$^)))) cmdlin(*none) dspkey(*no)"
+system "crtmnu menu($(TARGET_LIB)/$(call ibmi_name_sh,$@)) type(*dspf) dspf($(call ibmi_name_sh,$(filter %.file,$^))) msgf($(call ibmi_name_sh,$(filter %.msgf,$^))) cmdlin(*none) dspkey(*no)"
 endef
 
 ######
@@ -310,9 +342,9 @@ endef
 .PHONY: platform-clean
 platform-clean:
 	@rm -rf tmp/rpg-pp-*
-	if [ -n "$(TARGETS)" ]; then
+	if [ -n "$(call shell_escape_dollars,$(TARGETS))" ]; then
 	  for pass in 1 2; do
-	    for target in $(TARGETS); do
+	    for target in $(call shell_escape_dollars,$(TARGETS)); do
 	      lib_part=$${target#/qsys.lib/}
 	      lib=$${lib_part%%/*}
 	      lib=$${lib%.lib}

package/dist/makefiles/unix.mk

@@ -72,11 +72,11 @@ $(SSH) $(QSHELL) <<'EOF'
   if [ ! -e '$(TARGET_LIB_PATH)/$(2).file' ]; then
     system "crtsrcpf file($(TARGET_LIB)/$(2))"
   fi
-  if [ ! -e '$(TARGET_LIB_PATH)/$(2).file/$(basename $(notdir $(1))).mbr' ]; then
-    system "addpfm file($(TARGET_LIB)/$(2)) mbr($(basename $(notdir $(1)))) srctype($(subst .,,$(suffix $(1))))"
+  if [ ! -e '$(TARGET_LIB_PATH)/$(2).file/$(call ibmi_name,$(1)).mbr' ]; then
+    system "addpfm file($(TARGET_LIB)/$(2)) mbr($(call ibmi_name_sh,$(1))) srctype($(subst .,,$(suffix $(1))))"
   fi
 EOF
-cat '$(1)' | $(SSH) "$(QSHELL) -c 'Rfile -Qw \"$(TARGET_LIB)/$(2)($(basename $(notdir $(1))))\"'"
+cat '$(1)' | $(SSH) "$(QSHELL) -c 'Rfile -Qw \"$(TARGET_LIB)/$(2)($(call remote_shell_escape_dollars,$(call ibmi_name,$(1))))\"'"
 endef
 
 ######
@@ -88,7 +88,7 @@ define BUILD_FROM_CL_FILE
 $(call REMOTE_BUILD,$(2), \
   rm -rf '$(TARGET_LIB_PATH)/$(notdir $(1))' && \
   export LIBRARY=$(TARGET_LIB) && \
-  export NAME=$(basename $(notdir $(1))) && \
+  export NAME='$(call ibmi_name,$(1))' && \
   ( \
     echo "$(file < $<)" | while IFS= read -r line; do \
       system "$$line"; \
@@ -103,7 +103,7 @@ endef
 ######
 LOG_DIR = tmp/logs$(if $(TARGET_LIBRARY),/$(TARGET_LIBRARY))
 define SETUP_LOG
-@echo "Creating $(1)"
+@echo "Creating $(call shell_escape_dollars,$(1))"
 $(MKDIR) -p '$(LOG_DIR)'
 exec > '$(LOG_DIR)/$(1).log' 2>&1
 endef
@@ -127,7 +127,7 @@ endef
 ######
 define REMOTE_BUILD_FROM
 TAR_FILE=tmp/codermake_$$(uuidgen).tar
-tar -C "$(1)" -cf "$$TAR_FILE" $(2)
+tar -C "$(1)" -cf "$$TAR_FILE" $(call shell_escape_dollars,$(2))
 REMOTE_DIR=/tmp/codermake_$$(uuidgen)
 $(SSH) "$(QSHELL) -c 'mkdir $$REMOTE_DIR'"
 EXIT_CODE=0
@@ -200,7 +200,7 @@ endif
 define BUILD_RPGLE_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(call RPG_PREPROCESS_SOURCES,$(filter-out build/%,$^))
-$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtbndrpg pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
+$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtbndrpg pgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcstmf('$(call shell_escape_dollars,$<)') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
 $(call RPG_CLEANUP_SOURCES)
 touch '$@'
 endef
@@ -209,7 +209,7 @@ endef
 define BUILD_SQLRPGLE_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(call RPG_PREPROCESS_SOURCES,$(filter-out build/%,$^))
-$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtsqlrpgi obj($(TARGET_LIB)/$(basename $(@F))) objtype(*pgm) srcstmf('$<') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''.'') tgtccsid(*job) output(*print)') dbgview(*source)")
+$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtsqlrpgi obj($(TARGET_LIB)/$(call ibmi_name_sh,$@)) objtype(*pgm) srcstmf('$(call shell_escape_dollars,$<)') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''.'') tgtccsid(*job) output(*print)') dbgview(*source)")
 $(call RPG_CLEANUP_SOURCES)
 touch '$@'
 endef
@@ -218,7 +218,7 @@ endef
 define BUILD_RPGLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
 $(call RPG_PREPROCESS_SOURCES,$(filter-out build/%,$^))
-$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtrpgmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
+$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtrpgmod module($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcstmf('$(call shell_escape_dollars,$<)') incdir('.') tgtccsid(*job) output(*print) dbgview(*all)")
 $(call RPG_CLEANUP_SOURCES)
 touch '$@'
 endef
@@ -227,7 +227,7 @@ endef
 define BUILD_SQLRPGLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
 $(call RPG_PREPROCESS_SOURCES,$(filter-out build/%,$^))
-$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtsqlrpgi obj($(TARGET_LIB)/$(basename $(@F))) objtype(*module) srcstmf('$<') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''.'') tgtccsid(*job) output(*print)') dbgview(*source)")
+$(call REMOTE_BUILD_FROM,$$RPG_SRC_ROOT,$(filter-out build/%,$^),system "crtsqlrpgi obj($(TARGET_LIB)/$(call ibmi_name_sh,$@)) objtype(*module) srcstmf('$(call shell_escape_dollars,$<)') cvtccsid(*job) output(*print) rpgppopt(*lvl2) compileopt('incdir(''.'') tgtccsid(*job) output(*print)') dbgview(*source)")
 $(call RPG_CLEANUP_SOURCES)
 touch '$@'
 endef
@@ -235,14 +235,14 @@ endef
 # Build ILE COBOL program (bound)
 define BUILD_CBLLE_PGM
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtbndcbl pgm($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') tgtccsid(*job) output(*print) dbgview(*all)")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtbndcbl pgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcstmf('$(call shell_escape_dollars,$<)') tgtccsid(*job) output(*print) dbgview(*all)")
 touch '$@'
 endef
 
 # Build ILE COBOL module
 define BUILD_CBLLE_MODULE
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtcblmod module($(TARGET_LIB)/$(basename $(@F))) srcstmf('$<') tgtccsid(*job) output(*print) dbgview(*all)")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtcblmod module($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcstmf('$(call shell_escape_dollars,$<)') tgtccsid(*job) output(*print) dbgview(*all)")
 touch '$@'
 endef
 
@@ -255,7 +255,7 @@ $(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)")
+  system "crtbndcl pgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcstmf('$(call shell_escape_dollars,$<)') incdir('.') $$TGTCCSID_PARM output(*print) dbgview(*all)")
 touch '$@'
 endef
 
@@ -265,7 +265,7 @@ $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,$<,qclsrc)
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtclpgm pgm($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qclsrc) output(*print)"
+  system "crtclpgm pgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qclsrc) output(*print)"
 EOF
 touch '$@'
 endef
@@ -279,7 +279,7 @@ $(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)")
+  system "crtclmod module($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcstmf('$(call shell_escape_dollars,$<)') incdir('.') $$TGTCCSID_PARM output(*print) dbgview(*all)")
 touch '$@'
 endef
 
@@ -288,7 +288,7 @@ define BUILD_MODULE_TO_PGM
 $(call SETUP_LOG,$(notdir $@))
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtpgm pgm($(TARGET_LIB)/$(basename $(@F))) $(MODULE_PARM) $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
+  system "crtpgm pgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) $(MODULE_PARM) $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
 EOF
 touch '$@'
 endef
@@ -296,7 +296,7 @@ endef
 # Build service program from modules
 define BUILD_MODULE_TO_SRVPGM
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtsrvpgm srvpgm($(TARGET_LIB)/$(basename $(@F))) $(MODULE_PARM) export(*srcfile) srcstmf('$(filter %.exports %.bnd,$^)') $(BNDSRVPGM_PARM) $(BNDDIR_PARM)")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "crtsrvpgm srvpgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) $(MODULE_PARM) export(*srcfile) srcstmf('$(call shell_escape_dollars,$(filter %.exports %.bnd,$^))') $(BNDSRVPGM_PARM) $(BNDDIR_PARM)")
 touch '$@'
 endef
 
@@ -305,7 +305,7 @@ define BUILD_MODULE_TO_SRVPGM_ALL
 $(call SETUP_LOG,$(notdir $@))
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtsrvpgm srvpgm($(TARGET_LIB)/$(basename $(@F))) $(MODULE_PARM) export(*all) $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
+  system "crtsrvpgm srvpgm($(TARGET_LIB)/$(call ibmi_name_sh,$@)) $(MODULE_PARM) export(*all) $(BNDSRVPGM_PARM) $(BNDDIR_PARM)"
 EOF
 touch '$@'
 endef
@@ -316,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) srcmbr($(basename $(notdir $<)))"
+  system "crtdspf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
 EOF
 touch '$@'
 endef
@@ -328,7 +328,7 @@ $(call SETUP_LOG,$(notdir $@))
 $(call CREATE_SOURCE_MEMBER,tmp/$(basename $(@F)).dspf,qddssrc)
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtdspf file($(TARGET_LIB)/$(basename $(@F))) srcfile($(TARGET_LIB)/qddssrc) enhdsp(*yes)"
+  system "crtdspf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) enhdsp(*yes)"
 EOF
 rm -f 'tmp/$(basename $(@F)).dspf'
 touch '$@'
@@ -340,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) srcmbr($(basename $(notdir $<)))"
+  system "crtpf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
 EOF
 touch '$@'
 endef
@@ -351,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) srcmbr($(basename $(notdir $<)))"
+  system "crtlf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
 EOF
 touch '$@'
 endef
@@ -362,7 +362,51 @@ $(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) srcmbr($(basename $(notdir $<)))"
+  system "crtprtf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
+EOF
+touch '$@'
+endef
+
+# Build System/38 display file
+define BUILD_DSPF38_TO_FILE
+$(call SETUP_LOG,$(notdir $@))
+$(call CREATE_SOURCE_MEMBER,$<,qddssrc)
+$(SSH) $(QSHELL) <<'EOF'
+  $(SET_LIBL)
+  system "qsys38/crtdspf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
+EOF
+touch '$@'
+endef
+
+# Build System/38 physical file
+define BUILD_PF38_TO_FILE
+$(call SETUP_LOG,$(notdir $@))
+$(call CREATE_SOURCE_MEMBER,$<,qddssrc)
+$(SSH) $(QSHELL) <<'EOF'
+  $(SET_LIBL)
+  system "qsys38/crtpf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
+EOF
+touch '$@'
+endef
+
+# Build System/38 logical file
+define BUILD_LF38_TO_FILE
+$(call SETUP_LOG,$(notdir $@))
+$(call CREATE_SOURCE_MEMBER,$<,qddssrc)
+$(SSH) $(QSHELL) <<'EOF'
+  $(SET_LIBL)
+  system "qsys38/crtlf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
+EOF
+touch '$@'
+endef
+
+# Build System/38 printer file
+define BUILD_PRTF38_TO_FILE
+$(call SETUP_LOG,$(notdir $@))
+$(call CREATE_SOURCE_MEMBER,$<,qddssrc)
+$(SSH) $(QSHELL) <<'EOF'
+  $(SET_LIBL)
+  system "qsys38/crtprtf file($(TARGET_LIB)/$(call ibmi_name_sh,$@)) srcfile($(TARGET_LIB)/qddssrc) srcmbr($(call ibmi_name_sh,$<))"
 EOF
 touch '$@'
 endef
@@ -370,28 +414,28 @@ endef
 # Build SQL table
 define BUILD_SQLTABLE_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$(call shell_escape_dollars,$<)') commit(*none) dftrdbcol($(TARGET_LIB))")
 touch '$@'
 endef
 
 # Build SQL index
 define BUILD_SQLINDEX_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$(call shell_escape_dollars,$<)') commit(*none) dftrdbcol($(TARGET_LIB))")
 touch '$@'
 endef
 
 # Build SQL view
 define BUILD_SQLVIEW_TO_FILE
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$(call shell_escape_dollars,$<)') commit(*none) dftrdbcol($(TARGET_LIB))")
 touch '$@'
 endef
 
 # Build SQL procedure
 define BUILD_SQLPROC_TO_PGM
 $(call SETUP_LOG,$(notdir $@))
-$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$<') commit(*none) dftrdbcol($(TARGET_LIB))")
+$(call REMOTE_BUILD,$(filter-out build/%,$^),system "runsqlstm srcstmf('$(call shell_escape_dollars,$<)') commit(*none) dftrdbcol($(TARGET_LIB))")
 touch '$@'
 endef
 
@@ -414,7 +458,7 @@ define BUILD_MENU
 $(call SETUP_LOG,$(notdir $@))
 $(SSH) $(QSHELL) <<'EOF'
   $(SET_LIBL)
-  system "crtmnu menu($(TARGET_LIB)/$(basename $(@F))) type(*dspf) dspf($(basename $(notdir $(filter %.file,$^)))) msgf($(basename $(notdir $(filter %.msgf,$^)))) cmdlin(*none) dspkey(*no)"
+  system "crtmnu menu($(TARGET_LIB)/$(call ibmi_name_sh,$@)) type(*dspf) dspf($(call ibmi_name_sh,$(filter %.file,$^))) msgf($(call ibmi_name_sh,$(filter %.msgf,$^))) cmdlin(*none) dspkey(*no)"
 EOF
 touch '$@'
 endef
@@ -431,13 +475,13 @@ platform-clean:
 	rm -rf tmp/logs
 	rm -rf tmp/codermake_*.tar
 	rm -rf tmp/rpg-pp-*
-	@if [ -n "$(TARGETS)" ]; then
+	@if [ -n "$(call shell_escape_dollars,$(TARGETS))" ]; then
 	  $(SSH) $(QSHELL) <<EOF
 	    # Two passes over all targets so dependent objects (e.g. SQL views/indexes
 	    # over a table) get deleted in the first pass, freeing the underlying object
 	    # for deletion in the second pass.
 	    for pass in 1 2; do
-	      for target in $(TARGETS); do
+	      for target in $(call remote_shell_escape_dollars,$(TARGETS)); do
 	        # Strip "build/" prefix to get the relative portion.
 	        rel="\$${target#build/}"
 	        if [ "\$$rel" = "\$$target" ]; then

package/package.json

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

package/skills/codermake/SKILL.md

@@ -163,6 +163,10 @@ ENDPGMEXP
 | `.pf` | `.file` | Physical File (*FILE) | `CRTPF` |
 | `.lf` | `.file` | Logical File (*FILE) | `CRTLF` |
 | `.prtf` | `.file` | Printer File (*FILE) | `CRTPRTF` |
+| `.dspf38` | `.file` | Display File (*FILE) | `QSYS38/CRTDSPF` (System/38, `DSPF38` member) |
+| `.pf38` | `.file` | Physical File (*FILE) | `QSYS38/CRTPF` (System/38, `PF38` member) |
+| `.lf38` | `.file` | Logical File (*FILE) | `QSYS38/CRTLF` (System/38, `LF38` member) |
+| `.prtf38` | `.file` | Printer File (*FILE) | `QSYS38/CRTPRTF` (System/38, `PRTF38` member) |
 | `.table.sql` | `.file` | SQL Table (*FILE) | `RUNSQLSTM` |
 | `.index.sql` | `.file` | SQL Index (*FILE) | `RUNSQLSTM` |
 | `.view.sql` | `.file` | SQL View (*FILE) | `RUNSQLSTM` |

package/skills/codermake/references/compile-listings.md

@@ -87,9 +87,9 @@ For ILE CL (`CRTBNDCL`, `CRTCLMOD`), the listing structure is similar to RPG --
 
 For OPM CL (`CRTCLPGM`), the output is typically shorter and errors reference source sequence numbers.
 
-## DDS listings (.dspf, .pf, .lf, .prtf)
+## DDS listings (.dspf, .pf, .lf, .prtf, and their System/38 `.dspf38`/`.pf38`/`.lf38`/`.prtf38` variants)
 
-DDS compilation errors from `CRTDSPF`, `CRTPF`, `CRTLF`, or `CRTPRTF` produce `CPD` messages:
+DDS compilation errors from `CRTDSPF`, `CRTPF`, `CRTLF`, or `CRTPRTF` produce `CPD` messages. The System/38 `.dspf38`, `.pf38`, `.lf38`, and `.prtf38` variants use the corresponding `QSYS38/...` commands.
 
 ```
 CPD7302   30   Record format SCREEN1 not found in file referenced.