Wireshark-commits: [Wireshark-commits] master 85eec7f: Fix PortableApps packaging.
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 2 Sep 2014 23:55:57 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=85eec7f603f63f1df357691bb558ad47fcc4a224
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

85eec7f by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Fix PortableApps packaging.
    
    Our Windows portable packaging environment has a lot of cruft which is
    no longer relevant. We removed support for U3 packages and the method
    we use to generate PortableApps packages has been deprecated for a while.
    
    Create PortableApps packages using current file formats (AppInfo v3.0)
    and tools. Generate the PA launcher using the PortableApps.com Launcher
    generator. Copy files and directories from the top level instead of using
    a manifest derived from the NSIS installer.
    
    The manifest is a good idea, but we should create a central manifest
    and use that to generate the NSIS and PortableApps packages instead of
    trying to parse wireshark.nsi.
    
    The new package still needs a bit of work but it installs and runs in
    the current version of the PA Platform.
    
    Remove the define for MAKENSIS_UNICODE. It doesn't look like we were
    using it.
    
    Start tearing down makefiles and scripts that we no longer use.
    
    Ping-Bug: 4191
    Change-Id: Ib7173eec887d0abf69bb176a1e3f943a5a63bee4
    Reviewed-on: https://code.wireshark.org/review/3962
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  9555c24   packet-netflow.c:  netflow v9: Allow options template with zero-length scope section
    adds  85eec7f   Fix PortableApps packaging.


Summary of changes:
 .gitignore                                         |    1 -
 config.nmake                                       |   22 +-
 docbook/wsdg_src/WSDG_chapter_sources.asciidoc     |   34 ++-
 docbook/wsdg_src/WSDG_chapter_tools.asciidoc       |   28 ++-
 packaging/Makefile.nmake                           |    9 +-
 packaging/portableapps/win32/Makefile.nmake        |  207 ++++++++--------
 packaging/portableapps/win32/WiresharkPortable.ini |    3 +
 packaging/portableapps/win32/WiresharkPortable.nsi |  251 --------------------
 packaging/portableapps/win32/appinfo.tmpl          |    6 +-
 packaging/portableapps/win32/help.html             |    8 +
 packaging/ws-manifest.pl                           |    7 +
 ui/qt/Wireshark.pro                                |    2 +-
 12 files changed, 213 insertions(+), 365 deletions(-)
 create mode 100644 packaging/portableapps/win32/WiresharkPortable.ini
 delete mode 100755 packaging/portableapps/win32/WiresharkPortable.nsi
 create mode 100644 packaging/portableapps/win32/help.html
 delete mode 100755 packaging/portableapps/win32/installer.ini