diff options
| -rw-r--r-- | buildfile | 8 | ||||
| -rw-r--r-- | libformat/.gitignore (renamed from .gitignore) | 0 | ||||
| -rw-r--r-- | libformat/build/.gitignore (renamed from build/.gitignore) | 0 | ||||
| -rw-r--r-- | libformat/build/bootstrap.build (renamed from build/bootstrap.build) | 0 | ||||
| -rw-r--r-- | libformat/build/export.build (renamed from build/export.build) | 0 | ||||
| -rw-r--r-- | libformat/build/root.build (renamed from build/root.build) | 0 | ||||
| -rw-r--r-- | libformat/buildfile | 23 | ||||
| -rw-r--r-- | libformat/libformat/buildfile | 21 | ||||
| -rw-r--r-- | libformat/libformat/export.hxx (renamed from libformat/export.hxx) | 0 | ||||
| -rw-r--r-- | libformat/libformat/format.cxx (renamed from libformat/format.cxx) | 0 | ||||
| -rw-r--r-- | libformat/libformat/format.hxx (renamed from libformat/format.hxx) | 0 | ||||
| -rw-r--r-- | libformat/manifest (renamed from manifest) | 0 | ||||
| -rw-r--r-- | libformat/tests/.gitignore (renamed from tests/.gitignore) | 0 | ||||
| -rw-r--r-- | libformat/tests/build/.gitignore (renamed from tests/build/.gitignore) | 0 | ||||
| -rw-r--r-- | libformat/tests/build/bootstrap.build (renamed from tests/build/bootstrap.build) | 0 | ||||
| -rw-r--r-- | libformat/tests/build/root.build (renamed from tests/build/root.build) | 0 | ||||
| -rw-r--r-- | libformat/tests/buildfile (renamed from tests/buildfile) | 0 | ||||
| -rw-r--r-- | libformat/tests/test/buildfile (renamed from tests/test/buildfile) | 0 | ||||
| -rw-r--r-- | libformat/tests/test/driver.cxx (renamed from tests/test/driver.cxx) | 0 | ||||
| -rw-r--r-- | libformat/tests/test/test.out (renamed from tests/test/test.out) | 0 |
20 files changed, 26 insertions, 26 deletions
diff --git a/buildfile b/buildfile deleted file mode 100644 index 27e0dec..0000000 --- a/buildfile +++ /dev/null @@ -1,8 +0,0 @@ -./: libformat/ tests/ doc{version} file{manifest} - -doc{version}: file{manifest} # Generated by the version module. -doc{version}: dist = true - -# Don't install tests. -# -dir{tests/}: install = false diff --git a/.gitignore b/libformat/.gitignore index a887fdd..a887fdd 100644 --- a/.gitignore +++ b/libformat/.gitignore diff --git a/build/.gitignore b/libformat/build/.gitignore index 225c27f..225c27f 100644 --- a/build/.gitignore +++ b/libformat/build/.gitignore diff --git a/build/bootstrap.build b/libformat/build/bootstrap.build index b6e8537..b6e8537 100644 --- a/build/bootstrap.build +++ b/libformat/build/bootstrap.build diff --git a/build/export.build b/libformat/build/export.build index 25c99aa..25c99aa 100644 --- a/build/export.build +++ b/libformat/build/export.build diff --git a/build/root.build b/libformat/build/root.build index 8ceadfa..8ceadfa 100644 --- a/build/root.build +++ b/libformat/build/root.build diff --git a/libformat/buildfile b/libformat/buildfile index 4f6f156..27e0dec 100644 --- a/libformat/buildfile +++ b/libformat/buildfile @@ -1,21 +1,8 @@ -lib{format}: {hxx cxx}{format} hxx{export} +./: libformat/ tests/ doc{version} file{manifest} -# For pre-releases use the complete version to make sure they cannot be used -# in place of another pre-release or the final version. -# -if $version.pre_release - lib{format}: bin.lib.version = @"-$version.project_id" -else - lib{format}: bin.lib.version = @"-$version.major.$version.minor" - -cxx.poptions =+ "-I$out_root" "-I$src_root" -obja{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD -objs{*}: cxx.poptions += -DLIBFORMAT_SHARED_BUILD - -lib{format}: cxx.export.poptions = "-I$out_root" "-I$src_root" -liba{format}: cxx.export.poptions += -DLIBFORMAT_STATIC -libs{format}: cxx.export.poptions += -DLIBFORMAT_SHARED +doc{version}: file{manifest} # Generated by the version module. +doc{version}: dist = true -# Install into the libformat/ subdirectory of, say, /usr/include/. +# Don't install tests. # -install.include = $install.include/libformat/ +dir{tests/}: install = false diff --git a/libformat/libformat/buildfile b/libformat/libformat/buildfile new file mode 100644 index 0000000..4f6f156 --- /dev/null +++ b/libformat/libformat/buildfile @@ -0,0 +1,21 @@ +lib{format}: {hxx cxx}{format} hxx{export} + +# For pre-releases use the complete version to make sure they cannot be used +# in place of another pre-release or the final version. +# +if $version.pre_release + lib{format}: bin.lib.version = @"-$version.project_id" +else + lib{format}: bin.lib.version = @"-$version.major.$version.minor" + +cxx.poptions =+ "-I$out_root" "-I$src_root" +obja{*}: cxx.poptions += -DLIBFORMAT_STATIC_BUILD +objs{*}: cxx.poptions += -DLIBFORMAT_SHARED_BUILD + +lib{format}: cxx.export.poptions = "-I$out_root" "-I$src_root" +liba{format}: cxx.export.poptions += -DLIBFORMAT_STATIC +libs{format}: cxx.export.poptions += -DLIBFORMAT_SHARED + +# Install into the libformat/ subdirectory of, say, /usr/include/. +# +install.include = $install.include/libformat/ diff --git a/libformat/export.hxx b/libformat/libformat/export.hxx index 125c9df..125c9df 100644 --- a/libformat/export.hxx +++ b/libformat/libformat/export.hxx diff --git a/libformat/format.cxx b/libformat/libformat/format.cxx index 421f50d..421f50d 100644 --- a/libformat/format.cxx +++ b/libformat/libformat/format.cxx diff --git a/libformat/format.hxx b/libformat/libformat/format.hxx index 9c813ac..9c813ac 100644 --- a/libformat/format.hxx +++ b/libformat/libformat/format.hxx diff --git a/manifest b/libformat/manifest index 23cf1bb..23cf1bb 100644 --- a/manifest +++ b/libformat/manifest diff --git a/tests/.gitignore b/libformat/tests/.gitignore index e54525b..e54525b 100644 --- a/tests/.gitignore +++ b/libformat/tests/.gitignore diff --git a/tests/build/.gitignore b/libformat/tests/build/.gitignore index 225c27f..225c27f 100644 --- a/tests/build/.gitignore +++ b/libformat/tests/build/.gitignore diff --git a/tests/build/bootstrap.build b/libformat/tests/build/bootstrap.build index 2c2de24..2c2de24 100644 --- a/tests/build/bootstrap.build +++ b/libformat/tests/build/bootstrap.build diff --git a/tests/build/root.build b/libformat/tests/build/root.build index a2ee38a..a2ee38a 100644 --- a/tests/build/root.build +++ b/libformat/tests/build/root.build diff --git a/tests/buildfile b/libformat/tests/buildfile index 1a8bcc9..1a8bcc9 100644 --- a/tests/buildfile +++ b/libformat/tests/buildfile diff --git a/tests/test/buildfile b/libformat/tests/test/buildfile index 92d2804..92d2804 100644 --- a/tests/test/buildfile +++ b/libformat/tests/test/buildfile diff --git a/tests/test/driver.cxx b/libformat/tests/test/driver.cxx index fb2939d..fb2939d 100644 --- a/tests/test/driver.cxx +++ b/libformat/tests/test/driver.cxx diff --git a/tests/test/test.out b/libformat/tests/test/test.out index 8ab686e..8ab686e 100644 --- a/tests/test/test.out +++ b/libformat/tests/test/test.out |