build: Remove src/obj directory from repository #16611

pull laanwj wants to merge 1 commits into bitcoin:master from laanwj:2019_08_srcobj changing 2 files +1 −2
  1. laanwj commented at 1:00 pm on August 14, 2019: member

    This directory is automatically created by the build process (in the build target directory, see #16588) and doesn’t need to be in the repository nor in the tarballs.

    Move associated ignore directive to top-level .gitignore file.

  2. build: Remove src/obj directory from repository
    This directory is automatically created by the build process (in the
    build target directory, see #16588) and doesn't need to be in the
    repository nor in the tarballs.
    
    Move associated ignore directive to top-level `.gitignore` file.
    b6e9ff8996
  3. laanwj added the label Build system on Aug 14, 2019
  4. laanwj added the label Needs gitian build on Aug 14, 2019
  5. hebasto commented at 4:49 pm on August 14, 2019: member

    Concept ACK b6e9ff899677770741d94f1cf4f61ebb13fc453f

    Tested on Linux Mint 19.2. The version string has been created as expected. make creates src/obj directory and build.h file in it. make clean removes build.h file. It should remove src/obj directory as well.

    Another approach is to move build.h file from src/obj to src, maybe.

  6. laanwj commented at 5:24 pm on August 14, 2019: member

    make clean removes build.h file. It should remove src/obj directory as well.

    But only if no other files were added? removing a directory recursively in make clean would be definitely too dangerous.

    Another approach is to move build.h file from src/obj to src, maybe.

    Eventually, yes, but I don’t really want to change that here. I just don’t want an obj directory in git. The src directory is for source and anyhow, it makes no sense in the dividing up of source files.

  7. hebasto commented at 5:42 pm on August 14, 2019: member

    But only if no other files were added? removing a directory recursively in make clean would be definitely too dangerous.

    Why recursively? Could be rmdir.

    Standard Makefile Targets:

    make clean Erase from the build tree the files built by make all.

  8. emilengler commented at 6:12 pm on August 14, 2019: contributor
    Concept ACK
  9. dongcarl commented at 8:02 pm on August 14, 2019: member

    …and doesn’t need to be in the repository nor in the tarballs. @laanwj Just to be clear… src/obj/build.h should be in the tarballs (could be at another path), so that HOST-specific builds can be context-less and git-less. Correct?

  10. laanwj commented at 8:52 pm on August 14, 2019: member

    @laanwj Just to be clear… src/obj/build.h should be in the tarballs

    I don’t think so, none of the tarballs I checked had it at least:

    0$ for VERSION in 0.15.0 0.16.0 0.17.0 0.18.0 0.18.1rc1 0.18.1; do tar -tvf bitcoin-core-${VERSION}/bitcoin-${VERSION}.tar.gz|grep src/obj ; done
    1(…no output…)
    
  11. dongcarl commented at 9:00 pm on August 14, 2019: member
    @laanwj What I’m saying is that src/obj/build.h isn’t in the tarballs as of now, but it should be. So that we don’t need the weird copying trick here: https://github.com/bitcoin/bitcoin/blob/b499d8576f30d13dfe9000852afe47ee1c28cfbe/contrib/gitian-descriptors/gitian-linux.yml#L168-L177
  12. laanwj commented at 7:32 am on August 15, 2019: member

    @laanwj What I’m saying is that src/obj/build.h isn’t in the tarballs as of now, but it should be. So that we don’t need the weird copying trick here:

    Not sure; there is just the git commit id in build.h. And we intentionally don’t embed the git commit id in releases or tarballs (it’s unnecessary: the tag itself exactly identifies the build source). All relevant version information is in configure.ac and passed by the build system (CLIENT_VERSION_MAJOR, CLIENT_VERSION_MINOR, …).

    But let’s have this discussion elsewhere, it doesn’t affect this PR.

  13. hebasto commented at 3:21 pm on August 15, 2019: member

    @laanwj

    This directory is automatically created by the build process (in the build target directory, see #16588) and doesn’t need to be in the repository nor in the tarballs.

    Gitian tarballs do not contain src/obj directory already.

    EDITED: Sorry for noise: I see your comment now.

  14. laanwj commented at 7:03 pm on August 15, 2019: member
    Yes, can you please at least read what I say !
  15. DrahtBot commented at 10:33 pm on August 15, 2019: member

    Gitian builds for commit a7aa809027633556dd3280c6e29ca98eb3235a3d (master):

    Gitian builds for commit 9deb07469561e28742b2be3977abdc989ae93aab (master and this pull):

  16. DrahtBot removed the label Needs gitian build on Aug 15, 2019
  17. laanwj referenced this in commit e00ecb3d7a on Aug 19, 2019
  18. laanwj merged this on Aug 19, 2019
  19. laanwj closed this on Aug 19, 2019

  20. sidhujag referenced this in commit 7bdb59d9cd on Aug 19, 2019
  21. PastaPastaPasta referenced this in commit 0776a00c2e on Jun 27, 2021
  22. PastaPastaPasta referenced this in commit 867c0e6271 on Jun 28, 2021
  23. PastaPastaPasta referenced this in commit 5194a1a0fe on Jun 29, 2021
  24. PastaPastaPasta referenced this in commit 177a18d200 on Jul 1, 2021
  25. PastaPastaPasta referenced this in commit e8e962a4c5 on Jul 1, 2021
  26. PastaPastaPasta referenced this in commit 56a124b859 on Jul 12, 2021
  27. PastaPastaPasta referenced this in commit 00cc0de358 on Jul 13, 2021
  28. DrahtBot locked this on Dec 16, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-17 09:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me