Unify desktop builds. Closes #5406

- Replace Linux and MacOS scripts in `ci/desktop.groovy` with calls to `scripts/create-desktop-package.sh`
- Replace use of `deployment/env` with `.env` to avoid confusion and be coherent with mobile platforms

Author: Pedro Pombeiro

.gitignore

@@ -122,3 +122,19 @@ fastlane/README.md
 
 # Jenkins
 pkg
+
+# Status Desktop
+cmake_install.cmake
+/StatusImPackage/*
+/desktop/bin/*
+/desktop/lib/*
+/desktop/modules/*
+/desktop/Makefile
+/desktop/run-app.sh
+/desktop/CMakeFiles/
+/desktop/CMakeCache.txt
+/desktop/reportApp/Makefile
+/desktop/reportApp/CMakeFiles/*
+/desktop/reportApp/reportApp
+/desktop/reportApp/reportApp_autogen/
+/linuxdeployqt-*.AppImage

Makefile

@@ -29,24 +29,30 @@ HELP_FUN = \
 # Main targets
 
 clean: ##@prepare Remove all output folders
-	git clean -qdxf -f android/ modules/react-native-status/ node_modules/ target/ desktop/modules/ desktop/node_modules/
+	git clean -qdxf -f android/ modules/react-native-status/ node_modules/ target/ desktop/ StatusImPackage/
 
 setup: ##@prepare Install all the requirements for status-react
 	./scripts/setup
 
-prepare: ##@prepare Install dependencies and prepare workspace
+prepare-desktop: ##@prepare Install desktop platform dependencies and prepare workspace
+	scripts/prepare-for-platform.sh desktop
+	npm install
+
+_prepare-mobile: ##@prepare Install mobile platform dependencies and prepare workspace
 	scripts/prepare-for-platform.sh mobile
 	npm install
 
-prepare-ios: prepare ##@prepare Install iOS specific dependencies
+prepare-ios: _prepare-mobile ##@prepare Install and prepare iOS-specific dependencies
 	mvn -f modules/react-native-status/ios/RCTStatus dependency:unpack
 ifeq ($(OS),Darwin)
 	cd ios && pod install
 endif
 
-prepare-android: prepare ##@prepare Install Android specific dependencies
+prepare-android: _prepare-mobile ##@prepare Install and prepare Android-specific dependencies
 	cd android && ./gradlew react-native-android:installArchives
 
+prepare-mobile: prepare-android prepare-ios ##@prepare Install and prepare mobile platform specific dependencies
+
 #----------------
 # Release builds
 #----------------
@@ -58,6 +64,9 @@ release-android: prod-build-android ##@build build release for Android
 release-ios: prod-build-ios ##@build build release for iOS release
 	@echo "Build in XCode, see https://wiki.status.im/TBD for instructions"
 
+release-desktop: prod-build-desktop ##@build build release for desktop release
+	scripts/build-desktop.sh
+
 prod-build:
 	lein prod-build
 
@@ -75,6 +84,10 @@ full-prod-build: ##@build build prod for both Android and iOS
 	rm -r ./modules/react-native-status/ios/RCTStatus/Statusgo.framework/ 2> /dev/null || true
 	rm ./modules/react-native-status/android/libs/status-im/status-go/local/status-go-local.aar 2> /dev/null
 
+prod-build-desktop:
+	git clean -qdxf -f ./index.desktop.js desktop/
+	lein prod-build-desktop
+
 #--------------
 # REPL
 # -------------

ci/Jenkinsfile.linux

@@ -32,6 +32,8 @@ pipeline {
     LC_ALL = 'en_US.UTF-8'
     NPM_CONFIG_CACHE = '/var/tmp/npm'
     LEIN_HOME = '/var/tmp/lein'
+    QT_PATH = '/opt/qt59'
+    STATUSIM_APPIMAGE = '/opt/StatusImAppImage.zip'
   }
 
   stages {
@@ -53,7 +55,7 @@ pipeline {
     }
     stage('Compile') {
       steps {
-        script { desktop.compileLinux() }
+        script { desktop.compile() }
       }
     }
     stage('Bundle') {

ci/Jenkinsfile.macos

@@ -13,6 +13,8 @@ pipeline {
     LANG = 'en_US.UTF-8'
     LANGUAGE = 'en_US.UTF-8'
     LC_ALL = 'en_US.UTF-8'
+    QT_PATH = '/Users/administrator/qt/5.9.1'
+    PATH = "${env.QT_PATH}/clang_64/bin:${env.PATH}"
   }
 
   stages {
@@ -33,7 +35,7 @@ pipeline {
     }
     stage('Compile') {
       steps {
-        script { desktop.compileMacOS() }
+        script { desktop.compile() }
       }
     }
     stage('Bundle') {

ci/desktop.groovy

@@ -1,29 +1,8 @@
 common = load 'ci/common.groovy'
 
-qtBin = '/opt/qt59/bin'
 packageFolder = './StatusImPackage'
-external_modules_dir = [
-  'node_modules/react-native-i18n/desktop',
-  'node_modules/react-native-config/desktop',
-  'node_modules/react-native-fs/desktop',
-  'node_modules/react-native-http-bridge/desktop',
-  'node_modules/react-native-webview-bridge/desktop',
-  'node_modules/react-native-keychain/desktop',
-  'node_modules/react-native-securerandom/desktop',
-  'modules/react-native-status/desktop',
-  'node_modules/google-breakpad',
-]
-
-external_fonts = [
-  '../../../../../resources/fonts/SF-Pro-Text-Regular.otf',
-  '../../../../../resources/fonts/SF-Pro-Text-Medium.otf',
-  '../../../../../resources/fonts/SF-Pro-Text-Light.otf',
-]
 
 def cleanupBuild() {
-  sh """
-    rm -rf ${packageFolder}
-  """
   sh 'make clean'
 }
 
@@ -43,16 +22,8 @@ def slackNotify(message, color = 'good') {
 }
 
 def buildClojureScript() {
-  sh 'rm -f index.desktop.js'
-  sh 'lein prod-build-desktop'
-  sh "mkdir ${packageFolder}"
-  sh """
-    react-native bundle \\
-      --entry-file index.desktop.js \\
-      --dev false --platform desktop \\
-      --bundle-output ${packageFolder}/StatusIm.jsbundle \\
-      --assets-dest ${packageFolder}/assets
-  """
+  sh 'make prod-build-desktop'
+  sh './scripts/build-desktop.sh buildClojureScript'
 }
 
 def uploadArtifact(filename) {
@@ -85,121 +56,25 @@ def prepDeps() {
   cleanupAndDeps()
 }
 
-def compileLinux() {
-  dir('desktop') {
-    sh 'rm -rf CMakeFiles CMakeCache.txt cmake_install.cmake Makefile'
-    sh """
-      cmake -Wno-dev \\
-        -DCMAKE_BUILD_TYPE=Release \\
-        -DEXTERNAL_MODULES_DIR='${external_modules_dir.join(";")}' \\
-        -DDESKTOP_FONTS='${external_fonts.join(";")}' \\
-        -DJS_BUNDLE_PATH='${workspace}/${packageFolder}/StatusIm.jsbundle' \\
-        -DCMAKE_CXX_FLAGS:='-DBUILD_FOR_BUNDLE=1'
-    """
-    sh 'make'
-  }
+def compile() {
+  sh './scripts/build-desktop.sh compile'
 }
 
 def bundleLinux(type = 'nightly') {
   def pkg
 
+  sh './scripts/build-desktop.sh bundle'
   dir(packageFolder) {
-    sh 'rm -rf StatusImAppImage'
-    /* TODO this needs to be fixed: status-react/issues/5378 */
-    sh 'cp /opt/StatusImAppImage.zip ./'
-    sh 'unzip ./StatusImAppImage.zip'
-    sh 'rm -rf AppDir'
-    sh 'mkdir AppDir'
-  }
-  sh "cp -r ./deployment/linux/usr  ${packageFolder}/AppDir"
-  sh "cp ./deployment/env  ${packageFolder}/AppDir/usr/bin"
-  sh "cp ./desktop/bin/StatusIm ${packageFolder}/AppDir/usr/bin"
-  sh "cp ./desktop/reportApp/reportApp ${packageFolder}/AppDir/usr/bin"
-  sh 'wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage'
-  sh 'chmod a+x ./linuxdeployqt-continuous-x86_64.AppImage'
-
-  sh 'rm -f Application-x86_64.AppImage'
-  sh 'rm -f StatusIm-x86_64.AppImage'
-
-  sh "ldd ${packageFolder}/AppDir/usr/bin/StatusIm"
-  sh """
-    ./linuxdeployqt-continuous-x86_64.AppImage  \\
-    ${packageFolder}/AppDir/usr/bin/reportApp \\
-    -verbose=3 -always-overwrite -no-strip -no-translations -qmake=${qtBin}/qmake \\
-    -qmldir='${workspace}/desktop/reportApp'
-  """
-  sh """
-    ./linuxdeployqt-continuous-x86_64.AppImage \\
-      ${packageFolder}/AppDir/usr/share/applications/StatusIm.desktop \\
-      -verbose=3 -always-overwrite -no-strip \\
-      -no-translations -bundle-non-qt-libs \\
-      -qmake=${qtBin}/qmake \\
-      -extra-plugins=imageformats/libqsvg.so \\
-      -qmldir='${workspace}/node_modules/react-native'
-  """
-  dir(packageFolder) {
-    sh 'ldd AppDir/usr/bin/StatusIm'
-    sh 'cp -r assets/share/assets AppDir/usr/bin'
-    sh 'cp -rf StatusImAppImage/* AppDir/usr/bin'
-    sh 'rm -f AppDir/usr/bin/StatusIm.AppImage'
-  }
-  sh """
-    ./linuxdeployqt-continuous-x86_64.AppImage \\
-    ${packageFolder}/AppDir/usr/share/applications/StatusIm.desktop \\
-    -verbose=3 -appimage -qmake=${qtBin}/qmake
-  """
-  dir(packageFolder) {
-    sh 'ldd AppDir/usr/bin/StatusIm'
-    sh 'rm -rf StatusIm.AppImage'
     pkg = common.pkgFilename(type, 'AppImage')
     sh "mv ../StatusIm-x86_64.AppImage ${pkg}"
   }
   return "${packageFolder}/${pkg}".drop(2)
 }
 
-def compileMacOS() {
-  /* add path for QT installation binaries */
-  env.PATH = "/Users/administrator/qt/5.9.1/clang_64/bin:${env.PATH}"
-  dir('desktop') {
-    sh 'rm -rf CMakeFiles CMakeCache.txt cmake_install.cmake Makefile'
-    sh """
-      cmake -Wno-dev \\
-        -DCMAKE_BUILD_TYPE=Release \\
-        -DEXTERNAL_MODULES_DIR='${external_modules_dir.join(";")}' \\
-        -DDESKTOP_FONTS='${external_fonts.join(";")}' \\
-        -DJS_BUNDLE_PATH='${workspace}/${packageFolder}/StatusIm.jsbundle' \\
-        -DCMAKE_CXX_FLAGS:='-DBUILD_FOR_BUNDLE=1'
-    """
-    sh 'make'
-  }
-}
-
 def bundleMacOS(type = 'nightly') {
   def pkg = common.pkgFilename(type, 'dmg')
+  sh './scripts/build-desktop.sh bundle'
   dir(packageFolder) {
-    sh 'curl -L -O "https://github.com/status-im/StatusAppFiles/raw/PR5702/Status.app.zip"'
-    sh 'unzip Status.app.zip'
-    sh 'cp -r assets/share/assets Status.app/Contents/Resources'
-    sh 'ln -sf ../Resources/assets ../Resources/ubuntu-server ../Resources/node_modules ' +
-            'Status.app/Contents/MacOS'
-    sh 'chmod +x Status.app/Contents/Resources/ubuntu-server'
-    sh 'cp ../desktop/bin/StatusIm Status.app/Contents/MacOS/Status'
-    sh 'cp ../desktop/reportApp/reportApp Status.app/Contents/MacOS'
-    sh "cp ../deployment/env  Status.app/Contents/Resources"
-    sh 'ln -sf ../Resources/env Status.app/Contents/MacOS/env'
-    sh 'cp -f ../deployment/macos/qt-reportApp.conf Status.app/Contents/Resources'
-    sh 'ln -sf ../Resources/qt-reportApp.conf Status.app/Contents/MacOS/qt.conf'
-    sh 'install_name_tool -add_rpath "@executable_path/../Frameworks" ' +
-            '-delete_rpath "/Users/administrator/qt/5.9.1/clang_64/lib" ' +
-            'Status.app/Contents/MacOS/reportApp'
-    sh 'cp -f ../deployment/macos/Info.plist Status.app/Contents'
-    sh 'cp -f ../deployment/macos/status-icon.icns Status.app/Contents/Resources'
-    sh """
-      macdeployqt Status.app -verbose=1 \\
-        -qmldir='${workspace}/node_modules/react-native/ReactQt/runtime/src/qml/'
-    """
-    sh 'rm -f Status.app.zip'
-
     withCredentials([
       string(credentialsId: 'desktop-gpg-outer-pass', variable: 'GPG_PASS_OUTER'),
       string(credentialsId: 'desktop-gpg-inner-pass', variable: 'GPG_PASS_INNER'),

deployment/env

@@ -16,11 +16,7 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9")
 message(STATUS "EXTERNAL_MODULES_DIR: ${EXTERNAL_MODULES_DIR}")
 
 string(REGEX MATCH "BUILD_FOR_BUNDLE" BUILD_FOR_BUNDLE "${CMAKE_CXX_FLAGS}")
-if(${BUILD_FOR_BUNDLE} MATCHES "BUILD_FOR_BUNDLE")
-  set(ENVFILE "/env")
-else()
-  set(ENVFILE "/../../.env")
-endif()
+set(ENVFILE "/../../.env")
 
 foreach(external_module ${EXTERNAL_MODULES_DIR})
   message(STATUS "external_module: ${external_module}")