build settings

.teamcity/settings.kts

@@ -0,0 +1,69 @@
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.ExecBuildStep
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.exec
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+/*
+The settings script is an entry point for defining a TeamCity
+project hierarchy. The script should contain a single call to the
+project() function with a Project instance or an init function as
+an argument.
+
+VcsRoots, BuildTypes, Templates, and subprojects can be
+registered inside the project using the vcsRoot(), buildType(),
+template(), and subProject() methods respectively.
+
+To debug settings scripts in command-line, run the
+
+    mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate
+
+command and attach your debugger to the port 8000.
+
+To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View
+-> Tool Windows -> Maven Projects), find the generate task node
+(Plugins -> teamcity-configs -> teamcity-configs:generate), the
+'Debug' option is available in the context menu for the task.
+*/
+
+version = "2019.2"
+
+project {
+
+    vcsRoot(HttpsGithubComSimon987sist2refsHeadsMaster)
+
+    buildType(Build)
+}
+
+object Build : BuildType({
+    name = "Build"
+
+    artifactRules = """
+        sist2
+        sist2_scan
+    """.trimIndent()
+
+    vcs {
+        root(HttpsGithubComSimon987sist2refsHeadsMaster)
+    }
+
+    steps {
+        exec {
+            name = "Build"
+            path = "./ci/build.sh"
+            dockerImage = "simon987/general_ci"
+            dockerImagePlatform = ExecBuildStep.ImagePlatform.Linux
+            dockerPull = true
+        }
+    }
+
+    triggers {
+        vcs {
+        }
+    }
+})
+
+object HttpsGithubComSimon987sist2refsHeadsMaster : GitVcsRoot({
+    name = "https://github.com/simon987/sist2#refs/heads/master"
+    url = "https://github.com/simon987/sist2"
+})

README.md

@@ -121,10 +121,10 @@ binaries.
 
     *(Debian)*
     ```bash
-    apt install git cmake pkg-config libglib2.0-dev\
+    apt install git cmake pkg-config libglib2.0-dev \
-        libssl-dev uuid-dev libavformat-dev libswscale-dev \
+        libssl-dev uuid-dev python3 libmagic-dev libfreetype6-dev \
-        python3 libmagic-dev libfreetype6-dev libcurl-dev \
+        libcurl-dev libbz2-dev yasm libharfbuzz-dev ragel \
-        libbz2-dev yasm libharfbuzz-dev ragel libarchive-dev
+        libarchive-dev
    ```
     *(FreeBSD)*
     ```bash

ci/build.sh

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
-git clone --recursive https://github.com/simon987/sist2
+./scripts/get_static_libs.sh
-cd sist2
-./scripts/get_static_libs.sh 1
 
 cmake .
 make

scripts/get_static_libs.sh

@@ -5,7 +5,7 @@ THREADS=$(nproc)
 cd lib
 
 cd mupdf
-USE_SYSTEM_HARFBUZZ=yes USE_SYSTEM_OPENJPEG=yes HAVE_X11=no HAVE_GLUT=no make -j 4
+make USE_SYSTEM_HARFBUZZ=yes USE_SYSTEM_OPENJPEG=yes HAVE_X11=no HAVE_GLUT=no -j $THREADS
 cd ..
 
 mv mupdf/build/release/libmupdf.a .