diff options
-rw-r--r-- | .gitattributes | 19 | ||||
-rw-r--r-- | buildfile | 6 | ||||
-rw-r--r-- | hello/.gitignore | 6 | ||||
-rw-r--r-- | hello/README.md | 5 | ||||
-rw-r--r-- | hello/build/.gitignore | 7 | ||||
-rw-r--r-- | hello/build/root.build | 8 | ||||
-rw-r--r-- | hello/buildfile | 2 | ||||
-rw-r--r-- | hello/manifest | 15 | ||||
-rw-r--r-- | mhello/manifest | 2 |
9 files changed, 56 insertions, 14 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1631641 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,19 @@ +# 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 diff --git a/buildfile b/buildfile new file mode 100644 index 0000000..c3c8909 --- /dev/null +++ b/buildfile @@ -0,0 +1,6 @@ +# Glue buildfile that "pulls" all the packages in the project. +# +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..1c363a0 100644 --- a/hello/.gitignore +++ b/hello/.gitignore @@ -3,10 +3,16 @@ *.d *.t *.i +*.i.* *.ii +*.ii.* *.o *.obj +*.gcm +*.pcm +*.ifc *.so +*.dylib *.dll *.a *.lib diff --git a/hello/README.md b/hello/README.md new file mode 100644 index 0000000..02fe205 --- /dev/null +++ b/hello/README.md @@ -0,0 +1,5 @@ +# hello + +A simple program that implements the "Hello World" example in C++ using the +`libhello` library. Its primary goal is to show a canonical `build2`/`bpkg` +project/package. diff --git a/hello/build/.gitignore b/hello/build/.gitignore index 4a730a3..974e01d 100644 --- a/hello/build/.gitignore +++ b/hello/build/.gitignore @@ -1,3 +1,4 @@ -config.build -root/ -bootstrap/ +/config.build +/root/ +/bootstrap/ +build/ 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/buildfile b/hello/buildfile index bca55a2..4bec3bc 100644 --- a/hello/buildfile +++ b/hello/buildfile @@ -1 +1 @@ -./: {*/ -build/} manifest +./: {*/ -build/} doc{README.md} manifest diff --git a/hello/manifest b/hello/manifest index 90bdb1d..3dc3f0d 100644 --- a/hello/manifest +++ b/hello/manifest @@ -1,19 +1,16 @@ : 1 name: hello -version: 1.0.0+4 +version: 1.0.0+10 +language: c++ summary: The "Hello World" example program license: MIT ; MIT License. topics: hello world example -description: \ -A simple program that implements the "Hello World" example in C++ using the -libhello library. Its primary goal is to show a canonical build2/bpkg -project/package. -\ +description-file: README.md url: https://git.build2.org/cgit/hello/hello src-url: https://git.build2.org/cgit/hello/hello/tree/hello email: users@build2.org -build-email: builds@build2.org +build-warning-email: builds@build2.org builds: all -depends: * build2 >= 0.11.0 -depends: * bpkg >= 0.11.0 +depends: * build2 >= 0.16.0- +depends: * bpkg >= 0.16.0- depends: libhello ^1.0.0 diff --git a/mhello/manifest b/mhello/manifest index f817afa..f4e5417 100644 --- a/mhello/manifest +++ b/mhello/manifest @@ -5,7 +5,7 @@ project: hello summary: The modularized "Hello World" example program license: MIT tags: c++, world, example -description: \ +description:\ A simple program that implements the "Hello World" example in C++ with modules using the libhello library. Its primary goal is to show a canonical build2/bpkg project/package. |