uninstall
ClosedPublic
Actions

Authored by tcberner on Jan 1 2020, 5:26 PM.

Details

Reviewers

mat
adridg

Group Reviewers

kde
O5: Ports Framework	(Owns No Changed Paths)
portmgr

Commits

rP524129: misc/qtchooser: do not create unnecessary wrappers

Summary

misc/qtchooser provides a wrapper binary bin/qtchooser, that when called with
name foo, will lauch the corresponding binary from
lib/qt${current_qt_version}/bin/foo.

Previously qtchooser would install a list of 30-ish symlinks to itself automatically.
Now we switch this around.

qt-dist ports that define QT_BINARIES will now have a @postexec and @postunexec
entry added to their plist to run the shell-script update-qtchooser-wrapper
(installed by qtchooser).

update-qtchooser-wrapper removes all symlinks to bin/qtchooser that have no
corresponding binary in lib/qt*/bin, and readds links that are missing.

PR: 242905

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 28416
Build 26492: arc lint + arc unit

Event Timeline

tcberner created this revision.Jan 1 2020, 5:26 PM

Owners added a reviewer: O5: Ports Framework.Jan 1 2020, 5:26 PM

Herald added a reviewer: portmgr. · View Herald TranscriptJan 1 2020, 5:26 PM

Harbormaster completed remote builds in B28416: Diff 66215.Jan 1 2020, 5:26 PM

===>  Installing for qt5-qmake-5.14.0
===>  Checking if qt5-qmake is already installed
===>   Registering installation for qt5-qmake-5.14.0
[130amd64-kde-qt-job-01] Installing qt5-qmake-5.14.0...
Removing qtchooser links
done
Creating qtchooser links
    /usr/local/bin/qmake
done
===========================================================================
=>> Checking for extra files and directories
=>> Cleaning up wrkdir
===>  Cleaning for qt5-qmake-5.14.0

Use exit rather than return.

Harbormaster completed remote builds in B28417: Diff 66216.Jan 1 2020, 5:32 PM

Do we really need those echos in the script? AFAIK, java/javavmwrapper does basically the same thing, but do it silently.

In D22991#503947, @arrowd wrote:

Do we really need those echos in the script? AFAIK, java/javavmwrapper does basically the same thing, but do it silently.

I think when a script modifies the system on pkg-add/pkg-remove it should say what it does.

Something for the documentation comment at the top:

# If a port installs Qt version-specific binaries (e.g. "designer" which existed as a Qt4 application
# and exists as a Qt5 application and will probably be a Qt6 application) which should have a
# qtchooser-based wrapper, the port should set `QT_BINARIES=yes`.
#
# When QT_BINARIES is set to yes, compatibility symlinks (designer -> qtchooser, so that
# qtchooser can run  designer-qt5 or whatever is the selected Qt version) are installed by the port.

adridg added inline comments.Jan 2 2020, 8:26 PM

misc/qtchooser/files/update-qtchooser-wrapper.in
33	Should be `break`, and a comment like `# If at least one versioned executable is found for this name, keep the qtchooser compatibility symlink for this name; otherwise, remove it.`