Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added prod tag to build production objects only #42

Merged
merged 8 commits into from
Dec 9, 2020
Merged

Added prod tag to build production objects only #42

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f4a7d9b
Use utf-16 to inz constant chars
jimoibm Apr 25, 2019
18ddb65
Remove "demo" configuration option
kadler Apr 30, 2019
91930b5
Export RUNASCII function from XMLSTOREDP service program
kadler Apr 30, 2019
87fb79e
extend pwd length to 128 for xmlcgi
jimoibm Jul 5, 2019
a39d8b1
changed custom conf for pwd
jimoibm Jul 24, 2019
3f03b24
added prod tag to build production objects only
jimoibm Jul 25, 2019
24f97cb
Took comment to leave intermediate objects
jimoibm Jul 30, 2019
a54c098
Merge remote-tracking branch 'upstream/master'
Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ XMLSTOREDP_MODULES=xmlstoredp.module $(COMMON)

all: build

prod: build-main build-procedure build-cgi prod-clean

build: build-main build-procedure build-cgi build-test

build-main: $(LIBRARY).lib xmlmain.pgm xmlservice.pgm xmlver.pgm
Expand All @@ -56,6 +58,11 @@ build-cgi: $(LIBRARY).lib xmlcgi.pgm

build-test: $(TEST_PGMS) $(TEST_SRVPGMS)

prod-clean:
rm -f *.module *.srcpf
rm -rf /qsys.lib/$(LIBRARY).lib/*.FILE
rm -rf /qsys.lib/$(LIBRARY).lib/*.MODULE

clean:
rm -f *.lib *.pgm *.srvpgm *.module *.sqlinst *.srcpf
system -q 'DLTLIB $(LIBRARY)' || :
Expand Down
13 changes: 2 additions & 11 deletions src/plugconf.rpgle.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,9 @@
/copy plugperf_h

*****************************************************
* PLUGDEMOOK - *ON/*OFF yips demo
* PLUGNONEOK - *ON/*OFF allow *NONE (REST XMLCGI)
*****************************************************
D PLUGNONEOK S 1N inz(*OFF)
D PLUGDEMOOK S 1N inz(*OFF)

*****************************************************
* ---change if alternate library---
Expand Down Expand Up @@ -163,7 +161,7 @@
P E

*****************************************************
* RPG demo and auth (xmlcgi)
* RPG auth (xmlcgi)
*****************************************************
P confNoneOk B export
D confNoneOk PI 1N
Expand All @@ -172,13 +170,6 @@
/end-free
P E

P confDemoOk B export
D confDemoOk PI 1N
/free
return PLUGDEMOOK;
/end-free
P E


*****************************************************
* RPG CLI call stored procedures (xmlcgi)
Expand Down Expand Up @@ -263,7 +254,7 @@
D confCGI PI 1N
D mDB2 10A value
D mUID 10A value
D mPWD 10A value
D mPWD 128A value
D mIPC 1024A value
D mCtl 1024A value
D mIClob * value
Expand Down
3 changes: 1 addition & 2 deletions src/plugconf_h.rpgle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
*****************************************************
* custom setup
D confHeader PR 2048A
D confDemoOk PR 1N
D confNoneOk PR 1N
D confCALLSP PR 128A
D confSPNDIR PR 128A
Expand All @@ -75,7 +74,7 @@
D confCGI PR 1N
D mDB2 10A value
D mUID 10A value
D mPWD 10A value
D mPWD 128A value
D mIPC 1024A value
D mCtl 1024A value
D mIClob * value
Expand Down
52 changes: 39 additions & 13 deletions src/plugile.rpgle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
*****************************************************
* global vars
*****************************************************
* make '|' to be source ccsid indepenent
D wBar S 1C Inz(U'007C')
D sBar S 1A inz(*BLANK)
*
D sBDefault s 2A inz('00')
D sADefault s 1A inz(' ')
D sIDefault s 1A inz('0')
Expand Down Expand Up @@ -977,7 +981,8 @@
'/* STRREXPRC SRCMBR(HOW) */'+x'25'
+ '/* SRCFILE(QTEMP/XMLREXX) */'+x'25'
+ '/* PARM(''RTVJOBA USRLIBL(?) */'+x'25'
+ '/* :CDD0:*ON|*OFF */'+x'25'
+ '/* :CDD0:*ON' + getJobBar() +
'*OFF */'+x'25'
+ '/* :CDD1:CDATAbeg */'+x'25'
+ '/* :CDD2:CDATAend */'+x'25'
+ '/* :CFIN:junk'') */'+x'25'
Expand Down Expand Up @@ -1005,7 +1010,9 @@
+ 'line'+x'25'
+ 'if RC <> 0'+x'25'
+ 'then do'+x'25'
+ ' say " </chop><error>"||RC||"</error>"'+x'25'
+ ' say " </chop><error>"' +
getJobBar() + getJobBar() +'RC' +
getJobBar() + getJobBar() +'"</error>"'+x'25'
+ ' exit'+x'25'
+ 'end'+x'25'
+ '/* output to QTEMP/OUTREXX */'+x'25'
Expand All @@ -1022,7 +1029,7 @@
+ 'keyparm:'+x'25'
+ ' parse arg line,idx,data'+x'25'
+ ' /* "&V" */'+x'25'
+ ' vname = "(&V."||idx'+x'25'
+ ' vname = "(&V."' + getJobBar() + getJobBar() +'idx'+x'25'
+ ' name = "nada"'+x'25'
+ ' /* icmd parm1(&V.1) parm2(&V.2) */'+x'25'
+ ' /* x */'+x'25'
Expand All @@ -1045,26 +1052,29 @@
+ ' then do'+x'25'
+ ' pe = 40'+x'25'
+ ' goop = " </chop>"'+x'25'
+ ' say goop||"<row></lf>"'+x'25'
+ ' say goop||"<data desc=''"||name||"''>"'+x'25'
+ ' say goop' + getJobBar() + getJobBar() +'"<row></lf>"'+x'25'
+ ' say goop' + getJobBar() + getJobBar() +'"<data desc=''"' +
getJobBar() + getJobBar() +'name' +
getJobBar() + getJobBar() +'"''>"'+x'25'
+ ' if cdata <> "*OFF"'+x'25'
+ ' then do'+x'25'
+ ' say goop||cdata1'+x'25'
+ ' say goop' + getJobBar() + getJobBar() +'cdata1'+x'25'
+ ' end'+x'25'
+ ' mydata = strip(data)'+x'25'
+ ' len = length(mydata)'+x'25'
+ ' do while (len > 0)'+x'25'
+ ' out = goop||left(mydata,pe)'+x'25'
+ ' out = goop' + getJobBar() + getJobBar() +
'left(mydata,pe)'+x'25'
+ ' say out'+x'25'
+ ' mydata = substr(mydata,pe+1)'+x'25'
+ ' len = length(mydata)'+x'25'
+ ' end'+x'25'
+ ' if cdata <> "*OFF"'+x'25'
+ ' then do'+x'25'
+ ' say goop||cdata2'+x'25'
+ ' say goop' + getJobBar() + getJobBar() +'cdata2'+x'25'
+ ' end'+x'25'
+ ' say goop||"</data></lf>"'+x'25'
+ ' say goop||"</row></lf>"'+x'25'
+ ' say goop' + getJobBar() + getJobBar() +'"</data></lf>"'+x'25'
+ ' say goop' + getJobBar() + getJobBar() +'"</row></lf>"'+x'25'
+ ' end'+x'25'
+ 'return 0'+x'25'
+ 'keysub:'+x'25'
Expand All @@ -1088,12 +1098,14 @@
+ ' end'+x'25'
+ ' else do'+x'25'
+ ' do h = 1 to 4096'+x'25'
+ ' V.i = V.i||" "'+x'25'
+ ' V.i = V.i' + getJobBar() + getJobBar() +'" "'+x'25'
+ ' end'+x'25'
+ ' end'+x'25'
+ ' out=out||prepart||new||i'+x'25'
+ ' out=out' + getJobBar() + getJobBar() +'prepart' +
getJobBar() + getJobBar() +'new' +
getJobBar() + getJobBar() +'i'+x'25'
+ ' END'+x'25'
+ ' V.dat = out||string'+x'25'
+ ' V.dat = out' + getJobBar() + getJobBar() +'string'+x'25'
+ 'return V'+x'25';
pData = %addr(myData);
pSize = %len(%trim(myData));
Expand Down Expand Up @@ -5348,5 +5360,19 @@
return ptrBits;
/end-free
P E
*****************************************************
* return job ccsid char for '|'
*****************************************************
P getJobBar B
D getJobBar PI 1A
/free
if sBar = *BLANK;
sBar = %char(wBar);
endif;
return sBar;
/end-free
P E




13 changes: 9 additions & 4 deletions src/plugxml.rpgle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,15 @@
* global scan vars
*****************************************************
* '<![CDATA[' and ends with ']]>'
D wCDATA1 S 9C Inz(%UCS2('<![CDATA['))
D wCDATA2 S 3C Inz(%UCS2(']]>'))
D s1CDATA37 S 9A inz('<![CDATA[')
D s2CDATA37 S 3A inz(']]>')
** <![CDATA[ - unicode inz to be source ccsid independent
D wCDATA1 S 9C Inz(U'003C0021005B004300440041-
D 00540041005B')
** ]]> - unicode inz to be source ccsid independent
D wCDATA2 S 3C Inz(U'005D005D003E')
** <![CDATA[ - ccsid 37 inz to be source ccsid independent
D s1CDATA37 S 9A inz(x'4C5ABAC3C4C1E3C1BA')
** ]]> - ccsid 37 inz to be source ccsid independent
D s2CDATA37 S 3A inz(x'BBBB6E')

D sAllCDATA s 1N inz(*ON)
D sOneCDATA s 1N inz(*ON)
Expand Down
10 changes: 5 additions & 5 deletions src/xmlcgi.rpgle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
D perdb2 S 10i 0 inz(0)
d perkey s 10A dim(PERMAX)
d peruid s 10A dim(PERMAX)
d perpwd s 10A dim(PERMAX)
d perpwd s 128A dim(PERMAX)
d percon s 10i 0 dim(PERMAX)
d perstm s 10i 0 dim(PERMAX)

Expand Down Expand Up @@ -153,7 +153,7 @@

D xDB2 s 10A inz(*BLANKS)
D xUID s 10A inz(*BLANKS)
D xPWD s 10A inz(*BLANKS)
D xPWD s 128A inz(*BLANKS)
D xIPC s 1024A inz(*BLANKS)
D xCtl s 1024A inz(*BLANKS)
D xSize s 1024A inz(*BLANKS)
Expand Down Expand Up @@ -225,7 +225,7 @@
D runXMLServ PR 1N
D mDB2 10A value
D mUID 10A value
D mPWD 10A value
D mPWD 128A value
D mIPC 1024A value
D mCtl 1024A value
D mIClob * value
Expand Down Expand Up @@ -1014,7 +1014,7 @@
D runXMLServ PI 1N
D mDB2 10A value
D mUID 10A value
D mPWD 10A value
D mPWD 128A value
D mIPC 1024A value
D mCtl 1024A value
D mIClob * value
Expand All @@ -1037,7 +1037,7 @@
DDBNameP S * INZ(%ADDR(DBName))
DDBUser S 10A inz(*BLANKS)
DDBUserP S * INZ(%ADDR(DBUser))
DDBPwd S 10A inz(*BLANKS)
DDBPwd S 128A inz(*BLANKS)
DDBPwdP S * INZ(%ADDR(DBPwd))

DConnOpt S 5I 0 inz(0)
Expand Down
1 change: 1 addition & 0 deletions src/xmlstoredp.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
export symbol('iPLUGR10M')
export symbol('iPLUGR15M')
export symbol('iPLUGRC32K')
export symbol('RUNASCII')
endpgmexp