Generate build-id.txt + Removed CMake options in CMakePlugin + Refactored TaskFunctions.writeToFile

Author: vkryl

.gitignore

@@ -8,6 +8,8 @@ build
 .externalNativeBuild
 obj
 
+build-id.txt
+
 *.apk
 *.iml
 

app/jni/CMakeLists.txt

@@ -10,7 +10,8 @@ include("${CMAKE_HOME_DIRECTORY}/cmake/Join.cmake")
 
 set(THIRDPARTY_DIR "${CMAKE_HOME_DIRECTORY}/third_party")
 set(STUB_DIR "${CMAKE_HOME_DIRECTORY}/stub")
-set(TDLIB_DIR "${CMAKE_HOME_DIRECTORY}/../../tdlib")
+set(TGX_ROOT_DIR "${CMAKE_HOME_DIRECTORY}/../..")
+set(TDLIB_DIR "${TGX_ROOT_DIR}/tdlib")
 set(UTILS_DIR "${THIRDPARTY_DIR}/jni-utils")
 
 set(SSL_DIR "${THIRDPARTY_DIR}/openssl/android_static/${ANDROID_ABI}")
@@ -61,6 +62,7 @@ set(ORIGINAL_CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS}")
 set(ADD_COMMON_FLAGS
   -w -Werror=return-type
 )
+
 if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
   set(CMAKE_C_VISIBILITY_PRESET hidden)
   set(CMAKE_CXX_VISIBILITY_PRESET hidden)
@@ -91,6 +93,17 @@ foreach(lang C CXX)
   set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} ${ADD_${lang}_FLAGS}")
 endforeach()
 
+set(CMAKE_SKIP_RPATH ON)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+
+file(READ "${TGX_ROOT_DIR}/build-id.txt" TGX_BUILD_ID)
+string(LENGTH "${TGX_BUILD_ID}" TGX_BUILD_ID_LENGTH)
+
+if(${TGX_BUILD_ID_LENGTH} EQUAL 0)
+  message(FATAL_ERROR "Build-Id is empty or doesn't exist, check: ${TGX_ROOT_DIR}/build-id.txt")
+endif()
+
+
 set(ADD_LINKER_FLAGS
   -Wl,--gc-sections,--icf=safe
   -Wl,--build-id=none

buildSrc/src/main/kotlin/me/vkryl/plugin/CMakePlugin.kt

@@ -33,12 +33,7 @@ open class CMakePlugin : Plugin<Project> {
             cmake {
               arguments(
                 "-DANDROID_STL=c++_shared",
-                "-DANDROID_PLATFORM=android-${Config.MIN_SDK_VERSION}",
-                "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON",
-                "-DCMAKE_SKIP_RPATH=ON",
-                "-DCMAKE_C_VISIBILITY_PRESET=hidden",
-                "-DCMAKE_CXX_VISIBILITY_PRESET=hidden",
-                "-DCMAKE_BUILD_PARALLEL_LEVEL=${Runtime.getRuntime().availableProcessors()}"
+                "-DANDROID_PLATFORM=android-${Config.MIN_SDK_VERSION}"
               )
             }
           }

buildSrc/src/main/kotlin/me/vkryl/plugin/ModulePlugin.kt

@@ -22,9 +22,12 @@ import com.android.build.gradle.AppExtension
 import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.ProguardFiles
+import com.android.build.gradle.internal.cxx.hashing.sha256Of
+import getIntOrThrow
 import getLongOrThrow
 import getOrThrow
 import loadProperties
+import me.vkryl.task.writeToFile
 import monthYears
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -35,6 +38,7 @@ import org.gradle.kotlin.dsl.get
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.io.File
 import java.net.URI
+import java.security.MessageDigest
 import java.util.*
 
 open class ModulePlugin : Plugin<Project> {
@@ -214,6 +218,22 @@ open class ModulePlugin : Plugin<Project> {
               PullRequest(it.toLong(), properties)
             }.sortedBy { it.id }
 
+            val buildIdContents = commitHashLong + "+" + (
+              versions.getIntOrThrow("version.jni") +
+              versions.getIntOrThrow("version.tdlib") +
+              versions.getIntOrThrow("version.leveldb")
+            ) + (if (pullRequests.isEmpty()) {
+              ""
+            } else {
+              "+" + pullRequests.joinToString(",") { it.commitShort }
+            })
+            val buildId = sha256Of(
+              buildIdContents
+            )
+            writeToFile("build-id.txt") {
+              it.append(buildId)
+            }
+
             namespace = "org.thunderdog.challegram"
 
             defaultConfig {

buildSrc/src/main/kotlin/me/vkryl/task/FetchLanguagesTask.kt

@@ -231,7 +231,7 @@ open class FetchLanguagesTask : BaseTask() {
               allFolders.addAll(outputFolders)
 
               for (outputFolder in outputFolders) {
-                writeToFile("app/src/main/res/values-${outputFolder}/strings.xml", mkdirs = true) { xml ->
+                writeToFile("app/src/main/res/values-${outputFolder}/strings.xml") { xml ->
                   xml.append("""
                     <?xml version="1.0" encoding="utf-8"?>
                     <!-- AUTOGENERATED, DO NOT MODIFY -->

buildSrc/src/main/kotlin/me/vkryl/task/TaskFunctions.kt

@@ -18,24 +18,31 @@ import java.io.Writer
 import java.nio.channels.FileChannel
 import java.nio.file.StandardOpenOption
 import java.util.*
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
 
-@ExperimentalContracts
-fun writeToFile(path: String, mkdirs: Boolean = true, isRelativePath: Boolean = true, block: (Writer) -> Unit) {
-  contract {
-    callsInPlace(block, InvocationKind.EXACTLY_ONCE)
-  }
+fun isWindowsHost(): Boolean {
+  return System.getProperty("os.name").startsWith("Windows")
+}
 
-  val isWindows = System.getProperty("os.name").startsWith("Windows")
+fun writeToFile(path: String, block: (Writer) -> Unit) {
+  val isWindows = isWindowsHost()
+  // TODO proper detection, but it isn't needed for now,
+  // because all paths passed to this method are relative.
+  val isRelativePath = !path.startsWith("/")
+  val isRootFolder = !path.contains("/")
   val file = if (isRelativePath && isWindows) {
     File("${System.getProperty("user.dir")}${File.separator}$path")
   } else {
     File(path)
   }
+  writeToFile(file, mkdirs = !isRootFolder, block)
+}
 
-  if (!file.parentFile.exists()) {
+fun writeToFile(file: File, mkdirs: Boolean = true, block: (Writer) -> Unit) {
+  if (file.parentFile == null) {
+    if (mkdirs) {
+      error("Invalid file path: ${file.absolutePath}")
+    }
+  } else if (!file.parentFile.exists()) {
     if (mkdirs) {
       if (!file.parentFile.mkdirs())
         error("Could not create folder: ${file.parentFile.absolutePath}")
@@ -62,7 +69,7 @@ fun writeToFile(path: String, mkdirs: Boolean = true, isRelativePath: Boolean =
 
   if (file.exists()) {
     if (!areFileContentsIdentical(file, outFile)) {
-      if (isWindows) {
+      if (isWindowsHost()) {
         Thread.sleep(300)
         System.gc()
       }