Bring modules branch up-to-date

.gitattributes

@@ -0,0 +1,25 @@
+# This is a good default: files that are auto-detected by git to be text are
+# converted to the platform-native line ending (LF on Unix, CRLF on Windows)
+# in the working tree and to LF in the repository.
+#
+* text=auto
+
+# Use `eol=crlf` for files that should have the CRLF line ending both in the
+# working tree (even on Unix) and in the repository.
+#
+#*.bat text eol=crlf
+
+# Use `eol=lf` for files that should have the LF line ending both in the
+# working tree (even on Windows) and in the repository.
+#
+#*.sh text eol=lf
+
+# Use `binary` to make sure certain files are never auto-detected as text.
+#
+#*.png binary
+
+fmt/fmt/include symlink=dir
+fmt/fmt/src symlink=dir
+fmt/doc symlink=dir
+fmt-tests/basics/test symlink=dir
+fmt-tests/test-main/test symlink=dir

.gitignore

@@ -1,4 +1,5 @@
 .bdep/
+.vs/
 
 # Local default options files.
 #

buildfile

@@ -1,5 +1,6 @@
-./: {*/ -build/ -upstream/ -doc/} manifest doc{README.md} doc/doc{**}
-
-# Don't install tests.
+# Glue buildfile that "pulls" all the packages in the project.
 #
-tests/: install = false
+import pkgs = [dir_paths] $process.run_regex(\
+  cat $src_root/packages.manifest, '\s*location\s*:\s*(\S+)\s*', '\1')
+
+./: $pkgs

fmt-tests/.gitignore

@@ -0,0 +1,25 @@
+# Compiler/linker output.
+#
+*.d
+*.t
+*.i
+*.i.*
+*.ii
+*.ii.*
+*.o
+*.obj
+*.gcm
+*.pcm
+*.ifc
+*.so
+*.dylib
+*.dll
+*.a
+*.lib
+*.exp
+*.pdb
+*.ilk
+*.exe
+*.exe.dlls/
+*.exe.manifest
+*.pc

fmt-tests/basics/.gitignore

@@ -0,0 +1,5 @@
+basics
+
+# Testscript output directory (can be symlink).
+#
+test-basics

fmt-tests/basics/buildfile

@@ -0,0 +1,45 @@
+include ../test-main/
+
+#test_names =
+#  args-test \
+#  assert-test \
+#  base-test
+gtest_test_names = args-test assert-test base-test chrono-test color-test compile-fp-test compile-test format-test gtest-extra-test noexception-test os-test ostream-test printf-test std-test unicode-test xchar-test
+
+# header-only-test <- header only mode seemingly not supported by this build2 package?
+# scan-test <- some linker issues
+# posix-mock-test <- needs posix-mock.h, and has some msvc/runtime conditional logic going on
+
+standalone_test_names = enforce-checks-test # some way to pair these? -DFMT_ENFORCE_COMPILE_STRING
+
+for test_name : $gtest_test_names
+{
+  ./: exe{$test_name} : test/cxx{$test_name}
+  exe{$test_name}: ../test-main/liba{test-main}:
+  {
+    bin.whole = true
+  }
+}
+
+./: exe{ranges-test} : test/cxx{ranges-test ranges-odr-test}
+exe{ranges-test}: ../test-main/liba{test-main}:
+{
+  bin.whole = true
+}
+
+# linker issues.
+#./: exe{scan-test} : test/cxx{scan-test} ../test-main/liba{test-main}
+
+# @todo: cmake adds this test conditionally on NOT ( msvc AND fmt-shared )
+# in build2, i guess it's a bit different in that we can potentially build both shared and static variants within a single config?
+# also not clear how fmt_shared/fmt_header_only is being configured, looks like the package doesn't do anything there. using defaults only?
+# if $cxx. != msvc
+#./: exe{format-impl-test} : test/cxx{format-impl-test header-only-test} ../test-main/liba{test-main}
+
+
+import fmt = fmt%lib{fmt}
+
+for test_name : $standalone_test_names
+{
+  ./: exe{$test_name} : test/cxx{$test_name} $fmt
+}

fmt-tests/basics/test

@@ -0,0 +1 @@
+../../upstream/test

fmt-tests/build/.gitignore

@@ -0,0 +1,4 @@
+/config.build
+/root/
+/bootstrap/
+build/

fmt-tests/build/bootstrap.build

@@ -0,0 +1,6 @@
+project = fmt-tests
+
+using version
+using config
+using test
+using dist

build/root.build → fmt-tests/build/root.build

@@ -1,13 +1,19 @@
+# Uncomment to suppress warnings coming from external libraries.
+#
+#cxx.internal.scope = current
+
 cxx.std = latest
 
 using cxx
 
 hxx{*}: extension = h
-cxx{*}: extension = cc
 mxx{*}: extension = cc
+cxx{*}: extension = cc
+
+# All executables are tests
+#
+exe{*}: test = true
 
 # The test target for cross-testing (running tests under Wine, etc).
 #
 test.target = $cxx.target
-
-include $src_root/build/config-options.build2

fmt-tests/buildfile

@@ -0,0 +1 @@
+./: {*/ -build/} manifest

fmt-tests/manifest

@@ -0,0 +1,13 @@
+: 1
+name: fmt-tests
+version: 11.0.1-a.0.z
+project: fmt
+summary: Tests package for fmt upstream tests
+license: MIT
+url: https://github.com/fmtlib/fmt/
+
+depends: * build2 >= 0.17.0
+depends: * bpkg >= 0.17.0
+
+depends: gtest ^1.11.0
+depends: gmock ^1.11.0

fmt-tests/test-main/buildfile

@@ -0,0 +1,14 @@
+
+libs =
+import libs += fmt%lib{fmt}
+import libs += gtest%lib{gtest} gmock%lib{gmock}
+
+liba{test-main}: test/cxx{test-main gtest-extra util} test/hxx{gtest-extra mock-allocator test-assert util} $libs
+
+# Export options.
+#
+liba{test-main}:
+{
+  cxx.export.poptions += "-I$src_base/test"
+  cxx.export.libs = $libs
+}

fmt-tests/test-main/test

@@ -0,0 +1 @@
+../../upstream/test

fmt/README.md

@@ -0,0 +1,26 @@
+`{fmt}` library - Build2 package
+================================
+
+See [`{fmt}` documentation](https://fmt.dev/) for usage and details.
+
+ - `{fmt}` : https://github.com/fmtlib/fmt/
+ - Build2 : https://build2.org
+
+Note: This is the source code for the build2 package of the `{fmt}` C++ library,
+the actual library sources snapshot can be found in the `./upstream/` submodule.
+
+## Configuration Options
+
+### Experimental C++20 modules support
+
+Modules support is WIP, both in the `build2` package and also in `fmt` upstream. Latest versions of MSVC or Clang are recommended, and the most up-to-date version of the package with regards to modules compatibility can be used via git and the [modules branch](https://github.com/build2-packaging/fmt/tree/modules). For example, in project `repositories.manifest`:
+```
+:
+role: prerequisite
+location: https://github.com/build2-packaging/fmt.git#modules
+```
+
+Enable with `config.cxx.features.modules=true`. When enabled, by default dual mode is used meaning that the library can be consumed either through `import` or via `#include`. To enable this safely, all entities are attached to the global module (extern "C++"). See `modules_only` option for the alternative.
+ - `config.fmt.enable_import_std` : Set to `true` to consume the standard library as a module when building the `fmt` module. Support dependent on compiler and std lib. Defaults to `false`.
+ - `config.fmt.modules_only` : Set to `true` to enable modules-only mode for the package. In this mode, `fmt` entities are fully encapsulated in the `fmt` module meaning `#include`-based consumption cannot be mixed, and the package will not export headers. Defaults to `false`.
+

fmt/build/root.build

@@ -0,0 +1,18 @@
+cxx.std = latest
+
+using cxx
+
+hxx{*}: extension = h
+cxx{*}: extension = cc
+mxx{*}: extension = cc
+
+# The test target for cross-testing (running tests under Wine, etc).
+#
+test.target = $cxx.target
+
+
+##############################
+# Project-specific options:
+
+config [bool]    config.fmt.enable_import_std ?= false
+config [bool]    config.fmt.modules_only ?= false

fmt/buildfile

@@ -1,57 +1,5 @@
-int_libs = # Interface dependencies.
-imp_libs = # Implementation dependencies.
-#import imp_libs += libhello%lib{hello}
+./: {*/ -build/ -upstream/ -doc/} manifest doc{README.md} doc/doc{**}
 
-./ : lib{fmt}
-
-lib{fmt}: include/hxx{**} hxx{version} $imp_libs $int_libs
-lib{fmt}: src/mxx{fmt} : include = ($config.fmt.enable_modules == true)
-lib{fmt}: src/cxx{** -fmt} : include = ($config.fmt.enable_modules == false)
-
-# Include the generated version header into the distribution (so that we don't
-# pick up an installed one) and don't remove it when cleaning in src (so that
-# clean results in a state identical to distributed).
-#
-hxx{version} : in{version} $src_root/manifest
-{
-  dist  = true
-  clean = ($src_root != $out_root)
-  install = include/fmt
-}
-
-# Build options.
-#
-cxx.poptions =+ "-I$src_base/include" "-I$out_root" "-I$src_root"
-objs{*}: cxx.poptions += -DFMT_EXPORT -DFMT_SHARED
-
-# Export options.
-#
-lib{fmt}:
-{
-  cxx.export.poptions = "-I$src_base/include" "-I$out_root" "-I$src_root"
-  cxx.export.libs = $int_libs
-}
-
-libs{fmt}: cxx.export.poptions += -DFMT_SHARED
-
-
-# For pre-releases use the complete version to make sure they cannot be used
-# in place of another pre-release or the final version. See the version module
-# for details on the version.* variable values.
-#
-if $version.pre_release
-  lib{fmt}: bin.lib.version = @"-$version.project_id"
-else
-  lib{fmt}: bin.lib.version = @"-$version.major.$version.minor"
-
-# Install into the fmt/ subdirectory of, say, /usr/include/
-# recreating subdirectories.
+# Don't install tests.
 #
-include/
-{
-  {hxx ixx txx}{*}:
-  {
-    install         = include/
-    install.subdirs = true
-  }
-}
+tests/: install = false

fmt/doc

@@ -0,0 +1 @@
+../upstream/doc