Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make file names consistent with packaging

Browse Source 
Rename executables:
RetroShare -> RetroShare06
retroshare-nogui -> RetroShare06-nogui

Add 06 suffix to icons and desktop file

Update README, debian rules and windows installer file
This commit is contained in:
AsamK 2015-08-23 11:13:55 +02:00
parent 91e19fc61e
commit 5ae5d76ffc
12 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -37,14 +37,18 @@ Compilation on Linux
3. Compile 3. Compile
```bash ```bash
cd trunk cd trunk
qmake CONFIG=debug qmake CONFIG=debug PREFIX=/usr
make make
``` ```
The executables produced will be: 4. Install
```bash
sudo make install
```
trunk/retroshare-gui/src/RetroShare The executables produced will be:
trunk/retroshare-nogui/src/retroshare-nogui /usr/bin/RetroShare06
/usr/bin/RetroShare06-nogui
If libsqlcipher is not available as a package If libsqlcipher is not available as a package
--------------------------------------------- ---------------------------------------------

21
RetroShare.pro
View File

@ -18,24 +18,19 @@ unix {
isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" } isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" }
isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/RetroShare06" } isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/RetroShare06" }
icon_24_files.path = "$${PREFIX}/share/icons/hicolor/24x24/apps" icon_files.path = "$${PREFIX}/share/icons/hicolor"
icon_24_files.files = build_scripts/Debian+Ubuntu/data/24x24/* icon_files.files = build_scripts/Debian+Ubuntu/data/24x24
INSTALLS += icon_24_files icon_files.files += build_scripts/Debian+Ubuntu/data/48x48
icon_files.files += build_scripts/Debian+Ubuntu/data/64x64
icon_48_files.path = "$${PREFIX}/share/icons/hicolor/48x48/apps" icon_files.files += build_scripts/Debian+Ubuntu/data/128x128
icon_48_files.files = build_scripts/Debian+Ubuntu/data/48x48/* INSTALLS += icon_files
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
desktop_files.path = "$${PREFIX}/share/applications" 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 INSTALLS += desktop_files
pixmap_files.path = "$${PREFIX}/share/pixmaps" 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 INSTALLS += pixmap_files
data_files.path = "$${DATA_DIR}" data_files.path = "$${DATA_DIR}"

0
build_scripts/Debian+Ubuntu/data/retroshare.png → build_scripts/Debian+Ubuntu/data/128x128/apps/retroshare06.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

0
build_scripts/Debian+Ubuntu/data/24x24/retroshare.png → build_scripts/Debian+Ubuntu/data/24x24/apps/retroshare06.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
build_scripts/Debian+Ubuntu/data/48x48/retroshare.png → build_scripts/Debian+Ubuntu/data/48x48/apps/retroshare06.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

0
build_scripts/Debian+Ubuntu/data/64x64/retroshare.png → build_scripts/Debian+Ubuntu/data/64x64/apps/retroshare06.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

0
build_scripts/Debian+Ubuntu/data/retroshare.desktop → build_scripts/Debian+Ubuntu/data/retroshare06.desktop
View File

0
build_scripts/Debian+Ubuntu/data/retroshare.xpm → build_scripts/Debian+Ubuntu/data/retroshare06.xpm
View File

16
build_scripts/Debian+Ubuntu/debian/rules
View File

@ -33,18 +33,18 @@ install: build
dh_testroot dh_testroot
dh_clean -k dh_clean -k
dh_installdirs dh_installdirs
install -D -m 644 src/data/retroshare.desktop $(CURDIR)/debian/retroshare06/usr/share/applications/retroshare06.desktop install -D -m 644 src/data/retroshare06.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/24x24/apps/retroshare06.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/48x48/apps/retroshare06.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/64x64/apps/retroshare06.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.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/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/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-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 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/RetroShare06-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-nogui/src/RetroShare06-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-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/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/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 install -D -m 644 src/libresapi/src/webfiles/RsXHRConnection.js $(CURDIR)/debian/retroshare06/usr/share/RetroShare06/webui/RsXHRConnection.js

6
build_scripts/Windows/retroshare.nsi
View File

@ -39,7 +39,7 @@
!endif !endif
# Get version from executable # 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 VERSION ${VERSION_1}.${VERSION_2}.${VERSION_3}${BUILDADD}
;!define REVISION ${VERSION_4} ;!define REVISION ${VERSION_4}
@ -175,8 +175,8 @@ Section $(Section_Main) Section_Main
; Main binaries ; Main binaries
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File "${RELEASEDIR}\retroshare-gui\src\release\RetroShare.exe" File /oname=RetroShare.exe "${RELEASEDIR}\retroshare-gui\src\release\RetroShare06.exe"
File "${RELEASEDIR}\retroshare-nogui\src\release\retroshare-nogui.exe" File /oname=retroshare-nogui.exe "${RELEASEDIR}\retroshare-nogui\src\release\RetroShare06-nogui.exe"
; Qt binaries ; Qt binaries
File "${QTDIR}\bin\QtCore4.dll" File "${QTDIR}\bin\QtCore4.dll"

2
retroshare-gui/src/retroshare-gui.pro
View File

@ -43,7 +43,7 @@ unfinished {
#CONFIG += blogs #CONFIG += blogs
TEMPLATE = app TEMPLATE = app
TARGET = RetroShare TARGET = RetroShare06
DEFINES += RS_RELEASE_VERSION DEFINES += RS_RELEASE_VERSION
RCC_DIR = temp/qrc RCC_DIR = temp/qrc

2
retroshare-nogui/src/retroshare-nogui.pro
View File

@ -1,5 +1,5 @@
TEMPLATE = app TEMPLATE = app
TARGET = retroshare-nogui TARGET = RetroShare06-nogui
CONFIG += bitdht CONFIG += bitdht
#CONFIG += introserver #CONFIG += introserver
#CONFIG += sshserver #CONFIG += sshserver