Amend man/CMakeLists.txt to prevent writes to the man3 source directory #3
Συγχωνεύτηκαν χειροκίνητα
MicheleC
συγχώνευσε 1 υποβολές από bug/3122/write-to-source-fix σε master 4 έτη πριν
Φόρτωση…
Αναφορά σε νέο ζήτημα
Δεν υπάρχει ακόμα περιεχόμενο.
Διαγραφή του Κλάδου 'bug/3122/write-to-source-fix'
Η διαγραφή του κλάδου είναι μόνιμη. ΔΕΝ ΜΠΟΡΕΙ να αναιρεθεί. Συνέχεια;
The man/CMakeLists was specifying the source directory as its output and working directories. This will cause the build to fail when the building userid does not have write access to the source tree. Amended to create the man3 directory in the binary tree and build the manpages there.
The patch looks good, just two small notes:
-soption.To modify an existing commit, you can use
git commit -s --amend, where it will be automatically appended Signed-off-by and at the same time you will be able to add a mention of the resolved bug to the commit message. Then you can usegit push origin HEAD -fto push the changed commit to your branch.Welcome to TGW @aneejit1. Good to see new contributors!!
OK, "git commit -s --amend" and "git push origin HEAD -f" done!
I made a minor adjustment to the commit message, so that the complete comment is before the sign-off clause. Authorship of @aneejit1 is retained.
Anyhow a build run in bulleyes FTBFS. Looking into it now.
No *.3 man files seems to be generated with the PR code. Marking PR as not ok till we find a solution.
I assume the problem is the use of a relative path in the doxygen call.
You can test whether using the cmake variable solves the problem:
Nope, same type of FTBFS even with the suggested changes. No man pages generated.
@aneejit1 Could you try using the additional commit in this PR?
So, I think I've managed to balls things up at my end. I have to say that having come from mainframe change management systems that were a doddle to use, I find git less than intuitive.
I tried to get your update using "git pull" and it reported a conflict which I had to look up how to resolve. Which involved manually editing the stuff that it added to man/CMakeLists.txt. The pull then reported no conflicts, but the line removed from man/CMakeLists.txt is still there, the new like in CMakeLists isn't there, and doc/libr.cfg.cmake is. I've basically got half your update and it's saying it's up to date.
Help!
If you have your local branch damaged and want to go to the updated branch from the server, then perhaps the easiest way may be to remove your local branch and use the branch from the server:
That's sorted it. Thanks.
I've rebuilt and I can see that it's working better now. I should have checked the logs a little more closely then I'd have realised that it wasn't doing anything before.
What next?
There seems to be nothing to prevent us from merge!
eh eh, I guess any new user of git has the same reaction. But it is actually a super tool! With time you will learn to appreciate it 😄
Btw, great to see new ppl contributing! Keep it up 👍
e497d55b67.