cerbero: shorten builddir path

Attempt to shorten overall path length for
webrtc-audio-processing's abseil subproject.

Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1464>

2 files changed, 21 insertions, 21 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b2e237a..6595c726 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -204,9 +204,9 @@ android fedora image:
     when: 'always'
     paths:
       - "*/logs"
-      - "*/sources/*/*/_builddir/meson-logs/meson-log.txt"
-      - "*/sources/*/*/_builddir/CMakeFiles/CMakeError.log"
-      - "*/sources/*/*/_builddir/CMakeFiles/CMakeLog.log"
+      - "*/sources/*/*/b/meson-logs/meson-log.txt"
+      - "*/sources/*/*/b/CMakeFiles/CMakeError.log"
+      - "*/sources/*/*/b/CMakeFiles/CMakeLog.log"
       - "*.tar.*"
     exclude:
       - .git
@@ -294,9 +294,9 @@ build cerbero fedora x86_64:
     when: 'always'
     paths:
       - "*/logs"
-      - "*/sources/*/*/*/_builddir/meson-logs/meson-log.txt"
-      - "*/sources/*/*/*/_builddir/CMakeFiles/CMakeError.log"
-      - "*/sources/*/*/*/_builddir/CMakeFiles/CMakeLog.log"
+      - "*/sources/*/*/*/b/meson-logs/meson-log.txt"
+      - "*/sources/*/*/*/b/CMakeFiles/CMakeError.log"
+      - "*/sources/*/*/*/b/CMakeFiles/CMakeLog.log"
       - "*[0-9].tar.*"
     exclude:
       - .git
@@ -331,9 +331,9 @@ build cerbero cross-android universal:
     when: 'always'
     paths:
       - "*/logs"
-      - "*/sources/*/*/_builddir/meson-logs/meson-log.txt"
-      - "*/sources/*/*/_builddir/CMakeFiles/CMakeError.log"
-      - "*/sources/*/*/_builddir/CMakeFiles/CMakeLog.log"
+      - "*/sources/*/*/b/meson-logs/meson-log.txt"
+      - "*/sources/*/*/b/CMakeFiles/CMakeError.log"
+      - "*/sources/*/*/b/CMakeFiles/CMakeLog.log"
       - "*.msi"
     exclude:
       - .git
@@ -449,9 +449,9 @@ cerbero cross-android universal examples:
     when: 'always'
     paths:
       - "*/logs"
-      - "*/sources/*/*/*/_builddir/meson-logs/meson-log.txt"
-      - "*/sources/*/*/*/_builddir/CMakeFiles/CMakeError.log"
-      - "*/sources/*/*/*/_builddir/CMakeFiles/CMakeLog.log"
+      - "*/sources/*/*/*/b/meson-logs/meson-log.txt"
+      - "*/sources/*/*/*/b/CMakeFiles/CMakeError.log"
+      - "*/sources/*/*/*/b/CMakeFiles/CMakeLog.log"
       - "gstreamer-1.0-1.*.pkg"
       - "gstreamer-1.0-devel-1.*.pkg"
     exclude:
@@ -509,9 +509,9 @@ build cerbero cross-macos universal x86_64-host:
     when: 'always'
     paths:
       - "*/logs"
-      - "*/sources/*/*/*/_builddir/meson-logs/meson-log.txt"
-      - "*/sources/*/*/*/_builddir/CMakeFiles/CMakeError.log"
-      - "*/sources/*/*/*/_builddir/CMakeFiles/CMakeLog.log"
+      - "*/sources/*/*/*/b/meson-logs/meson-log.txt"
+      - "*/sources/*/*/*/b/CMakeFiles/CMakeError.log"
+      - "*/sources/*/*/*/b/CMakeFiles/CMakeLog.log"
       - "gstreamer-1.0-*-ios-universal.pkg"
     exclude:
       - .git
@@ -676,9 +676,9 @@ cerbero deps msvc x86_64 msi package:
     when: 'always'
     paths:
       - "*/logs"
-      - "*/sources/*/*/_builddir/meson-logs/meson-log.txt"
-      - "*/sources/*/*/_builddir/CMakeFiles/CMakeError.log"
-      - "*/sources/*/*/_builddir/CMakeFiles/CMakeLog.log"
+      - "*/sources/*/*/b/meson-logs/meson-log.txt"
+      - "*/sources/*/*/b/CMakeFiles/CMakeError.log"
+      - "*/sources/*/*/b/CMakeFiles/CMakeLog.log"
       - "*.msi"
     exclude:
       - .git
diff --git a/cerbero/build/build.py b/cerbero/build/build.py
index 0247dff1..b7dd3339 100644
--- a/cerbero/build/build.py
+++ b/cerbero/build/build.py
@@ -635,7 +635,7 @@ class CMake (MakefilesBase):
 
     def __init__(self):
         MakefilesBase.__init__(self)
-        self.build_dir = os.path.join(self.build_dir, '_builddir')
+        self.build_dir = os.path.join(self.build_dir, 'b')
         self.config_sh = 'cmake'
         if self.config.distro == Distro.MSYS2:
             # We do not want the MSYS2 CMake because it doesn't support MSVC
@@ -759,7 +759,7 @@ class Meson (Build, ModifyEnvBase) :
     can_msvc = True
     # Build files require a build machine compiler when cross-compiling
     meson_needs_build_machine_compiler = False
-    meson_builddir = "_builddir"
+    meson_builddir = "b"
     # We do not use cmake dependency files by default, speed up the build by disabling it
     need_cmake = False
 
@@ -1194,7 +1194,7 @@ class Cargo(Build, ModifyEnvBase):
 
         self.config_src_dir = os.path.abspath(os.path.join(self.build_dir,
                                                            self.srcdir))
-        self.cargo_dir = os.path.join(self.config_src_dir, '_builddir')
+        self.cargo_dir = os.path.join(self.config_src_dir, 'b')
         self.cargo = os.path.join(self.config.cargo_home, 'bin',
                 'cargo' + self.config._get_exe_suffix())