Move platform-specific config into subdirectory

lovell · Aug 8, 2023 · 9cb779b · 9cb779b
1 parent c6cc347
commit 9cb779b
Show file tree

Hide file tree

Showing 24 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -22,17 +22,17 @@ Run the top-level [build script](build.sh) without parameters for help.
 One [build script](build/lin.sh) is used to (cross-)compile
 the same shared libraries within multiple containers.
 
-* [x64 glibc](linux-x64/Dockerfile)
-* [x64 musl](linuxmusl-x64/Dockerfile)
-* [ARMv6 glibc](linux-armv6/Dockerfile)
-* [ARMv7-A glibc](linux-armv7/Dockerfile)
-* [ARM64v8-A glibc](linux-arm64v8/Dockerfile)
-* [ARM64v8-A musl](linuxmusl-arm64v8/Dockerfile)
+* [x64 glibc](platforms/linux-x64/Dockerfile)
+* [x64 musl](platforms/linuxmusl-x64/Dockerfile)
+* [ARMv6 glibc](platforms/linux-armv6/Dockerfile)
+* [ARMv7-A glibc](platforms/linux-armv7/Dockerfile)
+* [ARM64v8-A glibc](platforms/linux-arm64v8/Dockerfile)
+* [ARM64v8-A musl](platforms/linuxmusl-arm64v8/Dockerfile)
 
 ### Windows
 
 The output of libvips' [build-win64-mxe](https://github.com/libvips/build-win64-mxe)
-static "web" releases are [post-processed](build/win.sh) within a [container](win32/Dockerfile).
+static "web" releases are [post-processed](build/win.sh) within a [container](platforms/win32/Dockerfile).
 
 ### macOS
 

diff --git a/build.sh b/build.sh
@@ -59,7 +59,7 @@ for flavour in darwin-x64 darwin-arm64v8; do
       # ARM64 builds work via cross compilation from an x86_64 machine
       export CHOST="aarch64-apple-darwin"
       export FLAGS+=" -target arm64-apple-macos11"
-      export MESON="--cross-file=$PWD/$PLATFORM/meson.ini"
+      export MESON="--cross-file=$PWD/platforms/$PLATFORM/meson.ini"
       # macOS 11 Big Sur is the first version to support ARM-based macs
       export MACOSX_DEPLOYMENT_TARGET="11.0"
       # Set SDKROOT to the latest SDK available
@@ -87,7 +87,7 @@ done
 for flavour in win32-ia32 win32-x64 win32-arm64v8; do
   if [ $PLATFORM = "all" ] || [ $PLATFORM = $flavour ]; then
     echo "Building $flavour..."
-    docker build -t vips-dev-win32 win32
+    docker build -t vips-dev-win32 platforms/win32
     docker run --rm -e "VERSION_VIPS=${VERSION_VIPS}" -e "PLATFORM=${flavour}" -v $PWD:/packaging vips-dev-win32 sh -c "/packaging/build/win.sh"
   fi
 done
@@ -96,7 +96,7 @@ done
 for flavour in linux-x64 linuxmusl-x64 linux-armv6 linux-armv7 linux-arm64v8 linuxmusl-arm64v8; do
   if [ $PLATFORM = "all" ] || [ $PLATFORM = $flavour ]; then
     echo "Building $flavour..."
-    docker build -t vips-dev-$flavour $flavour
+    docker build -t vips-dev-$flavour platforms/$flavour
     docker run --rm -e "VERSION_VIPS=${VERSION_VIPS}" -e VERSION_LATEST_REQUIRED -v $PWD:/packaging vips-dev-$flavour sh -c "/packaging/build/lin.sh"
   fi
 done
diff --git a/darwin-arm64v8/Toolchain.cmake → platforms/darwin-arm64v8/Toolchain.cmake b/darwin-arm64v8/Toolchain.cmake → platforms/darwin-arm64v8/Toolchain.cmake
diff --git a/darwin-arm64v8/meson.ini → platforms/darwin-arm64v8/meson.ini b/darwin-arm64v8/meson.ini → platforms/darwin-arm64v8/meson.ini
diff --git a/darwin-x64/Toolchain.cmake → platforms/darwin-x64/Toolchain.cmake b/darwin-x64/Toolchain.cmake → platforms/darwin-x64/Toolchain.cmake
diff --git a/linux-arm64v8/Dockerfile → platforms/linux-arm64v8/Dockerfile b/linux-arm64v8/Dockerfile → platforms/linux-arm64v8/Dockerfile
diff --git a/linux-arm64v8/Toolchain.cmake → platforms/linux-arm64v8/Toolchain.cmake b/linux-arm64v8/Toolchain.cmake → platforms/linux-arm64v8/Toolchain.cmake
diff --git a/linux-arm64v8/meson.ini → platforms/linux-arm64v8/meson.ini b/linux-arm64v8/meson.ini → platforms/linux-arm64v8/meson.ini
diff --git a/linux-armv6/Dockerfile → platforms/linux-armv6/Dockerfile b/linux-armv6/Dockerfile → platforms/linux-armv6/Dockerfile
diff --git a/linux-armv6/Toolchain.cmake → platforms/linux-armv6/Toolchain.cmake b/linux-armv6/Toolchain.cmake → platforms/linux-armv6/Toolchain.cmake
diff --git a/linux-armv6/meson.ini → platforms/linux-armv6/meson.ini b/linux-armv6/meson.ini → platforms/linux-armv6/meson.ini
diff --git a/linux-armv7/Dockerfile → platforms/linux-armv7/Dockerfile b/linux-armv7/Dockerfile → platforms/linux-armv7/Dockerfile
diff --git a/linux-armv7/Toolchain.cmake → platforms/linux-armv7/Toolchain.cmake b/linux-armv7/Toolchain.cmake → platforms/linux-armv7/Toolchain.cmake
diff --git a/linux-armv7/meson.ini → platforms/linux-armv7/meson.ini b/linux-armv7/meson.ini → platforms/linux-armv7/meson.ini
diff --git a/linux-x64/Dockerfile → platforms/linux-x64/Dockerfile b/linux-x64/Dockerfile → platforms/linux-x64/Dockerfile
diff --git a/linux-x64/Toolchain.cmake → platforms/linux-x64/Toolchain.cmake b/linux-x64/Toolchain.cmake → platforms/linux-x64/Toolchain.cmake
diff --git a/linux-x64/meson.ini → platforms/linux-x64/meson.ini b/linux-x64/meson.ini → platforms/linux-x64/meson.ini
diff --git a/linuxmusl-arm64v8/Dockerfile → platforms/linuxmusl-arm64v8/Dockerfile b/linuxmusl-arm64v8/Dockerfile → platforms/linuxmusl-arm64v8/Dockerfile
diff --git a/linuxmusl-arm64v8/Toolchain.cmake → platforms/linuxmusl-arm64v8/Toolchain.cmake b/linuxmusl-arm64v8/Toolchain.cmake → platforms/linuxmusl-arm64v8/Toolchain.cmake
diff --git a/linuxmusl-arm64v8/meson.ini → platforms/linuxmusl-arm64v8/meson.ini b/linuxmusl-arm64v8/meson.ini → platforms/linuxmusl-arm64v8/meson.ini
diff --git a/linuxmusl-x64/Dockerfile → platforms/linuxmusl-x64/Dockerfile b/linuxmusl-x64/Dockerfile → platforms/linuxmusl-x64/Dockerfile
diff --git a/linuxmusl-x64/Toolchain.cmake → platforms/linuxmusl-x64/Toolchain.cmake b/linuxmusl-x64/Toolchain.cmake → platforms/linuxmusl-x64/Toolchain.cmake
diff --git a/linuxmusl-x64/meson.ini → platforms/linuxmusl-x64/meson.ini b/linuxmusl-x64/meson.ini → platforms/linuxmusl-x64/meson.ini
diff --git a/win32/Dockerfile → platforms/win32/Dockerfile b/win32/Dockerfile → platforms/win32/Dockerfile