feat: cleaned-up redundant external generators, dockerfile now using dist-miniaml.

Author: jrfaller

.github/workflows/build-test-gumtree.yml

@@ -17,13 +17,13 @@ concurrency:
 
 jobs:
   build-test-deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     container: gumtreediff/gumtree:latest
     environment: MavenCentral
     if: ${{ !(contains(github.event.head_commit.message, '[no ci]') || startsWith(github.event.head_commit.message, 'doc')) }}
     steps:
       - name: checkout gumtree
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           show-progress: ''
@@ -34,7 +34,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
       - name: build gumtree and run benchmarks
-        run: ./gradlew -PtestNative build :benchmark:runOnDefects4J :benchmark:runOnGhJava :benchmark:execNotebook
+        run: ./gradlew build :benchmark:runOnDefects4J :benchmark:runOnGhJava :benchmark:execNotebook
       - name: upload benchmarks results
         uses: actions/upload-artifact@v4
         with:
@@ -70,7 +70,7 @@ jobs:
       - name: set up docker buildx
         uses: docker/setup-buildx-action@v3
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx

buildSrc/src/main/groovy/java-external-conv.gradle

@@ -0,0 +1,5 @@
+plugins {
+    id 'java-conv'
+}
+
+test.onlyIf { rootProject.hasProperty('testExternal') }

buildSrc/src/main/groovy/java-native-conv.gradle

@@ -10,15 +10,11 @@ dependencies {
 	implementation project(':core')
 	implementation project(':client')
 	implementation project(':client.diff')
-	implementation project(':gen.c')
 	implementation project(':gen.css')
 	implementation project(':gen.javaparser')
 	implementation project(':gen.jdt')
 	implementation project(':gen.js')
-	implementation project(':gen.js-acorn')
-	implementation project(':gen.python')
 	implementation project(':gen.srcml')
-	implementation project(':gen.treesitter')
 	implementation project(':gen.treesitter-ng')
 	implementation project(':gen.xml')
 	implementation project(':gen.yaml')

dist/build.gradle

@@ -1,59 +1,13 @@
-FROM ubuntu:noble
+FROM openjdk:21-slim as build-stage
 
-ARG DEBIAN_FRONTEND=noninteractive
-ENV TZ=GMT
-
-# Install all required packages
-RUN apt-get update \
-	&& apt-get install -y --no-install-recommends openjdk-17-jdk wget git gdebi-core \
-	    build-essential ocaml libnum-ocaml-dev \
-        python3-dev nodejs npm python3-venv \
-	    tzdata ca-certificates p11-kit
-
-RUN python3 -m venv /opt/venv
-
-ENV PATH="/opt/venv/bin:$PATH"
-
-RUN pip install pandas plotnine scipy jupyter
-
-# Set locale
-ENV LANG=C.UTF-8
-
-ARG TARGETARCH
-
-# Install srcML
-RUN if [ "${TARGETARCH}" = "arm64" ]; then \
-        wget https://github.com/srcML/srcML/releases/download/v1.1.0/srcml_1.1.0-1_ubuntu24.10_arm64.deb && \
-        gdebi srcml_1.1.0-1_ubuntu24.10_arm64.deb -n; \
-    else \
-        wget https://github.com/srcML/srcML/releases/download/v1.1.0/srcml_1.1.0-1_ubuntu24.04_amd64.deb && \
-        gdebi srcml_1.1.0-1_ubuntu24.04_amd64.deb -n; \
-    fi
-
-# Install cgum
-RUN git clone https://github.com/GumTreeDiff/cgum.git /opt/cgum --depth 1 \
-    && make -C /opt/cgum \
-	&& ln -s /opt/cgum/cgum /usr/bin/cgum
-
-# Install pythonparser
-RUN git clone https://github.com/GumTreeDiff/pythonparser.git /opt/pythonparser --depth 1 \
-    && ln -s /opt/pythonparser/pythonparser /usr/bin/pythonparser \
-    && pip3 install parso
-
-# Install jsparser
-RUN git clone https://github.com/GumTreeDiff/jsparser.git /opt/jsparser --depth 1 \
-    && ln -s /opt/jsparser/jsparser /usr/bin/jsparser \
-    && npm --prefix /opt/jsparser/ install /opt/jsparser/
+# Compiles gumtree
+COPY . /opt/gumtree
+RUN /opt/gumtree/gradlew -p /opt/gumtree build
 
-# Install tree-sitter-parser
-RUN git clone --recurse-submodules --shallow-submodules https://github.com/GumTreeDiff/tree-sitter-parser.git /opt/tree-sitter-parser --depth 1 \
-    && ln -s /opt/tree-sitter-parser/tree-sitter-parser.py /usr/bin/tree-sitter-parser.py \
-    && pip3 install tree_sitter pyyaml
+FROM openjdk:21-slim as final-stage
 
-# Install gumtree
-COPY . /opt/gumtree
-RUN /opt/gumtree/gradlew -PtestNative -p /opt/gumtree build \
-	&& ln -s /opt/gumtree/dist/build/install/gumtree/bin/gumtree /usr/bin/gumtree
+# Copy gumtree-native distribution from build-stage.
+COPY --from=build-stage /opt/gumtree/dist-minimal/build/install/gumtree/ /opt/gumtree
 
 # Define volume diff to make available files to diff
 RUN mkdir -p /diff/left /diff/right
@@ -63,4 +17,4 @@ VOLUME /diff/left /diff/right
 # Expose port 4567 for webdiff
 EXPOSE 4567
 
-ENTRYPOINT ["gumtree"]
+ENTRYPOINT ["/opt/gumtree/bin/gumtree"]

docker/Dockerfile

@@ -0,0 +1,66 @@
+FROM ubuntu:noble
+
+ARG DEBIAN_FRONTEND=noninteractive
+ENV TZ=GMT
+
+# Install all required packages
+RUN apt-get update \
+	&& apt-get install -y --no-install-recommends openjdk-17-jdk wget git gdebi-core \
+	    build-essential ocaml libnum-ocaml-dev \
+        python3-dev nodejs npm python3-venv \
+	    tzdata ca-certificates p11-kit
+
+RUN python3 -m venv /opt/venv
+
+ENV PATH="/opt/venv/bin:$PATH"
+
+RUN pip install pandas plotnine scipy jupyter
+
+# Set locale
+ENV LANG=C.UTF-8
+
+ARG TARGETARCH
+
+# Install srcML
+RUN if [ "${TARGETARCH}" = "arm64" ]; then \
+        wget https://github.com/srcML/srcML/releases/download/v1.1.0/srcml_1.1.0-1_ubuntu24.10_arm64.deb && \
+        gdebi srcml_1.1.0-1_ubuntu24.10_arm64.deb -n; \
+    else \
+        wget https://github.com/srcML/srcML/releases/download/v1.1.0/srcml_1.1.0-1_ubuntu24.04_amd64.deb && \
+        gdebi srcml_1.1.0-1_ubuntu24.04_amd64.deb -n; \
+    fi
+
+# Install cgum
+RUN git clone https://github.com/GumTreeDiff/cgum.git /opt/cgum --depth 1 \
+    && make -C /opt/cgum \
+	&& ln -s /opt/cgum/cgum /usr/bin/cgum
+
+# Install pythonparser
+RUN git clone https://github.com/GumTreeDiff/pythonparser.git /opt/pythonparser --depth 1 \
+    && ln -s /opt/pythonparser/pythonparser /usr/bin/pythonparser \
+    && pip3 install parso
+
+# Install jsparser
+RUN git clone https://github.com/GumTreeDiff/jsparser.git /opt/jsparser --depth 1 \
+    && ln -s /opt/jsparser/jsparser /usr/bin/jsparser \
+    && npm --prefix /opt/jsparser/ install /opt/jsparser/
+
+# Install tree-sitter-parser
+RUN git clone --recurse-submodules --shallow-submodules https://github.com/GumTreeDiff/tree-sitter-parser.git /opt/tree-sitter-parser --depth 1 \
+    && ln -s /opt/tree-sitter-parser/tree-sitter-parser.py /usr/bin/tree-sitter-parser.py \
+    && pip3 install tree_sitter pyyaml
+
+# Install gumtree
+COPY . /opt/gumtree
+RUN /opt/gumtree/gradlew -PtestNative -p /opt/gumtree build \
+	&& ln -s /opt/gumtree/dist/build/install/gumtree/bin/gumtree /usr/bin/gumtree
+
+# Define volume diff to make available files to diff
+RUN mkdir -p /diff/left /diff/right
+WORKDIR /diff
+VOLUME /diff/left /diff/right
+
+# Expose port 4567 for webdiff
+EXPOSE 4567
+
+ENTRYPOINT ["gumtree"]