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, because it's leaving a muddied repository: $ 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. $ git modified M resource/csdk/security/unittest/oic_svr_db.dat M resource/csdk/security/unittest/oic_svr_db_prov.dat M resource/csdk/security/unittest/oic_unittest.dat M resource/examples/oic_svr_db_client.dat M resource/examples/oic_svr_db_client_directpairing.dat M resource/examples/oic_svr_db_server.dat _______________________________________________ iotivity-dev mailing list [email protected] https://lists.iotivity.org/mailman/listinfo/iotivity-dev
