Re: [Wireshark-dev] Latest build modifies files?
On Mar 7, 2015, at 12:59 PM, Richard Sharpe realrichardsha...@gmail.com wrote: Hi folks, After my most recent build I noticed this: # On branch master # Your branch is ahead of 'origin/master' by 1 commit. # (use git push to publish your local commits) # # Changes not staged for commit: # (use git add file... to update what will be committed) # (use git checkout -- file... to discard changes in working directory) # # modified: ui/qt/wireshark_de.qm # modified: ui/qt/wireshark_it.qm # modified: ui/qt/wireshark_ja_JP.qm # modified: ui/qt/wireshark_pl.qm # modified: ui/qt/wireshark_zh_CN.qm # I did not touch those files and it seems a bit rude of the build to modify them. That was done in https://code.wireshark.org/review/7460/ and I've already added a comment there noting that either we should *not* have the .qm files checked into Git and *require* that you have the tools necessary to build them if you're going to build from Git or have them checked into Git and *not* build them as part of the build process. ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] Latest build modifies files?
Thus wrote Guy Harris (g...@alum.mit.edu): On Mar 7, 2015, at 12:59 PM, Richard Sharpe realrichardsha...@gmail.com wrote: Hi folks, After my most recent build I noticed this: # On branch master # Your branch is ahead of 'origin/master' by 1 commit. # (use git push to publish your local commits) # # Changes not staged for commit: # (use git add file... to update what will be committed) # (use git checkout -- file... to discard changes in working directory) # # modified: ui/qt/wireshark_de.qm # modified: ui/qt/wireshark_it.qm # modified: ui/qt/wireshark_ja_JP.qm # modified: ui/qt/wireshark_pl.qm # modified: ui/qt/wireshark_zh_CN.qm # I did not touch those files and it seems a bit rude of the build to modify them. That was done in https://code.wireshark.org/review/7460/ and I've already added a comment there noting that either we should *not* have the .qm files checked into Git and *require* that you have the tools necessary to build them if you're going to build from Git or have them checked into Git and *not* build them as part of the build process. The goal is to build the .qm files during the compilation and eventually remove them from the repository. This works now for autotools and cmake builds, I do not know about the status for nmake and sent the following mail to the list earlier today (which did not get relayed for some reason). Dear all, I just pushed a change to create the .qm files for Qt's translated texts from the corresponding .ts files. My change handles the autotools build. I saw that the cmake build already support this. Does anyone know if the Windows nmake build creates the .qm files? I can't test this myself at the moment, it seems that nmake uses qmake in the qt directory. When the nmake build can create the .qt files, we can remove them from the repository. Another open item is what to do if the lrelease tool that creates the .qm files is not available. Should we fail the build if the Qt version is to be built? Or can we continue without the .qm files and without multi-language support? Thanks, Martin ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
[Wireshark-dev] Latest build modifies files?
Hi folks, After my most recent build I noticed this: # On branch master # Your branch is ahead of 'origin/master' by 1 commit. # (use git push to publish your local commits) # # Changes not staged for commit: # (use git add file... to update what will be committed) # (use git checkout -- file... to discard changes in working directory) # # modified: ui/qt/wireshark_de.qm # modified: ui/qt/wireshark_it.qm # modified: ui/qt/wireshark_ja_JP.qm # modified: ui/qt/wireshark_pl.qm # modified: ui/qt/wireshark_zh_CN.qm # I did not touch those files and it seems a bit rude of the build to modify them. -- Regards, Richard Sharpe (何以解憂？唯有杜康。--曹操) ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] Latest build modifies files?
On Mar 7, 2015, at 4:26 PM, Martin Kaiser li...@kaiser.cx wrote: Thus wrote Martin Kaiser (li...@kaiser.cx): I just pushed a change to create the .qm files for Qt's translated texts from the corresponding .ts files. My change handles the autotools build. I saw that the cmake build already support this. Does anyone know if the Windows nmake build creates the .qm files? Looking at the buildbot output from e.g. http://buildbot.wireshark.org/petri-dish/builders/Windows%20x86%20Petri%20Dish/builds/1660/steps/nmake%20all/logs/stdio it seems this is already working. Great! So let's remove the .qm files *now*, so that a build that regenerates them won't leave developers with a Git tree with a bunch of bogus Changes not staged for commit for the .qm files. ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
Re: [Wireshark-dev] Latest build modifies files?
Thus wrote Martin Kaiser (li...@kaiser.cx): I just pushed a change to create the .qm files for Qt's translated texts from the corresponding .ts files. My change handles the autotools build. I saw that the cmake build already support this. Does anyone know if the Windows nmake build creates the .qm files? Looking at the buildbot output from e.g. http://buildbot.wireshark.org/petri-dish/builders/Windows%20x86%20Petri%20Dish/builds/1660/steps/nmake%20all/logs/stdio it seems this is already working. ... Updating qwindows.dll. Creating directory printsupport. Updating windowsprintersupport.dll. Creating qt_cs.qm... Creating qt_de.qm... Creating qt_fi.qm... Creating qt_hu.qm... Creating qt_it.qm... Creating qt_ja.qm... Creating qt_ru.qm... Creating qt_sk.qm... Creating qt_uk.qm... ) cd ../.. set copycmd=/y ... ___ Sent via:Wireshark-dev mailing list wireshark-dev@wireshark.org Archives:http://www.wireshark.org/lists/wireshark-dev Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe
