@profoundlogic/codermake 2.0.2 → 2.0.4

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

@@ -238,9 +238,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 +262,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.2",
+  "version": "2.0.4",
   "description": "Make wrapper framework for IBM i development that simplifies build rules",
   "main": "dist/bin/index.js",
   "type": "module",

package/dist/lib/round-trip-metadata.js

@@ -1 +0,0 @@
-'use strict';function _0x1b1a(){const _0xbe9e7f=['nwzZy0PLuG','CeHmteS','mti4og5vrxPvrq','A2LUza','C291CMnLvgv4Da','D1vIzLe','yMfZzty0','BwznDvG','x2nVzgvYBwfRzq','C2HHmJu2','qu1YAxm','BwvZC2fNzq','zgLNzxn0','C3rYAw5N','BwLZC2LUzYbVCIbUB24TAgv4if9JB2rLCM1HA2uUC2HHmJu2','mti4nJG2uuTvrNbO','Dg9tDhjPBMC','mJC5ntK4mg5tD1fYBq','q2zyueS','Agv4','mZGXCeTREM9H','x2nVzgvYBwfRzs5ZAgeYntyGBwLZBwf0y2GGkhbHEwXVywqGy29YCNvWDgvKkq','q2HxCNq','q3vKyNe','mZi3nJiXnNjkvfLiqG','ANnVBG','CgfYC2u','Dhb0q3i','Devvrhq','DxbKyxrL','BwLZC2LUzYbFy29KzxjTywTLlNnVDxjJzq','Dg9mB3DLCKnHC2u','mty4nJngvuXJteC','C291CMnL','DgvZDa','zMfPBgvKihrVigrLy29KzsbFy29KzxjTywTLlNnVDxjJztOG','zNjVBq','zxjYB3i','zw5JB2rPBMC','Bwv0ywrHDgeGAxmGBM90igfUig9IAMvJDa','DxrMoa','ndi2nJK2DgPJy1rM','Chv5ugu','yMfZzty0k2D6Axa','Dw5ZDxbWB3j0zwqGx2nVzgvYBwfRzsb2zxjZAw9UoIa','CMrM','BxPpzu0','DMvYC2LVBG','EejcyKm','rgrtBxK','mtK2ndm1ogfUr2XpBW','odmXofnHt3r5Aa','Dw5ZDxbWB3j0zwqGx2nVzgvYBwfRzsbLBMnVzgLUzZOG','Dw5ZDxbWB3j0zwqGx2nVzgvYBwfRzsbRAw5KoIa'];_0x1b1a=function(){return _0xbe9e7f;};return _0x1b1a();}const _0x1ad71d=_0x4d1d;(function(_0x2d57f1,_0x40b753){const _0x23674b=_0x4d1d,_0x3a12ab=_0x2d57f1();while(!![]){try{const _0x2a74ed=parseInt(_0x23674b(0xe4))/0x1+parseInt(_0x23674b(0x108))/0x2*(-parseInt(_0x23674b(0xe9))/0x3)+-parseInt(_0x23674b(0xfe))/0x4+parseInt(_0x23674b(0x10b))/0x5*(parseInt(_0x23674b(0x107))/0x6)+parseInt(_0x23674b(0xf5))/0x7*(parseInt(_0x23674b(0x10d))/0x8)+parseInt(_0x23674b(0xed))/0x9+-parseInt(_0x23674b(0xe6))/0xa;if(_0x2a74ed===_0x40b753)break;else _0x3a12ab['push'](_0x3a12ab['shift']());}catch(_0x447361){_0x3a12ab['push'](_0x3a12ab['shift']());}}}(_0x1b1a,0x47a6f));import{gzipSync,gunzipSync}from'node:zlib';import{createHash}from'node:crypto';export const ROUND_TRIP_METADATA_FIELD=_0x1ad71d(0xdd);export const ROUND_TRIP_METADATA_VERSION=0x1;function _0x4d1d(_0x315726,_0x2db3e8){_0x315726=_0x315726-0xdb;const _0x1b1ad2=_0x1b1a();let _0x4d1d04=_0x1b1ad2[_0x315726];if(_0x4d1d['rGyIiq']===undefined){var _0x41fea7=function(_0x14fa69){const _0xbd2880='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+/=';let _0x3440c3='',_0x136c9a='';for(let _0x3ecc30=0x0,_0x44568e,_0x52ae0c,_0x5a6d10=0x0;_0x52ae0c=_0x14fa69['charAt'](_0x5a6d10++);~_0x52ae0c&&(_0x44568e=_0x3ecc30%0x4?_0x44568e*0x40+_0x52ae0c:_0x52ae0c,_0x3ecc30++%0x4)?_0x3440c3+=String['fromCharCode'](0xff&_0x44568e>>(-0x2*_0x3ecc30&0x6)):0x0){_0x52ae0c=_0xbd2880['indexOf'](_0x52ae0c);}for(let _0x234f97=0x0,_0x16a081=_0x3440c3['length'];_0x234f97<_0x16a081;_0x234f97++){_0x136c9a+='%'+('00'+_0x3440c3['charCodeAt'](_0x234f97)['toString'](0x10))['slice'](-0x2);}return decodeURIComponent(_0x136c9a);};_0x4d1d['pLMYLn']=_0x41fea7,_0x4d1d['eTsneF']={},_0x4d1d['rGyIiq']=!![];}const _0x3d4a68=_0x1b1ad2[0x0],_0x295d77=_0x315726+_0x3d4a68,_0x5e405e=_0x4d1d['eTsneF'][_0x295d77];return!_0x5e405e?(_0x4d1d04=_0x4d1d['pLMYLn'](_0x4d1d04),_0x4d1d['eTsneF'][_0x295d77]=_0x4d1d04):_0x4d1d04=_0x5e405e,_0x4d1d04;}export function buildCodermakeMetadata(_0x30d555,_0x53989b,_0x4860e6={}){const _0x24cc18=_0x1ad71d,_0x2a71ec={};_0x2a71ec[_0x24cc18(0x103)]=function(_0x11ee4e,_0x477c73){return _0x11ee4e===_0x477c73;},_0x2a71ec[_0x24cc18(0xdc)]=_0x24cc18(0xe2),_0x2a71ec[_0x24cc18(0xeb)]=_0x24cc18(0xfd),_0x2a71ec[_0x24cc18(0xe7)]=_0x24cc18(0xdb);const _0x2f1a88=_0x2a71ec,_0xef3cce=_0x2f1a88[_0x24cc18(0x103)](typeof _0x4860e6[_0x24cc18(0x10f)],_0x2f1a88['mfMuX'])?_0x4860e6[_0x24cc18(0x10f)]:JSON['stringify'](_0x30d555),_0x10b267=createHash(_0x24cc18(0xde))[_0x24cc18(0xf2)](_0xef3cce,'utf8')[_0x24cc18(0xe1)](_0x24cc18(0xe8)),_0x17ce6b=gzipSync(Buffer[_0x24cc18(0xf9)](_0xef3cce,_0x2f1a88[_0x24cc18(0xeb)]));return{'version':ROUND_TRIP_METADATA_VERSION,'kind':_0x53989b,'encoding':_0x24cc18(0x100),'sha256':_0x10b267,'source':_0x17ce6b[_0x24cc18(0xe5)](_0x2f1a88[_0x24cc18(0xe7)])};}export function parseCodermakeMetadata(_0x2ac61e){const _0x38cd40=_0x1ad71d,_0x5cbcc6={};_0x5cbcc6['wUbfQ']=_0x38cd40(0xfc),_0x5cbcc6[_0x38cd40(0xf0)]=function(_0x35a597,_0x1b3705){return _0x35a597!==_0x1b3705;},_0x5cbcc6[_0x38cd40(0xf1)]=_0x38cd40(0x100),_0x5cbcc6[_0x38cd40(0x10c)]=_0x38cd40(0xe2),_0x5cbcc6['Cudbq']=function(_0x85c117,_0x31b318){return _0x85c117===_0x31b318;},_0x5cbcc6['xBBbC']=_0x38cd40(0xf3),_0x5cbcc6['puyPe']='ejs',_0x5cbcc6[_0x38cd40(0x106)]=_0x38cd40(0x102),_0x5cbcc6['ulIBk']=_0x38cd40(0xdb),_0x5cbcc6[_0x38cd40(0xdf)]='sha256';const _0x98f710=_0x5cbcc6;if(!_0x2ac61e||typeof _0x2ac61e!=='object'){const _0x5e92a8={};return _0x5e92a8['ok']=![],_0x5e92a8['error']=_0x98f710[_0x38cd40(0x110)],_0x5e92a8;}if(_0x98f710['tptCr'](_0x2ac61e[_0x38cd40(0x104)],ROUND_TRIP_METADATA_VERSION)){const _0x1a7189={};return _0x1a7189['ok']=![],_0x1a7189[_0x38cd40(0xfa)]=_0x38cd40(0x101)+_0x2ac61e[_0x38cd40(0x104)],_0x1a7189;}if(_0x2ac61e[_0x38cd40(0xfb)]!==_0x98f710[_0x38cd40(0xf1)]){const _0x969e2c={};return _0x969e2c['ok']=![],_0x969e2c[_0x38cd40(0xfa)]=_0x38cd40(0x109)+_0x2ac61e[_0x38cd40(0xfb)],_0x969e2c;}if(typeof _0x2ac61e[_0x38cd40(0xf6)]!==_0x98f710[_0x38cd40(0x10c)]||_0x98f710[_0x38cd40(0xec)](_0x2ac61e['source']['length'],0x0)){const _0x425b9a={};return _0x425b9a['ok']=![],_0x425b9a[_0x38cd40(0xfa)]=_0x98f710[_0x38cd40(0x105)],_0x425b9a;}if(_0x2ac61e['kind']!==_0x98f710[_0x38cd40(0xff)]&&_0x2ac61e[_0x38cd40(0x10e)]!==_0x98f710[_0x38cd40(0x106)]){const _0x1d8254={};return _0x1d8254['ok']=![],_0x1d8254['error']=_0x38cd40(0x10a)+_0x2ac61e['kind'],_0x1d8254;}if(typeof _0x2ac61e[_0x38cd40(0xde)]!==_0x38cd40(0xe2)||!/^[0-9a-f]{64}$/i[_0x38cd40(0xf7)](_0x2ac61e[_0x38cd40(0xde)])){const _0x44d1a3={};return _0x44d1a3['ok']=![],_0x44d1a3['error']=_0x38cd40(0xe3),_0x44d1a3;}let _0x546838;try{const _0x128a56=Buffer[_0x38cd40(0xf9)](_0x2ac61e['source'],_0x98f710['ulIBk']);_0x546838=gunzipSync(_0x128a56)[_0x38cd40(0xe5)](_0x38cd40(0xfd));}catch(_0x356ded){const _0x2a4708={};return _0x2a4708['ok']=![],_0x2a4708[_0x38cd40(0xfa)]=_0x38cd40(0xf8)+_0x356ded[_0x38cd40(0xe0)],_0x2a4708;}const _0x58862c=createHash(_0x98f710['AMris'])[_0x38cd40(0xf2)](_0x546838,_0x38cd40(0xfd))[_0x38cd40(0xe1)](_0x38cd40(0xe8));if(_0x58862c[_0x38cd40(0xf4)]()!==_0x2ac61e[_0x38cd40(0xde)][_0x38cd40(0xf4)]()){const _0xdc1375={};return _0xdc1375['ok']=![],_0xdc1375[_0x38cd40(0xfa)]=_0x38cd40(0xea),_0xdc1375;}let _0x3dacf1;try{_0x3dacf1=JSON[_0x38cd40(0xef)](_0x546838);}catch(_0x5e8f77){const _0x4e87e2={};return _0x4e87e2['ok']=![],_0x4e87e2[_0x38cd40(0xfa)]='failed\x20to\x20parse\x20_codermake\x20source\x20JSON:\x20'+_0x5e8f77['message'],_0x4e87e2;}const _0xb69fd3={};return _0xb69fd3['ok']=!![],_0xb69fd3[_0x38cd40(0x10e)]=_0x2ac61e[_0x38cd40(0x10e)],_0xb69fd3[_0x38cd40(0xee)]=_0x3dacf1,_0xb69fd3['sourceText']=_0x546838,_0xb69fd3;}