search

IBM / xmlservice

XML-based interface for accessing IBM i resources
https://xmlservice.readthedocs.io/
BSD 3-Clause "New" or "Revised" License
35 stars 18 forks source link

Support 64-bit mode for iLibCall #30

Closed jimoibm closed 5 years ago

jimoibm commented 5 years ago

@kadler I changed code to support 64-bit mode calls for pase shell, pgm, svrpgm. As I dropped ^M from previous version, it is messy. Most changes stay in plugpase.rpgle. To minimize changes crossing files, I didn't rename or make new procedures in plugpase.rpgle.

kadler commented 5 years ago

I'd rather the whitespace changes be separate from the code changes, so I did a whitespace PR in #31. Due to that, there's no conflicts. Can you please rebase on top of master and fix the conflicts and resubmit?

kadler commented 5 years ago

@jimoibm it seems instead of helping, my whitespace changes have caused quite a problem for merging this. I went ahead and fixed everything up and pushed it to https://github.com/IBM/xmlservice/tree/jimo_rebase. You can fix your branch by running

git fetch upstream
git reset --hard upstream/jimo_rebase
git push --force
jimoibm commented 5 years ago

@kadler I have pushed my branch to jimo_rebase by running your commands.

kadler commented 5 years ago

FYI, with this code change my simple testcase did work.

jimoibm commented 5 years ago

@kadler I also changed a new plugxml.rpgle as the output for ![[DATA]] is in wrong encoding in ACS Run SQL and some sample test cases in iToolkit. Should I do the same to push my changes to jimo_rebase?

kadler commented 5 years ago

@jimoibm Please open a separate PR/issue for that.

jimoibm commented 5 years ago

@kadler Sure. I move DATA tag change to another PR later.

jimoibm commented 5 years ago

@kadler I have changed code regarding your comments. 

 D ptrBits s 20u 0 inz(32)

tmpPtrBits = Qp2ptrsize() * 8;

if getPtrBits() = 32;// 32-bit

I re-ran commands but looks like whitespaces are not ignored in compare this time:

git fetch upstream git reset --hard upstream/jimo_rebase ---> commit my new changes <--- git push --force

kadler commented 5 years ago

Merged in c723035c95420a4cb1a4eaff3edc1b95df15e4de