From 1b84d5eee83ab2aa379ec952d191533e60a2b39d Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Mon, 15 May 2023 11:26:25 +1000
Subject: [PATCH] Revert "conan: migrate profiles to conan2"

This reverts commit 5ed344ee0355c993f569ca70b5a9959c85dd5797.
---
 conan/profile/armv7-gcc-linux-release      | 2 +-
 conan/profile/x86_64-afl-linux-release     | 4 +++-
 conan/profile/x86_64-clang-linux-debug     | 4 +++-
 conan/profile/x86_64-clang-linux-release   | 8 +++++---
 conan/profile/x86_64-clang-linux-sanitizer | 4 +++-
 conan/profile/x86_64-gcc-linux-debug       | 4 +++-
 conan/profile/x86_64-gcc-linux-release     | 4 +++-
 conan/profile/x86_64-gcc-mingw-release     | 2 +-
 init.py                                    | 5 +++--
 9 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/conan/profile/armv7-gcc-linux-release b/conan/profile/armv7-gcc-linux-release
index f5c2388..212f6ac 100644
--- a/conan/profile/armv7-gcc-linux-release
+++ b/conan/profile/armv7-gcc-linux-release
@@ -3,7 +3,7 @@ target_host=armv7a-unknown-linux-gnueabihf
 cc_compiler=gcc
 cxx_compiler=g++
 
-[buildenv]
+[env]
 CONAN_CMAKE_FIND_ROOT_PATH=$toolchain
 CHOST=$target_host
 AR=$target_host-ar
diff --git a/conan/profile/x86_64-afl-linux-release b/conan/profile/x86_64-afl-linux-release
index 2483713..49a94db 100644
--- a/conan/profile/x86_64-afl-linux-release
+++ b/conan/profile/x86_64-afl-linux-release
@@ -10,7 +10,9 @@ build_type=Release
 
 [options]
 
-[buildenv]
+[build_requires]
+
+[env]
 CC=afl-clang
 CXX=afl-clang++
 CFLAGS="-flto"
diff --git a/conan/profile/x86_64-clang-linux-debug b/conan/profile/x86_64-clang-linux-debug
index a5a9465..2bcf03e 100644
--- a/conan/profile/x86_64-clang-linux-debug
+++ b/conan/profile/x86_64-clang-linux-debug
@@ -10,6 +10,8 @@ build_type=Debug
 
 [options]
 
-[buildenv]
+[build_requires]
+
+[env]
 CC=clang-16
 CXX=clang++-16
diff --git a/conan/profile/x86_64-clang-linux-release b/conan/profile/x86_64-clang-linux-release
index d4fc8f4..31c2ba3 100644
--- a/conan/profile/x86_64-clang-linux-release
+++ b/conan/profile/x86_64-clang-linux-release
@@ -4,14 +4,16 @@ arch=x86_64
 
 compiler=clang
 compiler.version=16
-#compiler.libcxx=libc++
-compiler.libcxx=libstdc++11
+compiler.libcxx=libc++
+#compiler.libcxx=libstdc++11
 
 build_type=Release
 
 [options]
 
-[buildenv]
+[build_requires]
+
+[env]
 CC=clang-16
 CXX=clang++-16
 CFLAGS="-flto"
diff --git a/conan/profile/x86_64-clang-linux-sanitizer b/conan/profile/x86_64-clang-linux-sanitizer
index 85cd7d9..aaedef0 100644
--- a/conan/profile/x86_64-clang-linux-sanitizer
+++ b/conan/profile/x86_64-clang-linux-sanitizer
@@ -10,7 +10,9 @@ build_type=Release
 
 [options]
 
-[buildenv]
+[build_requires]
+
+[env]
 CC=clang-16
 CXX=clang++-16
 CXXFLAGS="-fsanitize=undefined -fsanitize=address -fsanitize=leak"
diff --git a/conan/profile/x86_64-gcc-linux-debug b/conan/profile/x86_64-gcc-linux-debug
index ea83f53..e187873 100644
--- a/conan/profile/x86_64-gcc-linux-debug
+++ b/conan/profile/x86_64-gcc-linux-debug
@@ -10,7 +10,9 @@ build_type=Debug
 
 [options]
 
-[buildenv]
+[build_requires]
+
+[env]
 CC=gcc-13
 CXX=g++-13
 CXXFLAGS=-D_GLIBCXX_DEBUG
diff --git a/conan/profile/x86_64-gcc-linux-release b/conan/profile/x86_64-gcc-linux-release
index 1c5ae62..bd48588 100644
--- a/conan/profile/x86_64-gcc-linux-release
+++ b/conan/profile/x86_64-gcc-linux-release
@@ -10,7 +10,9 @@ build_type=Release
 
 [options]
 
-[buildenv]
+[build_requires]
+
+[env]
 CC=gcc
 CXX=g++
 CXXFLAGS="-flto -ffat-lto-objects"
diff --git a/conan/profile/x86_64-gcc-mingw-release b/conan/profile/x86_64-gcc-mingw-release
index 3a774e0..8cb4f72 100644
--- a/conan/profile/x86_64-gcc-mingw-release
+++ b/conan/profile/x86_64-gcc-mingw-release
@@ -3,7 +3,7 @@ target_host=x86_64-w64-mingw32
 cc_compiler=gcc
 cxx_compiler=g++
 
-[buildenv]
+[env]
 CONAN_CMAKE_FIND_ROOT_PATH=$toolchain
 CHOST=$target_host
 AR=$target_host-ar
diff --git a/init.py b/init.py
index abd55ab..3fe8789 100755
--- a/init.py
+++ b/init.py
@@ -250,8 +250,9 @@ if __name__ == '__main__':
 
     cmds = [
         f"{{ [[ -v VIRTUAL_ENV ]] || source {source_dir}/venv/bin/activate; }}",
-        f"conan install {source_dir} -pr:h {prh} -pr:b {prb} --build=missing -of deps/",
-        f"cmake {source_dir} {' '.join(accumulated)} -DCMAKE_TOOLCHAIN_FILE=deps/conan_toolchain.cmake",
+        f"conan install {source_dir} -pr:h {prh} -pr:b {prb} --build=missing",
+        f"conan install {source_dir} -pr:h {prh} -pr:b {prb} --build=missing -g deploy -if deps/",
+        f"cmake {source_dir} {' '.join(accumulated)}",
         ' '.join(accum.build)
     ]