Skip to content
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

Adjust cmake to install same .h and .pc files as configure #642

Merged
merged 4 commits into from Jun 19, 2020

Conversation

dankegel
Copy link
Contributor

This is the first few commits of #639

They're the easy part of the fix for #638

The rest is touchier and deserves its own pull request (possibly after #560 lands)

@codecov
Copy link

codecov bot commented Jun 13, 2020

Codecov Report

Merging #642 into develop will decrease coverage by 4.40%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #642      +/-   ##
===========================================
- Coverage    78.02%   73.62%   -4.41%     
===========================================
  Files           59       59              
  Lines         7282     7215      -67     
  Branches      1229     1215      -14     
===========================================
- Hits          5682     5312     -370     
- Misses        1111     1415     +304     
+ Partials       489      488       -1     
Flag Coverage Δ
#macos_clang 65.60% <ø> (ø)
#macos_gcc 65.60% <ø> (ø)
#ubuntu_clang 68.83% <ø> (ø)
#ubuntu_clang_debug 68.39% <ø> (ø)
#ubuntu_clang_inflate_allow_invalid_dist 68.71% <ø> (ø)
#ubuntu_clang_inflate_strict 68.99% <ø> (ø)
#ubuntu_clang_msan 68.75% <ø> (ø)
#ubuntu_gcc 74.92% <ø> (+0.09%) ⬆️
#ubuntu_gcc_aarch64_compat ?
#ubuntu_gcc_aarch64_compat_no_opt ?
#ubuntu_gcc_armhf 72.76% <ø> (ø)
#ubuntu_gcc_armhf_compat 72.92% <ø> (ø)
#ubuntu_gcc_armhf_compat_no_neon 72.19% <ø> (ø)
#ubuntu_gcc_armhf_compat_no_opt 71.10% <ø> (ø)
#ubuntu_gcc_armhf_no_neon 71.98% <ø> (ø)
#ubuntu_gcc_armhf_no_opt 70.90% <ø> (ø)
#ubuntu_gcc_armsf 72.69% <ø> (ø)
#ubuntu_gcc_armsf_compat 72.81% <ø> (ø)
#ubuntu_gcc_armsf_compat_no_opt 71.10% <ø> (ø)
#ubuntu_gcc_armsf_no_acle 70.78% <ø> (ø)
#ubuntu_gcc_armsf_no_opt 70.90% <ø> (ø)
#ubuntu_gcc_compat_no_opt 71.14% <ø> (ø)
#ubuntu_gcc_compat_sani 70.08% <ø> (ø)
#ubuntu_gcc_no_avx2 71.54% <ø> (ø)
#ubuntu_gcc_no_opt 70.93% <ø> (ø)
#ubuntu_gcc_no_pclmulqdq 69.01% <ø> (ø)
#ubuntu_gcc_no_sse2 70.95% <ø> (ø)
#ubuntu_gcc_no_sse4 69.94% <ø> (ø)
#ubuntu_gcc_osb 70.49% <ø> (ø)
#ubuntu_gcc_ppc64_compat 72.07% <ø> (ø)
#ubuntu_gcc_ppc64le_compat 71.43% <ø> (ø)
#ubuntu_gcc_ppc_compat 72.05% <ø> (ø)
#ubuntu_gcc_s390x_compat 72.27% <ø> (ø)
#ubuntu_gcc_sparc64_compat 72.53% <ø> (ø)
#win64_gcc ?
#win64_gcc_compat ?
#win64_gcc_compat_no_opt ?
Impacted Files Coverage Δ
trees_emit.h 0.00% <0.00%> (-80.27%) ⬇️
trees.c 5.74% <0.00%> (-65.61%) ⬇️
zutil.c 0.00% <0.00%> (-40.00%) ⬇️
deflate.h 0.00% <0.00%> (-30.00%) ⬇️
inftrees.c 62.71% <0.00%> (-14.41%) ⬇️
memcopy.h 89.53% <0.00%> (-5.26%) ⬇️
test/fuzz/minigzip_fuzzer.c 54.78% <0.00%> (-2.98%) ⬇️
adler32.c 86.79% <0.00%> (-1.89%) ⬇️
test/switchlevels.c 52.12% <0.00%> (-1.00%) ⬇️
test/minigzip.c 37.32% <0.00%> (-0.61%) ⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fe69810...c004009. Read the comment docs.

@codecov
Copy link

codecov bot commented Jun 13, 2020

Codecov Report

Merging #642 into develop will decrease coverage by 4.48%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #642      +/-   ##
===========================================
- Coverage    78.02%   73.54%   -4.49%     
===========================================
  Files           59       59              
  Lines         7282     7242      -40     
  Branches      1229     1222       -7     
===========================================
- Hits          5682     5326     -356     
- Misses        1111     1427     +316     
  Partials       489      489              
Flag Coverage Δ
#macos_clang 65.60% <ø> (ø)
#macos_gcc 65.60% <ø> (ø)
#ubuntu_clang 68.83% <ø> (ø)
#ubuntu_clang_debug 68.39% <ø> (ø)
#ubuntu_clang_inflate_allow_invalid_dist 68.71% <ø> (ø)
#ubuntu_clang_inflate_strict 68.99% <ø> (ø)
#ubuntu_clang_msan 68.75% <ø> (ø)
#ubuntu_gcc 74.82% <ø> (ø)
#ubuntu_gcc_aarch64_compat 71.33% <ø> (ø)
#ubuntu_gcc_aarch64_compat_no_opt 70.06% <ø> (ø)
#ubuntu_gcc_armhf 72.76% <ø> (ø)
#ubuntu_gcc_armhf_compat 72.92% <ø> (ø)
#ubuntu_gcc_armhf_compat_no_neon 72.19% <ø> (ø)
#ubuntu_gcc_armhf_compat_no_opt 71.10% <ø> (ø)
#ubuntu_gcc_armhf_no_neon 71.98% <ø> (ø)
#ubuntu_gcc_armhf_no_opt 70.90% <ø> (ø)
#ubuntu_gcc_armsf 72.69% <ø> (ø)
#ubuntu_gcc_armsf_compat 72.81% <ø> (ø)
#ubuntu_gcc_armsf_compat_no_opt 71.10% <ø> (ø)
#ubuntu_gcc_armsf_no_acle 70.78% <ø> (ø)
#ubuntu_gcc_armsf_no_opt 70.90% <ø> (ø)
#ubuntu_gcc_compat_no_opt 71.14% <ø> (ø)
#ubuntu_gcc_compat_sani 70.08% <ø> (ø)
#ubuntu_gcc_no_avx2 71.54% <ø> (ø)
#ubuntu_gcc_no_opt 70.93% <ø> (ø)
#ubuntu_gcc_no_pclmulqdq 69.01% <ø> (ø)
#ubuntu_gcc_no_sse2 70.95% <ø> (ø)
#ubuntu_gcc_no_sse4 69.94% <ø> (ø)
#ubuntu_gcc_osb 70.49% <ø> (ø)
#ubuntu_gcc_ppc64_compat 72.07% <ø> (ø)
#ubuntu_gcc_ppc64le_compat 71.43% <ø> (ø)
#ubuntu_gcc_ppc_compat 72.05% <ø> (ø)
#ubuntu_gcc_s390x_compat 72.27% <ø> (ø)
#ubuntu_gcc_sparc64_compat 72.53% <ø> (ø)
#win64_gcc ?
#win64_gcc_compat ?
#win64_gcc_compat_no_opt ?
Impacted Files Coverage Δ
trees_emit.h 0.00% <0.00%> (-80.27%) ⬇️
trees.c 5.74% <0.00%> (-65.61%) ⬇️
zutil.c 0.00% <0.00%> (-40.00%) ⬇️
deflate.h 0.00% <0.00%> (-30.00%) ⬇️
inftrees.c 62.71% <0.00%> (-14.41%) ⬇️
memcopy.h 89.66% <0.00%> (-5.13%) ⬇️
test/fuzz/minigzip_fuzzer.c 54.78% <0.00%> (-2.98%) ⬇️
adler32.c 86.79% <0.00%> (-1.89%) ⬇️
test/switchlevels.c 52.12% <0.00%> (-1.00%) ⬇️
test/minigzip.c 37.32% <0.00%> (-0.61%) ⬇️
... and 2 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fe69810...c004009. Read the comment docs.

CMakeLists.txt Outdated Show resolved Hide resolved
@Dead2
Copy link
Member

Dead2 commented Jun 18, 2020

Other than the inline comment being misleading, the rest looks good to me.

@codecov
Copy link

codecov bot commented Jun 18, 2020

Codecov Report

Merging #642 into develop will decrease coverage by 0.41%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #642      +/-   ##
===========================================
- Coverage    79.19%   78.77%   -0.42%     
===========================================
  Files           60       60              
  Lines         7464     7392      -72     
  Branches      1257     1248       -9     
===========================================
- Hits          5911     5823      -88     
- Misses        1048     1063      +15     
- Partials       505      506       +1     
Flag Coverage Δ
#macos_clang 65.23% <ø> (ø)
#macos_gcc 65.23% <ø> (ø)
#ubuntu_clang 74.55% <ø> (ø)
#ubuntu_clang_debug 74.22% <ø> (ø)
#ubuntu_clang_inflate_allow_invalid_dist 73.62% <ø> (ø)
#ubuntu_clang_inflate_strict 73.91% <ø> (ø)
#ubuntu_clang_msan 73.72% <ø> (ø)
#ubuntu_gcc 79.36% <ø> (-0.47%) ⬇️
#ubuntu_gcc_aarch64_compat ?
#ubuntu_gcc_aarch64_compat_no_opt ?
#ubuntu_gcc_armhf 77.76% <ø> (ø)
#ubuntu_gcc_armhf_compat 77.64% <ø> (-0.29%) ⬇️
#ubuntu_gcc_armhf_compat_no_neon 77.39% <ø> (ø)
#ubuntu_gcc_armhf_compat_no_opt ?
#ubuntu_gcc_armhf_no_neon ?
#ubuntu_gcc_armhf_no_opt 74.98% <ø> (ø)
#ubuntu_gcc_armsf ?
#ubuntu_gcc_armsf_compat ?
#ubuntu_gcc_armsf_compat_no_opt 75.20% <ø> (ø)
#ubuntu_gcc_armsf_no_acle ?
#ubuntu_gcc_armsf_no_opt ?
#ubuntu_gcc_compat_no_opt 75.23% <ø> (ø)
#ubuntu_gcc_compat_sani 75.17% <ø> (ø)
#ubuntu_gcc_no_avx2 76.64% <ø> (ø)
#ubuntu_gcc_no_opt 75.00% <ø> (ø)
#ubuntu_gcc_no_pclmulqdq 74.28% <ø> (ø)
#ubuntu_gcc_no_sse2 ?
#ubuntu_gcc_no_sse4 75.02% <ø> (ø)
#ubuntu_gcc_osb ?
#ubuntu_gcc_ppc64_compat ?
#ubuntu_gcc_ppc64le_compat ?
#ubuntu_gcc_ppc_compat 77.73% <ø> (ø)
#ubuntu_gcc_s390x_compat ?
#ubuntu_gcc_sparc64_compat ?
#win64_gcc ?
#win64_gcc_compat ?
#win64_gcc_compat_no_opt ?
Impacted Files Coverage Δ
arch/power/slide_hash_power8.c 0.00% <0.00%> (-100.00%) ⬇️
arch/power/power.c 50.00% <0.00%> (-25.00%) ⬇️
memcopy.h 88.95% <0.00%> (-5.84%) ⬇️
test/fuzz/minigzip_fuzzer.c 54.78% <0.00%> (-2.98%) ⬇️
test/switchlevels.c 51.06% <0.00%> (-2.07%) ⬇️
adler32.c 86.79% <0.00%> (-1.89%) ⬇️
functable.c 84.84% <0.00%> (-1.52%) ⬇️
test/minigzip.c 36.55% <0.00%> (-0.62%) ⬇️
test/minideflate.c 52.66% <0.00%> (-0.56%) ⬇️
trees.c 95.04% <0.00%> (-0.30%) ⬇️
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ae0fcc0...2a0cc77. Read the comment docs.

@dankegel dankegel force-pushed the bug638-same-pc-and-h branch 3 times, most recently from adcf34b to 2e26d09 Compare June 18, 2020 22:10
Copy link
Member

@nmoinvaz nmoinvaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work, made a few suggestions..

.github/workflows/pkgcheck.yml Outdated Show resolved Hide resolved
.github/workflows/pkgcheck.yml Outdated Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
CMakeLists.txt Show resolved Hide resolved
Also make comment in zconf.h less configure-specific
@dankegel
Copy link
Contributor Author

The coverage failure seems spurious... some of the ppc jobs didn't run?

…excluding .a and .so for now)

Also add workflow to run pkgcheck.sh on one system.
@dankegel
Copy link
Contributor Author

I think this is ready to merge.

@Dead2
Copy link
Member

Dead2 commented Jun 19, 2020

The coverage failure seems spurious... some of the ppc jobs didn't run?

The coverage comments are incomplete, you need to follow the #642 link in the comment, because on the website it is correct. This PR currently shows zero coverage change.
We have an ongoing ticket with codecov to get this fixed here: https://community.codecov.io/t/github-pr-not-being-updated-with-final-coverage-data/1425/25

Hopefully they will figure out what is wrong soon.

@Dead2
Copy link
Member

Dead2 commented Jun 19, 2020

Looks very good :)

@Dead2 Dead2 merged commit 2a5585c into zlib-ng:develop Jun 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants