mirror of https://github.com/nextcloud/desktop
makes Qt path and openssl path depend on environment variable
provide default value that may work outside our docker build images will get sensible value when run inside our official docker build images Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
parent
f4d9fbc2e7
commit
2ba242527c
|
@ -7,6 +7,8 @@ export EXECUTABLE_NAME=${EXECUTABLE_NAME:-nextcloud}
|
|||
export BUILD_UPDATER=${BUILD_UPDATER:-OFF}
|
||||
export BUILDNR=${BUILDNR:-0000}
|
||||
export DESKTOP_CLIENT_ROOT=${DESKTOP_CLIENT_ROOT:-/home/user}
|
||||
export QT_BASE_DIR=${QT_BASE_DIR:-/usr}
|
||||
export OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR:-/usr/lib/x86_64-linux-gnu}
|
||||
|
||||
# Set defaults
|
||||
export SUFFIX=${DRONE_PULL_REQUEST:=master}
|
||||
|
@ -24,8 +26,8 @@ mkdir build-client
|
|||
cd build-client
|
||||
cmake \
|
||||
-G Ninja \
|
||||
-DCMAKE_PREFIX_PATH=/opt/qt6.6.3 \
|
||||
-DOPENSSL_ROOT_DIR=/usr/local/lib64 \
|
||||
-DCMAKE_PREFIX_PATH=${QT_BASE_DIR} \
|
||||
-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DBUILD_TESTING=OFF \
|
||||
-DBUILD_UPDATER=$BUILD_UPDATER \
|
||||
|
@ -70,7 +72,7 @@ chmod a+x ${APPIMAGE_NAME}
|
|||
rm ./${APPIMAGE_NAME}
|
||||
cp -r ./squashfs-root ./linuxdeploy-squashfs-root
|
||||
|
||||
export LD_LIBRARY_PATH=/app/usr/lib:/opt/qt6.6.3/lib:/usr/local/lib/x86_64-linux-gnu:/usr/local/lib:/usr/local/lib64
|
||||
export LD_LIBRARY_PATH=/app/usr/lib:${QT_BASE_DIR}/lib:/usr/local/lib/x86_64-linux-gnu:/usr/local/lib:/usr/local/lib64
|
||||
./linuxdeploy-squashfs-root/AppRun --desktop-file=${DESKTOP_FILE} --icon-file=usr/share/icons/hicolor/512x512/apps/${APPNAME}.png --executable=usr/bin/${EXECUTABLE_NAME} --appdir=AppDir
|
||||
|
||||
# Use linuxdeploy-plugin-qt to deploy qt dependencies
|
||||
|
@ -81,7 +83,7 @@ chmod a+x ${APPIMAGE_NAME}
|
|||
rm ./${APPIMAGE_NAME}
|
||||
cp -r ./squashfs-root ./linuxdeploy-plugin-qt-squashfs-root
|
||||
|
||||
export PATH=/opt/qt6.6.3/bin:${PATH}
|
||||
export PATH=${QT_BASE_DIR}/bin:${PATH}
|
||||
export QML_SOURCES_PATHS=${DESKTOP_CLIENT_ROOT}/src/gui
|
||||
./linuxdeploy-plugin-qt-squashfs-root/AppRun --appdir=AppDir
|
||||
|
||||
|
|
Loading…
Reference in New Issue