Skip to content

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

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

Jump to bottom
Merged
laanwj merged 1 commit into from
Apr 5, 2016
Merged

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

laanwj merged 1 commit into from
Apr 5, 2016

Conversation

@paveljanik
Copy link
Contributor

@paveljanik 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.

@paveljanik
Copy link
Contributor Author

paveljanik commented Apr 4, 2016

Travis failure is unrelated to this change.

@theuni
Copy link
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 paveljanik force-pushed the 20160402_protoc_use_relpath branch from 87fac00 to 0087f26 Compare April 4, 2016 17:58
@paveljanik
Copy link
Contributor Author

paveljanik commented Apr 4, 2016

Done. Thanks.

@paveljanik
Copy link
Contributor Author

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
Copy link
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
Copy link
Contributor Author

paveljanik commented Apr 5, 2016

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

@laanwj
Copy link
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
laanwj added a commit that referenced this pull request Apr 5, 2016
@laanwj
Merge #7788: Use relative paths instead of absolute paths in protoc c…
4dc1b3a 
…alls

0087f26 Use relative paths instead of absolute paths (Pavel Janík)
codablock pushed a commit to codablock/dash that referenced this pull request Dec 19, 2017
@laanwj @codablock
Merge bitcoin#7788: Use relative paths instead of absolute paths in p…
6a515e5 
…rotoc calls

0087f26 Use relative paths instead of absolute paths (Pavel Janík)
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

Build system

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@paveljanik @theuni @laanwj