tine20drive-6.0.0 configs

Author: ccheng-dev

.craft.ini

@@ -44,6 +44,7 @@ Packager/UseCache = ${Variables:UseCache}
 Packager/CreateCache = ${Variables:CreateCache}
 Packager/CacheVersion = ${Variables:ownCloudVersion}/Qt_${Variables:QtVersion}_${Variables:CachePatchLvl}
 Packager/PackageDebugSymbols = False
+;Packager/PackageType = MacPkgPackager
 ; Packager/RepositoryUrl = https://files.kde.org/craft/
 Packager/RepositoryUrl =  https://download.owncloud.com/desktop/craft/cache/
 Compile/BuildType = RelWithDebInfo
@@ -52,9 +53,15 @@ ContinuousIntegration/UpdateRepository = True
 CodeSigning/Enabled = ${Env:SIGN_PACKAGE}
 CodeSigning/Protected = True
 CodeSigning/Certificate = ${Env:CRAFT_CODESIGN_CERTIFICATE}
-CodeSigning/CommonName =
-CodeSigning/MacDeveloperId = ownCloud GmbH (4AP2STM4H5)
-CodeSigning/MacKeychainPath = sign-${Env:DRONE_BUILD_NUMBER}.keychain
+CodeSigning/CommonName = com.tine20.desktopclient
+CodeSigning/MacDeveloperId = Metaways Infosystems GmbH (TC62G4GBN8)
+CodeSigning/Country = DE
+CodeSigning/Organization = Metaways Infosystems GmbH
+CodeSigning/State = Hamburg
+CodeSigning/MacCertificateApplication = /Users/ccheng/packaging-tinedrive/DeveloperID.p12
+CodeSigning/MacCertificateInstaller = /Users/ccheng/packaging-tinedrive/installerCertificates.p12
+
+# CodeSigning/MacKeychainPath = signing_temp.keychain
 
 [BlueprintSettings]
 # skip msys in normal builds its only needed for the cache
@@ -72,24 +79,24 @@ qt-libs/qtkeychain.buildWithQt6 = True
 [windows-cl-msvc2022-x86_64]
 General/ABI = windows-cl-msvc2022-x86_64
 
-[windows-cl-msvc2022-x86_64-debug]
-General/ABI = windows-cl-msvc2022-x86_64
-Compile/BuildType = Debug
+;[windows-cl-msvc2022-x86_64-debug]
+;General/ABI = windows-cl-msvc2022-x86_64
+;Compile/BuildType = Debug
 
 [macos-64-clang]
 General/ABI = macos-64-clang
-# Packager/PackageType = MacPkgPackager
+;Packager/PackageType = MacPkgPackager
 
-[macos-64-clang-debug]
-General/ABI = macos-64-clang
-Compile/BuildType = Debug
+;[macos-64-clang-debug]
+;General/ABI = macos-64-clang
+;Compile/BuildType = Debug
 
-[macos-clang-arm64]
-General/ABI = macos-clang-arm64
+;[macos-clang-arm64]
+;General/ABI = macos-clang-arm64
 
-[macos-clang-arm64-debug]
-General/ABI = macos-clang-arm64
-Compile/BuildType = Debug
+;[macos-clang-arm64-debug]
+;General/ABI = macos-clang-arm64
+;Compile/BuildType = Debug
 
 [linux-64-gcc]
 General/ABI = linux-64-gcc
@@ -99,9 +106,9 @@ libs/dbus.ignored = False
 libs/icu.ignored = False
 libs/qt6/qtbase.withDBus = True
 
-[linux-64-gcc-debug]
-General/ABI = linux-64-gcc
-Compile/BuildType = Debug
+;[linux-64-gcc-debug]
+;General/ABI = linux-64-gcc
+;Compile/BuildType = Debug
 
 [linux-64-gcc-debug-BlueprintSettings]
 libs/dbus.ignored = False
@@ -120,7 +127,7 @@ libs/qt6/qtbase.withDBus = True
 
 [Env]
 CRAFT_CODESIGN_CERTIFICATE =
-SIGN_PACKAGE = False
+SIGN_PACKAGE = false
 # double fallback
 DRONE_BUILD_NUMBER = ${Env:APPVEYOR_BUILD_NUMBER}
 APPVEYOR_BUILD_NUMBER = 0

.craft.shelf

@@ -1,6 +1,6 @@
 [General]
 version = 2
-blueprintrepositories = https://invent.kde.org/packaging/craft-blueprints-kde.git|master|;https://github.com/owncloud/craft-blueprints-owncloud.git|6|
+blueprintrepositories = https://invent.kde.org/packaging/craft-blueprints-kde.git|master|;https://github.com/tine20/craft-blueprints-tineDrive.git|6.0.0-tineDrive|
 
 [core/cacert]
 version = 2023-12-12
@@ -9,9 +9,9 @@ version = 2023-12-12
 version = master
 revision = 4a6f0200
 
-[craft/craft-blueprints-owncloud]
-version = 6
-revision = ba6feae525ff8f7115b9a094d2b574e2b21221dd
+[craft/craft-blueprints-tineDrive]
+version = 6.0.0-tineDrive
+revision = 0de8b2769bf4642d27bc745a2da710acb3e9e2ba
 
 [craft/craft-core]
 version = master

.github/release_template_MW.md

@@ -0,0 +1,14 @@
+### The packages we provide :
+- MacOS version with .pkg format (see the assets below)
+- Windows version with .exe format (see the assets below)
+
+## Changelog
+
+### Features
+---
+
+
+
+### Bug fix
+
+---

.github/workflows/main.yml

@@ -1,12 +1,6 @@
-name: ownCloud CI
+name: tineDrive CI
 
-on:
-  push:
-    branches:
-      - master
-      - '[0-9]+'
-  pull_request:
-  workflow_dispatch:
+on: [push]
 
 concurrency: 
   group: ${{ github.head_ref || github.run_id }}
@@ -97,8 +91,8 @@ jobs:
     - name: Prepare
       run: |
         New-Item -ItemType Directory "${env:GITHUB_WORKSPACE}/binaries/"
-        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set forceAsserts=true owncloud/owncloud-client
-        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set srcDir="${env:GITHUB_WORKSPACE}" owncloud/owncloud-client
+        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set forceAsserts=true tineDrive/tineDrive-client
+        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set srcDir="${env:GITHUB_WORKSPACE}" tineDrive/tineDrive-client
         if ($IsWindows) {
             & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c dev-utils/nsis
         } elseif($IsLinux) {
@@ -109,11 +103,11 @@ jobs:
       run: |
           if ("${{ matrix.target }}" -eq "linux-64-gcc" ) {
               # build with appimage updater and others
-              & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableAppImageUpdater=true owncloud-client
-              & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableCrashReporter=true owncloud/owncloud-client
-              & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableAutoUpdater=true owncloud/owncloud-client
+              & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableAppImageUpdater=true tineDrive-client
+              & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableCrashReporter=true tineDrive/tineDrive-client
+              & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableAutoUpdater=true tineDrive/tineDrive-client
           }
-          & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --install-deps owncloud/owncloud-client
+          & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --install-deps tineDrive/tineDrive-client
 
     - name: QML format lint
       if: matrix.name  == 'linux-gcc-x86_64'
@@ -144,45 +138,45 @@ jobs:
             # https://api.kde.org/ecm/module/ECMEnableSanitizers.html
             # address;leak;undefined
             # clang: error: unsupported option '-fsanitize=leak' for target 'x86_64-apple-darwin21.6.0'
-            & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set args="-DECM_ENABLE_SANITIZERS='address;undefined'" owncloud/owncloud-client
+            & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set args="-DECM_ENABLE_SANITIZERS='address;undefined'" tineDrive/tineDrive-client
         }
         if ("${{ matrix.target }}" -eq "linux-64-gcc" ) {
             # build with appimage updater and others
-            & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableAppImageUpdater=true owncloud-client
-            & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableCrashReporter=true owncloud/owncloud-client
-            & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableAutoUpdater=true owncloud/owncloud-client
+            & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableAppImageUpdater=true tineDrive-client
+            & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableCrashReporter=true tineDrive/tineDrive-client
+            & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableAutoUpdater=true tineDrive/tineDrive-client
         }
-        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache owncloud/owncloud-client
+        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache tineDrive/tineDrive-client
 
     - name: Build for SonarCloud
       if: ${{ matrix.useSonarCloud }}
       run: |
-        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --configure owncloud/owncloud-client
-        $env:BUILD_DIR = $(& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --get buildDir -q owncloud-client)
+        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --configure tineDrive/tineDrive-client
+        $env:BUILD_DIR = $(& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --get buildDir -q tineDrive-client)
         & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --run pwsh "${env:GITHUB_WORKSPACE}/.github/workflows/.sonar.ps1" --build
-        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --install --qmerge owncloud/owncloud-client
+        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --install --qmerge tineDrive/tineDrive-client
         & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --run pwsh "${env:GITHUB_WORKSPACE}/.github/workflows/.sonar.ps1" --analyze
 
     - name: Run tests
       run: |
-        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --test owncloud/owncloud-client
+        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --test tineDrive/tineDrive-client
 
     - name: Clang tidy
       if: github.event_name != 'pull_request'
       run: |
         & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c libs/llvm python-modules/pip
         & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --run python3 -m pip install clang-html
-        $env:BUILD_DIR = $(& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --get buildDir -q owncloud-client)
+        $env:BUILD_DIR = $(& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --get buildDir -q tineDrive-client)
         & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --run pwsh "${env:GITHUB_WORKSPACE}/.github/workflows/.run-clang-tidy.ps1"
         & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --run python3 -m clang_html "${env:TMPDIR}/clang-tidy.log" -o "${env:GITHUB_WORKSPACE}/binaries/clang-tidy.html"
 
     - name: Package
       run: |
         if ("${{ matrix.target }}" -eq "linux-64-gcc" ) {
             # package without crash reporter
-            & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableCrashReporter=false owncloud/owncloud-client
+            & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableCrashReporter=false tineDrive/tineDrive-client
         }
-        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --package owncloud/owncloud-client
+        & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --no-cache --package tineDrive/tineDrive-client
 
     - name: Prepare artifacts
       run: |

admin/osx/craft_build_local.sh

@@ -0,0 +1,17 @@
+
+app_name=@APPLICATION_SHORTNAME@
+github_repo_dir="/Users/ccheng/$app_name/"
+
+cd 
+
+git clone --depth=1 https://invent.kde.org/kde/craftmaster.git CraftMaster/CraftMaster
+
+python3 CraftMaster/CraftMaster/CraftMaster.py --config "./$app_name/.craft.ini" --variables "WORKSPACE=$github_repo_dir"
+
+python3 CraftMaster/macos-64-clang/craft/bin/craft.py --unshelve "$github_repo_dir.craft.shelf"
+
+python3 CraftMaster/macos-64-clang/craft/bin/craft.py --install-deps $app_name
+# make sure remove owap before build
+python3 CraftMaster/macos-64-clang/craft/bin/craft.py --no-cache --src-dir "$github_repo_dir" $app_name
+# need to create complete app first 
+sudo python3 CraftMaster/macos-64-clang/craft/bin/craft.py --no-cache --src-dir "$github_repo_dir" --package "$app_name"

admin/osx/create_mac.sh

@@ -0,0 +1,124 @@
+#!/bin/bash
+
+# Script to create the Mac installer using the packages tool from
+# http://s.sudre.free.fr/Software/Packages/about.html
+#
+
+[ "$#" -lt 2 ] && echo "Usage: create_mac_pkg.sh <CMAKE_INSTALL_DIR> <build dir> <installer sign identity> <APPLE_ID_MAIL> <APPLE_APP_PASSWORD> <ASC_PROVIDER>" && exit
+
+# the path of installation must be given as parameter
+if [ -z "$1" ]; then
+  echo "ERROR: Provide the path to CMAKE_INSTALL_DIR to this script as first parameter."
+  exit 1
+fi
+
+if [ -z "$2" ]; then
+  echo "ERROR: Provide the path to build directory as second parameter."
+  exit 1
+fi
+
+
+if [ -z "$4" ]; then
+  echo "ERROR: Provide the apple developer account , ex: [email protected]"
+  exit 1
+fi
+
+if [ -z "$5" ]; then
+  echo "ERROR: Provide the app password generated from apple website."
+  exit 1
+fi
+
+if [ -z "$6" ]; then
+  echo "ERROR: Provide the  provider ID with 10 characters, ex: A1B3H5J6K7."
+  exit 1
+fi
+
+install_path="$1"
+build_path="$2"
+identity="$3"
+apple_id="$4"
+apple_app_password="$5"
+provider="$6"
+
+prjfile=$build_path/admin/osx/macosx.pkgproj
+
+# The name of the installer package
+installer="tineDrive-2.7.6"
+installer_file="$installer.pkg"
+installer_file_tar="$installer.pkg.tar"
+installer_file_tar_bz2="$installer.pkg.tar.bz2"
+installer_file_tbz="$installer.pkg.tbz"
+
+# set the installer name to the copied prj config file
+/usr/local/bin/packagesutil --file $prjfile set project name "$installer"
+
+# The command line tool of the "Packages" tool, see link above.
+pkgbuild=/usr/local/bin/packagesbuild
+
+$pkgbuild -F $install_path $prjfile
+rc=$?
+
+if [ $rc == 0 ]; then
+  cp /Users/runner/work/tineDrive/tineDrive/CraftMaster/macos-64-clang/*.pkg $install_path/
+  echo "Successfully created $installer_file"
+else
+  echo "Failed to create $installer_file"
+  exit 3
+fi
+
+# Sign the finished package if desired.
+if [ ! -z "$identity" ]; then
+	echo "Will try to sign the installer"
+	pushd $install_path
+	productsign --sign "$identity" "$installer_file" "$installer_file.new"
+	mv "$installer_file".new "$installer_file"
+	popd
+else
+	echo "No certificate given, will not sign the pkg"
+fi
+
+# FIXME: OEMs?
+# they will need to do their own signing..
+
+cd $install_path
+rc=$?
+if [ $rc == 0 ]; then
+  echo "Successfully created $installer_file"
+else
+  echo "Failed to create $installer_file"
+  exit 3
+fi
+
+cd $install_path
+
+xcrun altool --notarize-app --primary-bundle-id "com.tine20.desktopclient" --username "$apple_id" --password "$apple_app_password" --asc-provider "$provider" --file "$installer_file" &> tmp
+uuid=`cat tmp | grep -Eo '\\w{8}-(\\w{4}-){3}\\w{12}$'`
+while true; do
+    echo "checking for notarization..."
+    xcrun altool --notarization-info "$uuid" --username "$apple_id" --password "$apple_app_password" &> tmp
+    r=`cat tmp`
+    t=`echo "$r" | grep "success"`
+    f=`echo "$r" | grep "invalid"`
+    p=`echo "$r" | grep "in progess"`
+    if [[ "$t" != "" ]]; then
+        echo "notarization done!"
+        xcrun stapler staple "$installer_file"
+        echo "stapler done!"
+        spctl -a -v --type install "$installer_file"
+        break
+    fi
+    if [[ "$f" != "" ]]; then
+        echo "$r"
+        return 1
+    fi
+    if [[ "$p" != "" ]]; then
+        echo "in progess"
+    fi
+   echo "not finish yet, sleep 30sec then check again..."
+   sleep 30
+done
+
+# Sparkle wants a tbz, it cannot install raw pkg
+tar cf "$installer_file_tar" "$installer_file"
+bzip2 -9 "$installer_file_tar"
+mv "$installer_file_tar_bz2" "$installer_file_tbz"