summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2021-10-15 22:48:01 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2021-10-15 22:48:01 +0300
commit7c2bb4ef7bdb47a8fabfe579e2262105a7d33765 (patch)
tree01fcbb57a2b5c45e6df55f67fe5f69c47c45fe96
parentc9bb56f801674fb66674faf37600f1aae5b1103f (diff)
Release version 1.0.0+7v1.0.0+7
Mark headers as importable in buildfiles Add commented out c/cxx/cc.internal.scope to root.build Make glue buildfile to read packages.manifest Add BMI extensions to and ignore compressed .i and .i in .gitignore Bump project requirements for build2 to 0.14.0-
-rw-r--r--buildfile3
-rw-r--r--hello/.gitignore5
-rw-r--r--hello/build/root.build8
-rw-r--r--hello/manifest6
4 files changed, 18 insertions, 4 deletions
diff --git a/buildfile b/buildfile
index aad5e21..c3c8909 100644
--- a/buildfile
+++ b/buildfile
@@ -1,5 +1,6 @@
# Glue buildfile that "pulls" all the packages in the project.
#
-import pkgs = */
+import pkgs = [dir_paths] $process.run_regex(\
+ cat $src_root/packages.manifest, '\s*location\s*:\s*(\S+)\s*', '\1')
./: $pkgs
diff --git a/hello/.gitignore b/hello/.gitignore
index cece09c..6435b97 100644
--- a/hello/.gitignore
+++ b/hello/.gitignore
@@ -3,9 +3,14 @@
*.d
*.t
*.i
+*.i.*
*.ii
+*.ii.*
*.o
*.obj
+*.gcm
+*.pcm
+*.ifc
*.so
*.dll
*.a
diff --git a/hello/build/root.build b/hello/build/root.build
index 9c83a8a..ae3d2a6 100644
--- a/hello/build/root.build
+++ b/hello/build/root.build
@@ -1,3 +1,7 @@
+# Uncomment to suppress warnings coming from external libraries.
+#
+#cxx.internal.scope = current
+
cxx.std = latest
using cxx
@@ -7,6 +11,10 @@ ixx{*}: extension = ixx
txx{*}: extension = txx
cxx{*}: extension = cxx
+# Assume headers are importable unless stated otherwise.
+#
+hxx{*}: cxx.importable = true
+
# The test target for cross-testing (running tests under Wine, etc).
#
test.target = $cxx.target
diff --git a/hello/manifest b/hello/manifest
index b7e1698..7314a39 100644
--- a/hello/manifest
+++ b/hello/manifest
@@ -1,6 +1,6 @@
: 1
name: hello
-version: 1.0.0+6
+version: 1.0.0+7
summary: The "Hello World" example program
license: MIT ; MIT License.
topics: hello world example
@@ -14,6 +14,6 @@ src-url: https://git.build2.org/cgit/hello/hello/tree/hello
email: users@build2.org
build-warning-email: builds@build2.org
builds: all
-depends: * build2 >= 0.11.0
-depends: * bpkg >= 0.11.0
+depends: * build2 >= 0.14.0-
+depends: * bpkg >= 0.14.0-
depends: libhello ^1.0.0