On 22/07/17 20:18, Mats Wichmann wrote:
On 07/21/2017 11:53 AM, Philippe Coval wrote:
On 21/07/17 19:34, Nash, George wrote:
If I understand right. Currently the json2cbor program does not have
support for cross compilation.
For this reason we still need to have dat files checked into the code
base for cross compilation situations.
Yes I did this on purpose to avoid inconsistencies
The fact that the date files are being modified means that the source
.json file was changed and the .dat was not committed at the same time.
I expect now that each module maintainers to commit them on each changes
on json files
to keep file sync
Anyone that knows more on the subject please feel free to correct me.
Ask me to explain if unclear, I can detail more on wiki
Track Bug: https://jira.iotivity.org/browse/IOT-2310
Well, now that I've pushed further, I'm going to repeat we can't do it
this way,
Don't panic and let me explain a bit
The reason why I did not commit those files back,
is because I wanted to show that some modules have inconstant json files
and expect the modules maintainers will double check their files
and take the responsibility to commit them.
Then flow will be like it was before.
If json files are modified again, dat will be updated automatically in
the source tree
and then both should be committed in a row.
I can do that (and also convert json files to unix EOL),
and this annoyance will just disappear forever.
because it's leaving a muddied repository:
only until .dat are replaced with right ones
$ git fetch upstream
remote: Counting objects: 10211, done
remote: Finding sources: 100% (40/40)
remote: Total 40 (delta 6), reused 8 (delta 6)
Unpacking objects: 100% (40/40), done.
From ssh://gerrit.iotivity.org:29418/iotivity
e450d10..35bcc24 master -> upstream/master
$ git rebase upstream/master
Cannot rebase: You have unstaged changes.
Please commit or stash them.
^ ;-)
--
mailto:[email protected] gpg:0x467094BC
https://blogs.s-osg.org/author/pcoval/
_______________________________________________
iotivity-dev mailing list
[email protected]
https://lists.iotivity.org/mailman/listinfo/iotivity-dev
