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.

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

Use relative paths instead of absolute paths in protoc calls #7788

Merged
merged 1 commit into from Apr 5, 2016

Conversation

Projects
None yet
3 participants
@paveljanik
Contributor

paveljanik commented Apr 2, 2016

When comparing two separate build logs (both being done in its own, different directory), the log line containing protoc shines in the diff:

$ diff -u 7774.log  master.log | grep protoc
-/opt/local/bin/protoc --cpp_out=qt --proto_path=/private/tmp/bitcoin-7774/src/qt /private/tmp/bitcoin-7774/src/qt/paymentrequest.proto
+/opt/local/bin/protoc --cpp_out=qt --proto_path=/private/tmp/bitcoin-master/src/qt /private/tmp/bitcoin-master/src/qt/paymentrequest.proto
$ 

There is no reason to use absolute paths here.

After this change, the protoc command line is always

/opt/local/bin/protoc --cpp_out=qt --proto_path=qt/ qt/paymentrequest.proto

@theuni Please have a look.

@laanwj laanwj added the Build system label Apr 3, 2016

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Apr 4, 2016

Contributor

Travis failure is unrelated to this change.

Contributor

paveljanik commented Apr 4, 2016

Travis failure is unrelated to this change.

@theuni

This comment has been minimized.

Show comment
Hide comment
@theuni

theuni Apr 4, 2016

Member

I think this should be ok. I suspect it was absolute as part of the initial recursive buildsystem.

Please make it ... --proto_path=$(<D) $< though, rather than using "dir".

Member

theuni commented Apr 4, 2016

I think this should be ok. I suspect it was absolute as part of the initial recursive buildsystem.

Please make it ... --proto_path=$(<D) $< though, rather than using "dir".

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Apr 4, 2016

Contributor

Done. Thanks.

Contributor

paveljanik commented Apr 4, 2016

Done. Thanks.

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Apr 4, 2016

Contributor

So after this, the remaining changes/diffs are

-=== configuring in src/univalue (/tmp/bitcoin-master/src/univalue)
+=== configuring in src/univalue (/tmp/bitcoin-7788/src/univalue)

for univalue and secp265k1 directories.

Contributor

paveljanik commented Apr 4, 2016

So after this, the remaining changes/diffs are

-=== configuring in src/univalue (/tmp/bitcoin-master/src/univalue)
+=== configuring in src/univalue (/tmp/bitcoin-7788/src/univalue)

for univalue and secp265k1 directories.

@theuni

This comment has been minimized.

Show comment
Hide comment
@theuni

theuni Apr 4, 2016

Member

Thanks. ACK.

Don't think we can do anything about the configure subdirs, the pwd is hard-coded.

Member

theuni commented Apr 4, 2016

Thanks. ACK.

Don't think we can do anything about the configure subdirs, the pwd is hard-coded.

@paveljanik

This comment has been minimized.

Show comment
Hide comment
@paveljanik

paveljanik Apr 5, 2016

Contributor

@theuni yes, I can live with it and ignore such lines.

Contributor

paveljanik commented Apr 5, 2016

@theuni yes, I can live with it and ignore such lines.

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Apr 5, 2016

Member

Nice, makes the line a few characters shorter too. utACK 0087f26

Member

laanwj commented Apr 5, 2016

Nice, makes the line a few characters shorter too. utACK 0087f26

@laanwj laanwj merged commit 0087f26 into bitcoin:master Apr 5, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Apr 5, 2016

Merge #7788: Use relative paths instead of absolute paths in protoc c…
…alls

0087f26 Use relative paths instead of absolute paths (Pavel Janík)

codablock added a commit to codablock/dash that referenced this pull request Sep 16, 2017

Merge bitcoin#7788: Use relative paths instead of absolute paths in p…
…rotoc calls

0087f26 Use relative paths instead of absolute paths (Pavel Janík)

codablock added a commit to codablock/dash that referenced this pull request Sep 19, 2017

Merge bitcoin#7788: Use relative paths instead of absolute paths in p…
…rotoc calls

0087f26 Use relative paths instead of absolute paths (Pavel Janík)

codablock added a commit to codablock/dash that referenced this pull request Dec 9, 2017

Merge bitcoin#7788: Use relative paths instead of absolute paths in p…
…rotoc calls

0087f26 Use relative paths instead of absolute paths (Pavel Janík)

codablock added a commit to codablock/dash that referenced this pull request Dec 19, 2017

Merge bitcoin#7788: Use relative paths instead of absolute paths in p…
…rotoc calls

0087f26 Use relative paths instead of absolute paths (Pavel Janík)

codablock added a commit to codablock/dash that referenced this pull request Dec 19, 2017

Merge bitcoin#7788: Use relative paths instead of absolute paths in p…
…rotoc calls

0087f26 Use relative paths instead of absolute paths (Pavel Janík)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment