From 5ae5d76ffc53718ccdd89d6c1829fa23d7599cba Mon Sep 17 00:00:00 2001 From: AsamK Date: Sun, 23 Aug 2015 11:13:55 +0200 Subject: [PATCH] Make file names consistent with packaging Rename executables: RetroShare -> RetroShare06 retroshare-nogui -> RetroShare06-nogui Add 06 suffix to icons and desktop file Update README, debian rules and windows installer file --- README.md | 12 ++++++---- RetroShare.pro | 21 +++++++----------- .../apps/retroshare06.png} | Bin .../{retroshare.png => apps/retroshare06.png} | Bin .../{retroshare.png => apps/retroshare06.png} | Bin .../{retroshare.png => apps/retroshare06.png} | Bin ...etroshare.desktop => retroshare06.desktop} | 0 .../data/{retroshare.xpm => retroshare06.xpm} | 0 build_scripts/Debian+Ubuntu/debian/rules | 16 ++++++------- build_scripts/Windows/retroshare.nsi | 6 ++--- retroshare-gui/src/retroshare-gui.pro | 2 +- retroshare-nogui/src/retroshare-nogui.pro | 2 +- 12 files changed, 29 insertions(+), 30 deletions(-) rename build_scripts/Debian+Ubuntu/data/{retroshare.png => 128x128/apps/retroshare06.png} (100%) rename build_scripts/Debian+Ubuntu/data/24x24/{retroshare.png => apps/retroshare06.png} (100%) rename build_scripts/Debian+Ubuntu/data/48x48/{retroshare.png => apps/retroshare06.png} (100%) rename build_scripts/Debian+Ubuntu/data/64x64/{retroshare.png => apps/retroshare06.png} (100%) rename build_scripts/Debian+Ubuntu/data/{retroshare.desktop => retroshare06.desktop} (100%) rename build_scripts/Debian+Ubuntu/data/{retroshare.xpm => retroshare06.xpm} (100%) diff --git a/README.md b/README.md index f89c67a24..4083ae22e 100644 --- a/README.md +++ b/README.md @@ -37,14 +37,18 @@ Compilation on Linux 3. Compile ```bash cd trunk - qmake CONFIG=debug + qmake CONFIG=debug PREFIX=/usr make ``` - The executables produced will be: +4. Install + ```bash + sudo make install + ``` - trunk/retroshare-gui/src/RetroShare - trunk/retroshare-nogui/src/retroshare-nogui + The executables produced will be: + /usr/bin/RetroShare06 + /usr/bin/RetroShare06-nogui If libsqlcipher is not available as a package --------------------------------------------- diff --git a/RetroShare.pro b/RetroShare.pro index 76ea7fb54..85834dfd7 100644 --- a/RetroShare.pro +++ b/RetroShare.pro @@ -18,24 +18,19 @@ unix { isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" } isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/RetroShare06" } - icon_24_files.path = "$${PREFIX}/share/icons/hicolor/24x24/apps" - icon_24_files.files = build_scripts/Debian+Ubuntu/data/24x24/* - INSTALLS += icon_24_files - - icon_48_files.path = "$${PREFIX}/share/icons/hicolor/48x48/apps" - icon_48_files.files = build_scripts/Debian+Ubuntu/data/48x48/* - INSTALLS += icon_48_files - - icon_64_files.path = "$${PREFIX}/share/icons/hicolor/64x64/apps" - icon_64_files.files = build_scripts/Debian+Ubuntu/data/64x64/* - INSTALLS += icon_64_files + icon_files.path = "$${PREFIX}/share/icons/hicolor" + icon_files.files = build_scripts/Debian+Ubuntu/data/24x24 + icon_files.files += build_scripts/Debian+Ubuntu/data/48x48 + icon_files.files += build_scripts/Debian+Ubuntu/data/64x64 + icon_files.files += build_scripts/Debian+Ubuntu/data/128x128 + INSTALLS += icon_files desktop_files.path = "$${PREFIX}/share/applications" - desktop_files.files = build_scripts/Debian+Ubuntu/retroshare.desktop + desktop_files.files = build_scripts/Debian+Ubuntu/retroshare06.desktop INSTALLS += desktop_files pixmap_files.path = "$${PREFIX}/share/pixmaps" - pixmap_files.files = build_scripts/Debian+Ubuntu/retroshare.xpm + pixmap_files.files = build_scripts/Debian+Ubuntu/retroshare06.xpm INSTALLS += pixmap_files data_files.path = "$${DATA_DIR}" diff --git a/build_scripts/Debian+Ubuntu/data/retroshare.png b/build_scripts/Debian+Ubuntu/data/128x128/apps/retroshare06.png similarity index 100% rename from build_scripts/Debian+Ubuntu/data/retroshare.png rename to build_scripts/Debian+Ubuntu/data/128x128/apps/retroshare06.png diff --git a/build_scripts/Debian+Ubuntu/data/24x24/retroshare.png b/build_scripts/Debian+Ubuntu/data/24x24/apps/retroshare06.png similarity index 100% rename from build_scripts/Debian+Ubuntu/data/24x24/retroshare.png rename to build_scripts/Debian+Ubuntu/data/24x24/apps/retroshare06.png diff --git a/build_scripts/Debian+Ubuntu/data/48x48/retroshare.png b/build_scripts/Debian+Ubuntu/data/48x48/apps/retroshare06.png similarity index 100% rename from build_scripts/Debian+Ubuntu/data/48x48/retroshare.png rename to build_scripts/Debian+Ubuntu/data/48x48/apps/retroshare06.png diff --git a/build_scripts/Debian+Ubuntu/data/64x64/retroshare.png b/build_scripts/Debian+Ubuntu/data/64x64/apps/retroshare06.png similarity index 100% rename from build_scripts/Debian+Ubuntu/data/64x64/retroshare.png rename to build_scripts/Debian+Ubuntu/data/64x64/apps/retroshare06.png diff --git a/build_scripts/Debian+Ubuntu/data/retroshare.desktop b/build_scripts/Debian+Ubuntu/data/retroshare06.desktop similarity index 100% rename from build_scripts/Debian+Ubuntu/data/retroshare.desktop rename to build_scripts/Debian+Ubuntu/data/retroshare06.desktop diff --git a/build_scripts/Debian+Ubuntu/data/retroshare.xpm b/build_scripts/Debian+Ubuntu/data/retroshare06.xpm similarity index 100% rename from build_scripts/Debian+Ubuntu/data/retroshare.xpm rename to build_scripts/Debian+Ubuntu/data/retroshare06.xpm diff --git a/build_scripts/Debian+Ubuntu/debian/rules b/build_scripts/Debian+Ubuntu/debian/rules index de9a3cb38..07e102117 100755 --- a/build_scripts/Debian+Ubuntu/debian/rules +++ b/build_scripts/Debian+Ubuntu/debian/rules @@ -33,18 +33,18 @@ install: build dh_testroot dh_clean -k dh_installdirs - install -D -m 644 src/data/retroshare.desktop $(CURDIR)/debian/retroshare06/usr/share/applications/retroshare06.desktop - install -D -m 644 src/data/24x24/retroshare.png $(CURDIR)/debian/retroshare06/usr/share/icons/hicolor/24x24/apps/retroshare06.png - install -D -m 644 src/data/48x48/retroshare.png $(CURDIR)/debian/retroshare06/usr/share/icons/hicolor/48x48/apps/retroshare06.png - install -D -m 644 src/data/64x64/retroshare.png $(CURDIR)/debian/retroshare06/usr/share/icons/hicolor/64x64/apps/retroshare06.png - install -D -m 644 src/data/retroshare.xpm $(CURDIR)/debian/retroshare06/usr/share/pixmaps/retroshare06.xpm + install -D -m 644 src/data/retroshare06.desktop $(CURDIR)/debian/retroshare06/usr/share/applications/retroshare06.desktop + install -D -m 644 src/data/24x24/apps/retroshare06.png $(CURDIR)/debian/retroshare06/usr/share/icons/hicolor/24x24/apps/retroshare06.png + install -D -m 644 src/data/48x48/apps/retroshare06.png $(CURDIR)/debian/retroshare06/usr/share/icons/hicolor/48x48/apps/retroshare06.png + install -D -m 644 src/data/64x64/apps/retroshare06.png $(CURDIR)/debian/retroshare06/usr/share/icons/hicolor/64x64/apps/retroshare06.png + install -D -m 644 src/data/retroshare06.xpm $(CURDIR)/debian/retroshare06/usr/share/pixmaps/retroshare06.xpm install -D -m 644 src/plugins/VOIP/libVOIP.so.1.0.0 $(CURDIR)/debian/retroshare06-voip-plugin/usr/lib/retroshare/extensions6/libVOIP.so install -D -m 644 src/plugins/FeedReader/libFeedReader.so.1.0.0 $(CURDIR)/debian/retroshare06-feedreader-plugin/usr/lib/retroshare/extensions6/libFeedReader.so install -D -m 644 src/libbitdht/src/bitdht/bdboot.txt $(CURDIR)/debian/retroshare06-nogui/usr/share/RetroShare06/bdboot.txt install -D -m 644 src/libbitdht/src/bitdht/bdboot.txt $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/bdboot.txt - install -D -m 755 src/retroshare-nogui/src/retroshare-nogui $(CURDIR)/debian/retroshare06-nogui/usr/bin/RetroShare06-nogui - install -D -m 755 src/retroshare-nogui/src/retroshare-nogui $(CURDIR)/debian/retroshare06/usr/bin/RetroShare06-nogui - install -D -m 755 src/retroshare-gui/src/RetroShare $(CURDIR)/debian/retroshare06/usr/bin/RetroShare06 + install -D -m 755 src/retroshare-nogui/src/RetroShare06-nogui $(CURDIR)/debian/retroshare06-nogui/usr/bin/RetroShare06-nogui + install -D -m 755 src/retroshare-nogui/src/RetroShare06-nogui $(CURDIR)/debian/retroshare06/usr/bin/RetroShare06-nogui + install -D -m 755 src/retroshare-gui/src/RetroShare06 $(CURDIR)/debian/retroshare06/usr/bin/RetroShare06 install -D -m 644 src/libresapi/src/webfiles/JSXTransformer.js $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/JSXTransformer.js install -D -m 644 src/libresapi/src/webfiles/RsApi.js $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/RsApi.js install -D -m 644 src/libresapi/src/webfiles/RsXHRConnection.js $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/RsXHRConnection.js diff --git a/build_scripts/Windows/retroshare.nsi b/build_scripts/Windows/retroshare.nsi index 01b381657..aa27dc1eb 100644 --- a/build_scripts/Windows/retroshare.nsi +++ b/build_scripts/Windows/retroshare.nsi @@ -39,7 +39,7 @@ !endif # Get version from executable -!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\RetroShare.exe" VERSION_ +!GetDllVersion "${RELEASEDIR}\retroshare-gui\src\release\RetroShare06.exe" VERSION_ !define VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD} ;!define REVISION ${VERSION_4} @@ -175,8 +175,8 @@ Section $(Section_Main) Section_Main ; Main binaries SetOutPath "$INSTDIR" - File "${RELEASEDIR}\retroshare-gui\src\release\RetroShare.exe" - File "${RELEASEDIR}\retroshare-nogui\src\release\retroshare-nogui.exe" + File /oname=RetroShare.exe "${RELEASEDIR}\retroshare-gui\src\release\RetroShare06.exe" + File /oname=retroshare-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\RetroShare06-nogui.exe" ; Qt binaries File "${QTDIR}\bin\QtCore4.dll" diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 06c000ab7..88fd60737 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -43,7 +43,7 @@ unfinished { #CONFIG += blogs TEMPLATE = app -TARGET = RetroShare +TARGET = RetroShare06 DEFINES += RS_RELEASE_VERSION RCC_DIR = temp/qrc diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index 7f19ab278..a7a98f275 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -1,5 +1,5 @@ TEMPLATE = app -TARGET = retroshare-nogui +TARGET = RetroShare06-nogui CONFIG += bitdht #CONFIG += introserver #CONFIG += sshserver