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

Replace DEBUG with EXIV2_DEBUG_MESSAGES #938

Merged
merged 1 commit into from
Jul 12, 2019
Merged

Conversation

piponazo
Copy link
Collaborator

Fixes #926

@piponazo piponazo added the compilers Related with compiler options, definitions, support, etc. label Jun 28, 2019
@piponazo piponazo added this to the v0.27.2 milestone Jun 28, 2019
@piponazo piponazo requested review from clanmills and D4N June 28, 2019 16:16
@piponazo piponazo self-assigned this Jun 28, 2019
@codecov
Copy link

codecov bot commented Jun 28, 2019

Codecov Report

Merging #938 into 0.27-maintenance will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@                Coverage Diff                @@
##           0.27-maintenance     #938   +/-   ##
=================================================
  Coverage             63.03%   63.03%           
=================================================
  Files                   156      156           
  Lines                 21628    21628           
=================================================
  Hits                  13634    13634           
  Misses                 7994     7994
Impacted Files Coverage Δ
src/xmpsidecar.cpp 86.4% <ø> (ø) ⬆️
src/basicio.cpp 35.88% <ø> (ø) ⬆️
src/pngchunk_int.cpp 88.02% <ø> (ø) ⬆️
src/gifimage.cpp 26.31% <ø> (ø) ⬆️
samples/geotag.cpp 81.17% <ø> (ø) ⬆️
src/crwimage_int.cpp 39.92% <ø> (ø) ⬆️
src/bmpimage.cpp 22.85% <ø> (ø) ⬆️
src/tiffvisitor_int.cpp 87.21% <ø> (ø) ⬆️
src/tgaimage.cpp 28.2% <ø> (ø) ⬆️
src/jpgimage.cpp 79.8% <ø> (ø) ⬆️
... and 20 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 b7a9785...02facf9. Read the comment docs.

Copy link
Collaborator

@clanmills clanmills left a comment

Choose a reason for hiding this comment

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

This is a surprise. I've already tagged and built 0.27.2-RC2. I would like to avoid code changes between 0.27.2-RC2 and 0.27.2. We could integrate this tonight, and either:

  1. Delete tag 0.27.2-RC2 and rebuild/publish/retag on Saturday.
  2. Integrate this and tag as 0.27.2-RC3 build/publish/tag on Saturday.
  3. Slipstream this into 0.27.2 in a couple of weeks.

What do you think about adding EXIV2_DEBUG_MESSAGES to CMakeLists.txt?

In the past, I've used CXXFLAGS=-DDEBUG to switch on those messages. I don't want them enabled everywhere because (as the user mentioned) it generate a lot of output from parts of the code that are not being investigate. So, I prefer to switch it on to rebuild selected files:

$ touch ../src/voo.cpp ; make CXXFLAGS=-DDEBUG

Or, define it in the code while debugging (and remove before commit).

// foo.cpp
#ifndef DEBUG
#define DEBUG
#endif

Copy link
Collaborator

@clanmills clanmills left a comment

Choose a reason for hiding this comment

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

I think I'm in favour of this AND don't make it an option in CMakeLists.txt. It makes it very clear that this code is for team/feature debugging.

So, I'm happy to approve this after we've discussed what to do about the tag I've already created for v0.27.2-RC2.

My feeling is that we should go to v0.27.2-RC3 which will require updating release notes.txt and the platform/ReadMe.txt files (almost painless).

@piponazo
Copy link
Collaborator Author

I just created the PR because it was something easy to do, but this can wait to be merged. Actually, if we see that this could affect to the ABI as @D4N commented, we can close this PR and just merge #939 into master.

Keep the RC2 tag, and enjoy your well deserved holidays 😉

@clanmills clanmills modified the milestones: v0.27.2, v0.27.3 Jul 11, 2019
@clanmills
Copy link
Collaborator

@piponazo Let's not submit this into v0.27.2 which is PR #940. I'd like to release v0.27.2 today.

I'll approve this tomorrow and pull it into 0.27-maintenance. It'll be released with v0.27.3 scheduled for 2019-09-30.

@clanmills clanmills mentioned this pull request Jul 11, 2019
@clanmills clanmills modified the milestones: v0.27.3, v0.27.2 Jul 11, 2019
@clanmills
Copy link
Collaborator

@piponazo We've had a change of plan. #940 (comment)

Can you merge this onto 0.27-maintenance by Sunday afternoon (2019-07-14)?

clanmills
clanmills previously approved these changes Jul 11, 2019
@piponazo
Copy link
Collaborator Author

Sure! I'll rebase, push and merge once the CI is green 😉

@piponazo piponazo force-pushed the EXIV2_DEBUG_MESSAGES branch from 7e2522b to c351765 Compare July 11, 2019 10:58
@mergify mergify bot dismissed clanmills’s stale review July 11, 2019 10:59

Pull request has been modified.

Copy link
Member

@D4N D4N left a comment

Choose a reason for hiding this comment

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

Please cherry-pick the commits that went into master, as this still has the original inconsistencies in the docs.

@piponazo piponazo force-pushed the EXIV2_DEBUG_MESSAGES branch from c351765 to a1d4398 Compare July 11, 2019 11:24
@piponazo piponazo force-pushed the EXIV2_DEBUG_MESSAGES branch from a1d4398 to 02facf9 Compare July 11, 2019 11:25
@piponazo piponazo requested a review from D4N July 11, 2019 11:25
@clanmills
Copy link
Collaborator

Don't spend time on README.md. The version of that on 'master' and '0.27-maintenance' have diverged substantially. I'll make sure that the version on 0.27-maintenance is good. And fix 'master' when we arrive at 0.28-RC1 (maybe September 2020).

@D4N D4N removed the to-master label Jul 12, 2019
Copy link
Member

@D4N D4N left a comment

Choose a reason for hiding this comment

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

Thanks for backporting this!

@D4N D4N merged commit 113136e into 0.27-maintenance Jul 12, 2019
@mergify mergify bot deleted the EXIV2_DEBUG_MESSAGES branch July 12, 2019 09:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compilers Related with compiler options, definitions, support, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants