Wireshark-commits: [Wireshark-commits] master 978faf3: NSIS/Qt: Move Qt version logic to windeployq

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 15 Aug 2014 16:54:59 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=978faf396ca743d2c44b1cf3d6df2c563d9fa653
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

978faf3 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    NSIS/Qt: Move Qt version logic to windeployqt-to-nsis.
    
    Move Qt version checking from packaging/nsis/Makefile.nmake to
    windeployqt-to-nsis.ps1. Get rid of the -Windeployqt parameter since
    its absence is a condition we now handle.
    
    Change-Id: Ieba86d5a91e8217ed11dbe57e80bedaccd2e99cf
    Reviewed-on: https://code.wireshark.org/review/3595
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  4e267ba   Windows: Fix PowerShell 2.0 compatibility.
    adds  978faf3   NSIS/Qt: Move Qt version logic to windeployqt-to-nsis.


Summary of changes:
 packaging/nsis/Makefile.nmake          |   22 ++-----
 packaging/nsis/windeployqt-to-nsis.ps1 |  103 ++++++++++++++++++++++----------
 2 files changed, 74 insertions(+), 51 deletions(-)