Amend man/CMakeLists.txt to prevent writes to the man3 source directory #3

Συγχωνεύτηκαν χειροκίνητα
MicheleC συγχώνευσε 1 υποβολές από bug/3122/write-to-source-fix σε master 4 έτη πριν
aneejit1 σχολίασε 4 έτη πριν
Συνεργάτης

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 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.
SlavekB σχολίασε 4 έτη πριν
Ιδιοκτήτης

The patch looks good, just two small notes:

  1. It's good to mention something like "This resolves bug 3122" in the commit message. This ensures that a link is created when the changelog is generated.
  2. It is required to declare consent to the DCO using a Signed-off-by signature. When creating new committees, just use the -s option.

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 use git push origin HEAD -f to push the changed commit to your branch.

The patch looks good, just two small notes: 1. It's good to mention something like "This resolves bug 3122" in the commit message. This ensures that a link is created when the changelog is generated. 2. It is required to declare consent to the DCO using a Signed-off-by signature. When creating new committees, just use the `-s` option. 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 use `git push origin HEAD -f` to push the changed commit to your branch.
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

Welcome to TGW @aneejit1. Good to see new contributors!!

Welcome to TGW @aneejit1. Good to see new contributors!!
aneejit1 σχολίασε 4 έτη πριν
Συντάκτης
Συνεργάτης

OK, "git commit -s --amend" and "git push origin HEAD -f" done!

OK, "git commit -s --amend" and "git push origin HEAD -f" done!
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

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.

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.
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

No *.3 man files seems to be generated with the PR code. Marking PR as not ok till we find a solution.

No \*.3 man files seems to be generated with the PR code. Marking PR as not ok till we find a solution.
MicheleC πρόσθεσε τη σήμανση PR/not-ok 4 έτη πριν
SlavekB σχολίασε 4 έτη πριν
Ιδιοκτήτης

I assume the problem is the use of a relative path in the doxygen call.

COMMAND doxygen ../doc/libr.cfg

You can test whether using the cmake variable solves the problem:

COMMAND doxygen ${CMAKE_SOURCE_DIR}/doc/libr.cfg
I assume the problem is the use of a relative path in the doxygen call. ``` COMMAND doxygen ../doc/libr.cfg ``` You can test whether using the cmake variable solves the problem: ``` COMMAND doxygen ${CMAKE_SOURCE_DIR}/doc/libr.cfg ```
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

Nope, same type of FTBFS even with the suggested changes. No man pages generated.

Nope, same type of FTBFS even with the suggested changes. No man pages generated.
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

@aneejit1 Could you try using the additional commit in this PR?

@aneejit1 Could you try using the additional commit in this PR?
MicheleC αφαίρεσε το σήμα PR/not-ok 4 έτη πριν
aneejit1 σχολίασε 4 έτη πριν
Συντάκτης
Συνεργάτης

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!

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!
SlavekB σχολίασε 4 έτη πριν
Ιδιοκτήτης

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:

git checkout master
git branch -D bug/3122/write-to-source-fix
git checkout bug/3122/write-to-source-fix
git pull --rebase
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: ``` git checkout master git branch -D bug/3122/write-to-source-fix git checkout bug/3122/write-to-source-fix git pull --rebase ```
aneejit1 σχολίασε 4 έτη πριν
Συντάκτης
Συνεργάτης

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?

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?
SlavekB σχολίασε 4 έτη πριν
Ιδιοκτήτης

There seems to be nothing to prevent us from merge!

There seems to be nothing to prevent us from merge!
MicheleC έκλεισε αυτό το pull request 4 έτη πριν
SlavekB διέγραψε το κλάδο bug/3122/write-to-source-fix 4 έτη πριν
SlavekB το πρόσθεσε στο R14.0.9 release ορόσημο 4 έτη πριν
MicheleC σχολίασε 4 έτη πριν
Ιδιοκτήτης

I find git less than intuitive.

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 👍

> I find git less than intuitive. 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 :smile: Btw, great to see new ppl contributing! Keep it up :+1:
Το pull request έχει συγχωνευθεί χειροκίνητα ως e497d55b67.
Συνδεθείτε για να συμμετάσχετε σε αυτή τη συνομιλία.
Δεν υπάρχουν εξεταστές
Χωρίς Ορόσημο
Χωρίς Αποδέκτη
3 Συμμετέχοντες
Ειδοποιήσεις
Ημερομηνία Παράδοσης

Δεν ορίστηκε ημερομηνία παράδοσης.

Εξαρτήσεις

Δεν έχουν οριστεί εξαρτήσεις.

Αναφορά: TDE/libr#3
Φόρτωση…
Δεν υπάρχει ακόμα περιεχόμενο.