cri-dockerd icon indicating copy to clipboard operation
cri-dockerd copied to clipboard

Consolidate Makefiles

Open zhangwt-cn opened this issue 2 years ago • 3 comments

Fixes #254

Proposed Changes

  • Move packaging -> build/
  • Modified creating-a-release.md common.mk path
  • Cancel .gitignore /build

zhangwt-cn avatar Oct 12 '23 02:10 zhangwt-cn

Hi @zhangwt-cn Thank you for the PR!

Unfortunately, this is only a piece of the needed changes. We will also need to modify our Makefiles before we can introduce this change. Otherwise, our build output will still go to the build/ directory and be mixed together with the packaging folder.

I corrected the formatting on the original issue so that it is hopefully more clear. I'll leave this open and continue to review any additional changes you make. Thanks again for working on this!

nwneisen avatar Oct 12 '23 14:10 nwneisen

Hi @zhangwt-cn Thank you for the PR!

Unfortunately, this is only a piece of the needed changes. We will also need to modify our Makefiles before we can introduce this change. Otherwise, our build output will still go to the build/ directory and be mixed together with the packaging folder.

I corrected the formatting on the original issue so that it is hopefully more clear. I'll leave this open and continue to review any additional changes you make. Thanks again for working on this!

Thank you for your reminder, I modified it. If there are any other problems, I will be happy to improve it.

zhangwt-cn avatar Oct 13 '23 01:10 zhangwt-cn

Hey @zhangwt-cn,

Let's take a look at the Makefile in the project's root also. Looking at it I can see the following still:

  • Move/Remove the global variables at the top of the file so they are all in build/common.mk and shared throughout the project
  • Update the global variables so they are correct. i.e. PACKAGING_DIR should now point to the Makefile in build/packaging
  • Remove duplicate targets that already exist in build/packaging/Makefile. i.e. deb, rpm, cross-*, etc

Thanks!

nwneisen avatar Oct 15 '23 17:10 nwneisen