# # # add_dir "res/linux" # # add_file "res/linux/guitone.desktop" # content [b61173a9414c15c5ea00e8974ce69eb57502cda1] # # add_file "res/linux/x-monotone-database.xml" # content [491a73fb2e5823bb4ea92eb6bec330c25f27b986] # # patch "NEWS" # from [c7d61fb5fd0a69145eba940db20ec281e354b867] # to [0edbb3bdb6fa7ecdd31755b888630c9c4ad18b30] # # patch "README" # from [ea3ddcd08f19e4493dcc367ca14610b39fb3d661] # to [a7e7f7689ec27a4b43e254c15686466ce3b43cbe] # # patch "guitone.pro" # from [98a47e299600cdee5c349882d5b20a23e1efca24] # to [f532a91cd1ed85e1bdd11513d5292bcf6c5e3861] # ============================================================ --- res/linux/guitone.desktop b61173a9414c15c5ea00e8974ce69eb57502cda1 +++ res/linux/guitone.desktop b61173a9414c15c5ea00e8974ce69eb57502cda1 @@ -0,0 +1,14 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=guitone +Name[de]=guitone +GenericName=Version Control Browser +GenericName[de]=Versionskontrollbrowser +Comment=Browse monotone databases and workspaces +Comment[de]=Durchstöbere monotone-Datenbanken und Arbeitsbereiche +Exec=guitone +Terminal=false +Type=Application +Icon=guitone +Categories=Development;RevisionControl; +MimeType=application/x-monotone-database ============================================================ --- res/linux/x-monotone-database.xml 491a73fb2e5823bb4ea92eb6bec330c25f27b986 +++ res/linux/x-monotone-database.xml 491a73fb2e5823bb4ea92eb6bec330c25f27b986 @@ -0,0 +1,12 @@ + + + + A monotone database + Eine monotone-Datenbank + + + + + + + \ No newline at end of file ============================================================ --- NEWS c7d61fb5fd0a69145eba940db20ec281e354b867 +++ NEWS 0edbb3bdb6fa7ecdd31755b888630c9c4ad18b30 @@ -17,6 +17,7 @@ xxxx-xx-xx (1.0rc3) * diagnostic messages if needed tools are not found * lrelease is now called automatically * include Mac OS X deploying and bundling as separate targets + * add an install target for Linux and a desktop and mime file - internal: bind guitone's internal settings system late to the needed QSettings backend; improve the creation of Mac OS X distributable binaries and images ============================================================ --- README ea3ddcd08f19e4493dcc367ca14610b39fb3d661 +++ README a7e7f7689ec27a4b43e254c15686466ce3b43cbe @@ -28,8 +28,12 @@ $ qmake -config release $ make -The following additional build targets are available: +The following additional make targets are available: + install (Linux only): + Installs the application and related files honoring PREFIX + and INSTALL_ROOT (make INSTALL_ROOT=/tmp/install-root install) + macdeploy (Mac OS X only): Deploy the Qt libraries and plugins in the application bundle @@ -40,18 +44,21 @@ Some influential variables (qmake VARNAME=value): LRELEASE (all platforms): - Path to Qt's lrelease utility + Path to Qt's lrelease utility (Default: lrelease) MTN (all platforms): Path to a monotone binary to determine the base revision - of the version which is about to be built + of the version which is about to be built (Default: mtn) MACDEPLOYQT (Mac OS X only): - Path to Qt's macdeployqt utility + Path to Qt's macdeployqt utility (Default: macdeployqt) HDIUTIL (Mac OS X only): - Path to Mac OS X' hdiutil disk utility + Path to Mac OS X' hdiutil disk utility (Default: hdiutil) + PREFIX (Linux only): + Installation prefix (Default: /usr) + The created binary and disk image can be found in bin/. ============================================================ --- guitone.pro 98a47e299600cdee5c349882d5b20a23e1efca24 +++ guitone.pro f532a91cd1ed85e1bdd11513d5292bcf6c5e3861 @@ -56,7 +56,7 @@ TARGET = guitone # TEMPLATE = app TARGET = guitone -QT += xml svg network +QT += xml svg network INCLUDEPATH = src/ \ src/view/widgets \ @@ -295,6 +295,22 @@ win32:RC_FILE = res/win32/guitone.rc # add guitone ico resource win32:RC_FILE = res/win32/guitone.rc +# *nix specific configuration +unix:!macx { + isEmpty(PREFIX):PREFIX="/usr" + + target.path = $$PREFIX/bin + icon.files = res/icons/$${TARGET}.png + icon.path = $$PREFIX/share/pixmaps + docs.files = NEWS README README.driver COPYING + docs.path = $$PREFIX/share/doc/$$TARGET-$$GUITONE_VERSION + desktop.files = res/linux/$${TARGET}.desktop + desktop.path = $$PREFIX/share/applications + mime.files = res/linux/x-monotone-database.xml + mime.path = $$PREFIX/share/mime/application + INSTALLS += target icon docs desktop mime +} + # MacOS X specific configuration macx { QMAKE_LFLAGS += -framework Carbon