status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor changes in `build-desktop.sh`

This commit is contained in:
Pedro Pombeiro 2019-02-20 15:05:12 +01:00
parent 1c7eaf1b76
commit 9f9fae62a8
No known key found for this signature in database
GPG Key ID: A65DEB11E4BBC647
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desktop/reportApp/CMakeLists.txt
View File

@ -8,8 +8,6 @@
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
set(APP_NAME "reportApp") set(APP_NAME "reportApp")

8
scripts/build-desktop.sh
View File

@ -62,7 +62,7 @@ function is_windows_target() {
function joinPath() { function joinPath() {
if program_exists 'realpath'; then if program_exists 'realpath'; then
realpath -m "$1/$2" realpath -m "$1/$2" 2> /dev/null
else else
echo "$1/$2" | tr -s / echo "$1/$2" | tr -s /
fi fi
@ -70,7 +70,7 @@ function joinPath() {
function joinExistingPath() { function joinExistingPath() {
if program_exists 'realpath'; then if program_exists 'realpath'; then
realpath "$1/$2" realpath "$1/$2" 2> /dev/null
else else
echo "$1/$2" | tr -s / echo "$1/$2" | tr -s /
fi fi
@ -306,7 +306,6 @@ function bundleLinux() {
[ $VERBOSE_LEVEL -ge 1 ] && ldd $(joinExistingPath "$usrBinPath" 'Status') [ $VERBOSE_LEVEL -ge 1 ] && ldd $(joinExistingPath "$usrBinPath" 'Status')
desktopFilePath="$(joinExistingPath "$WORKFOLDER" 'AppDir/usr/share/applications/Status.desktop')" desktopFilePath="$(joinExistingPath "$WORKFOLDER" 'AppDir/usr/share/applications/Status.desktop')"
pushd $WORKFOLDER pushd $WORKFOLDER
[ $VERBOSE_LEVEL -ge 1 ] && ldd $usrBinPath/Status
cp -r assets/share/assets $usrBinPath cp -r assets/share/assets $usrBinPath
cp -rf StatusImAppImage/* $usrBinPath cp -rf StatusImAppImage/* $usrBinPath
rm -f $usrBinPath/Status.AppImage rm -f $usrBinPath/Status.AppImage
@ -319,12 +318,11 @@ function bundleLinux() {
-qmake="$qmakePath" \ -qmake="$qmakePath" \
-executable="$(joinExistingPath "$usrBinPath" 'reportApp')" \ -executable="$(joinExistingPath "$usrBinPath" 'reportApp')" \
-qmldir="$(joinExistingPath "$STATUSREACTPATH" 'node_modules/react-native')" \ -qmldir="$(joinExistingPath "$STATUSREACTPATH" 'node_modules/react-native')" \
-qmldir="$STATUSREACTPATH/desktop/reportApp" \ -qmldir="$(joinExistingPath "$STATUSREACTPATH" 'desktop/reportApp')" \
-extra-plugins=imageformats/libqsvg.so \ -extra-plugins=imageformats/libqsvg.so \
-appimage -appimage
pushd $WORKFOLDER pushd $WORKFOLDER
[ $VERBOSE_LEVEL -ge 1 ] && ldd $usrBinPath/Status
rm -f $usrBinPath/Status.AppImage rm -f $usrBinPath/Status.AppImage
$APPIMAGETOOL ./AppDir $APPIMAGETOOL ./AppDir
[ $VERBOSE_LEVEL -ge 1 ] && ldd $usrBinPath/Status [ $VERBOSE_LEVEL -ge 1 ] && ldd $usrBinPath/Status