Restructre build system for Octave 6,7,8

gnu-octave · Nov 19, 2023 · 8635344 · 8635344
1 parent 6eaa796
commit 8635344
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/.github/workflows/build_octave.yml b/.github/workflows/build_octave.yml
@@ -10,7 +10,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        version: [4, 5, 6, 7]
+        version: [4, 5, 6, 7, 8]
     steps:
       -
         name: Checkout

diff --git a/.github/workflows/octave.yml b/.github/workflows/octave.yml
@@ -72,8 +72,8 @@ jobs:
           if [ "${VER:0:3}" = "4.4" ]; then
             BUILD_VER=5
           fi
-          if [ "${VER:0:1}" = "8" ]; then
-            BUILD_VER=7
+          if [ "${VER:0:1}" = "7" ]; then
+            BUILD_VER=6
           fi
           GNU_MIRROR=https://ftpmirror.gnu.org/octave
           echo "OCTAVE_VERSION_MAJOR=${BUILD_VER}" >> $GITHUB_ENV

diff --git a/README.md b/README.md
@@ -84,17 +84,17 @@ For old Octave 4.x.x versions you might additionally pass the
 
 ```mermaid
 graph LR
-    U4[ubuntu:<b>2204</b>] --> b7[docker.io/gnuoctave/octave-build:<b>7</b>];
+    U4[ubuntu:<b>2204</b>] --> b8[docker.io/gnuoctave/octave-build:<b>8</b>];
     U3[ubuntu:<b>2004</b>] --> b6[docker.io/gnuoctave/octave-build:<b>6</b>];
     U2[ubuntu:<b>1804</b>] --> b5[docker.io/gnuoctave/octave-build:<b>5</b>];
     U1[ubuntu:<b>1604</b>] --> b4[docker.io/gnuoctave/octave-build:<b>4</b>];
-    b7 --> v840[docker.io/gnuoctave/octave:<b>8.4.0</b>];
-    b7 --> v830[docker.io/gnuoctave/octave:<b>8.3.0</b>];
-    b7 --> v820[docker.io/gnuoctave/octave:<b>8.2.0</b>];
-    b7 --> v810[docker.io/gnuoctave/octave:<b>8.1.0</b>];
-    b7 --> v730[docker.io/gnuoctave/octave:<b>7.3.0</b>];
-    b7 --> v720[docker.io/gnuoctave/octave:<b>7.2.0</b>];
-    b7 --> v710[docker.io/gnuoctave/octave:<b>7.1.0</b>];
+    b8 --> v840[docker.io/gnuoctave/octave:<b>8.4.0</b>];
+    b8 --> v830[docker.io/gnuoctave/octave:<b>8.3.0</b>];
+    b8 --> v820[docker.io/gnuoctave/octave:<b>8.2.0</b>];
+    b8 --> v810[docker.io/gnuoctave/octave:<b>8.1.0</b>];
+    b6 --> v730[docker.io/gnuoctave/octave:<b>7.3.0</b>];
+    b6 --> v720[docker.io/gnuoctave/octave:<b>7.2.0</b>];
+    b6 --> v710[docker.io/gnuoctave/octave:<b>7.1.0</b>];
     b6 --> v640[docker.io/gnuoctave/octave:<b>6.4.0</b>];
     b6 --> v630[docker.io/gnuoctave/octave:<b>6.3.0</b>];
     b6 --> v620[docker.io/gnuoctave/octave:<b>6.2.0</b>];
@@ -119,7 +119,7 @@ graph LR
     class b4 b;
     class b5 b;
     class b6 b;
-    class b7 b;
+    class b8 b;
     classDef age1 fill:#9aff9a,stroke:#333,stroke-width:2px;
     classDef age2 fill:#7fffd4,stroke:#333,stroke-width:2px;
     classDef age3 fill:#fff68f,stroke:#333,stroke-width:2px;
@@ -130,9 +130,9 @@ graph LR
     class v830 age1;
     class v820 age1;
     class v810 age1;
-    class v730 age1;
-    class v720 age1;
-    class v710 age1;
+    class v730 age2;
+    class v720 age2;
+    class v710 age2;
     class v640 age2;
     class v630 age2;
     class v620 age2;

diff --git a/build-octave-6.docker b/build-octave-6.docker
@@ -112,3 +112,18 @@ ENV SHELL=/bin/bash \
     LANG=en_US.UTF-8 \
     LANGUAGE=en_US.UTF-8 \
     JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+
+
+# Install RapidJSON header library
+
+RUN mkdir -p /tmp/build      && \
+    cd       /tmp/build      && \
+    wget -q "https://github.com/Tencent/rapidjson/archive/refs/heads/master.tar.gz" && \
+    tar -xf master.tar.gz    && \
+    cp -R rapidjson-master/include/rapidjson /usr/include && \
+    rm -rf /tmp/build
+
+
+# Set Octave build options
+
+ENV OCTAVE_CONFIGURE_ARGS="--with-qhull='-lqhull_r'"
diff --git a/build-octave-7.docker → build-octave-8.docker b/build-octave-7.docker → build-octave-8.docker