From c0a307c55ddbc9e05cba7ad7a5a1ce347d866ed8 Mon Sep 17 00:00:00 2001
From: Michael Behrisch <michael.behrisch@dlr.de>
Date: Thu, 9 Nov 2023 16:05:28 +0100
Subject: [PATCH] more build path adaptions #3

---
 .github/workflows/docker.yml      |  2 +-
 .github/workflows/wheel-linux.yml |  8 ++++----
 .github/workflows/wheel-macos.yml | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9b71e62e648..78592bd9abb 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -41,7 +41,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: build/docker/Dockerfile.ubuntu.git
+          file: build_config/docker/Dockerfile.ubuntu.git
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/wheel-linux.yml b/.github/workflows/wheel-linux.yml
index 541958f1e23..c33c50f5232 100644
--- a/.github/workflows/wheel-linux.yml
+++ b/.github/workflows/wheel-linux.yml
@@ -36,23 +36,23 @@ jobs:
       run: |
         cd tools
         python -m pip install build
-        python build/version.py build/setup-sumolib.py ./setup.py
+        python build_config/version.py build_config/setup-sumolib.py ./setup.py
         python -m build -o ../wheelhouse
-        python build/version.py build/setup-traci.py ./setup.py
+        python build_config/version.py build_config/setup-traci.py ./setup.py
         python -m build -o ../wheelhouse
 
     - name: Building SUMO / libsumo Python wheels (latest manylinux docker)
       # if: github.repository == 'DLR-TS/sumo'
       uses: docker://quay.io/pypa/manylinux2014_x86_64
       with:
-        entrypoint: tools/build/build_wheels.sh
+        entrypoint: tools/build_config/build_wheels.sh
 
     # the next two steps are only needed when we debug the manylinux build
     # - name: Building Python wheels (fixed manylinux docker)
     #   if: github.repository == 'eclipse-sumo/sumo'
     #   uses: docker://quay.io/pypa/manylinux2014_x86_64:2022-11-14-1226cfc
     #   with:
-    #     entrypoint: tools/build/build_wheels.sh
+    #     entrypoint: tools/build_config/build_wheels.sh
 
     # - name: Uploading raw wheels (without auditwheel being applied)
     #   uses: actions/upload-artifact@v3
diff --git a/.github/workflows/wheel-macos.yml b/.github/workflows/wheel-macos.yml
index 3ee771e5389..3f115198449 100644
--- a/.github/workflows/wheel-macos.yml
+++ b/.github/workflows/wheel-macos.yml
@@ -56,12 +56,12 @@ jobs:
       run: |
         python3 -m pip install --upgrade pip
         python3 -m pip install build
-        cp build/pyproject.toml .
-        python3 tools/build/version.py tools/build/setup-sumo.py ./setup.py
+        cp build_config/pyproject.toml .
+        python3 tools/build_config/version.py tools/build_config/setup-sumo.py ./setup.py
         python3 -m build --wheel
-        python3 tools/build/version.py tools/build/setup-libsumo.py tools/setup.py
+        python3 tools/build_config/version.py tools/build_config/setup-libsumo.py tools/setup.py
         python3 -m build --wheel tools -o dist
-        python3 tools/build/version.py tools/build/setup-libtraci.py tools/setup.py
+        python3 tools/build_config/version.py tools/build_config/setup-libtraci.py tools/setup.py
         python3 -m build --wheel tools -o dist
         if [[ "${{ matrix.python_version }}" != "3.8" ]]; then rm dist/eclipse_sumo-*; fi
         if [[ "${{ matrix.python_version }}" == "3.8" ]]; then mv dist/eclipse_sumo-* `echo dist/eclipse_sumo-* | sed 's/cp38-cp38/py2.py3-none/'`; fi
@@ -126,9 +126,9 @@ jobs:
       run: |
         cd tools
         python3 -m pip install build
-        python3 build/version.py build/setup-sumolib.py ./setup.py
+        python3 build_config/version.py build_config/setup-sumolib.py ./setup.py
         python3 -m build --wheel
-        python3 build/version.py build/setup-traci.py ./setup.py
+        python3 build_config/version.py build_config/setup-traci.py ./setup.py
         python3 -m build --wheel
 
     - name: Running libsumo tests