diff options
| -rw-r--r-- | buildfile | 9 | ||||
| -rw-r--r-- | libhello/.gitignore (renamed from .gitignore) | 0 | ||||
| -rw-r--r-- | libhello/INSTALL (renamed from INSTALL) | 0 | ||||
| -rw-r--r-- | libhello/build/.gitignore (renamed from build/.gitignore) | 0 | ||||
| -rw-r--r-- | libhello/build/bootstrap.build (renamed from build/bootstrap.build) | 0 | ||||
| -rw-r--r-- | libhello/build/export.build (renamed from build/export.build) | 0 | ||||
| -rw-r--r-- | libhello/build/root.build (renamed from build/root.build) | 0 | ||||
| -rw-r--r-- | libhello/buildfile | 29 | ||||
| -rw-r--r-- | libhello/libhello/buildfile | 26 | ||||
| -rw-r--r-- | libhello/libhello/export.hxx (renamed from libhello/export.hxx) | 0 | ||||
| -rw-r--r-- | libhello/libhello/hello.cxx (renamed from libhello/hello.cxx) | 0 | ||||
| -rw-r--r-- | libhello/libhello/hello.hxx (renamed from libhello/hello.hxx) | 0 | ||||
| -rw-r--r-- | libhello/manifest (renamed from manifest) | 0 | ||||
| -rw-r--r-- | libhello/tests/.gitignore (renamed from tests/.gitignore) | 0 | ||||
| -rw-r--r-- | libhello/tests/build/.gitignore (renamed from tests/build/.gitignore) | 0 | ||||
| -rw-r--r-- | libhello/tests/build/bootstrap.build (renamed from tests/build/bootstrap.build) | 0 | ||||
| -rw-r--r-- | libhello/tests/build/root.build (renamed from tests/build/root.build) | 0 | ||||
| -rw-r--r-- | libhello/tests/buildfile (renamed from tests/buildfile) | 0 | ||||
| -rw-r--r-- | libhello/tests/test/buildfile (renamed from tests/test/buildfile) | 0 | ||||
| -rw-r--r-- | libhello/tests/test/driver.cxx (renamed from tests/test/driver.cxx) | 0 | ||||
| -rw-r--r-- | libhello/tests/test/test.out (renamed from tests/test/test.out) | 0 |
21 files changed, 32 insertions, 32 deletions
diff --git a/buildfile b/buildfile deleted file mode 100644 index b3ad7e3..0000000 --- a/buildfile +++ /dev/null @@ -1,9 +0,0 @@ -./: libhello/ tests/ doc{INSTALL version} file{manifest} - -doc{version}: file{manifest} # Generated by the version module. -doc{version}: dist = true - -# Don't install tests or the INSTALL file. -# -dir{tests/}: install = false -doc{INSTALL}@./: install = false diff --git a/.gitignore b/libhello/.gitignore index a887fdd..a887fdd 100644 --- a/.gitignore +++ b/libhello/.gitignore diff --git a/INSTALL b/libhello/INSTALL index 485b10f..485b10f 100644 --- a/INSTALL +++ b/libhello/INSTALL diff --git a/build/.gitignore b/libhello/build/.gitignore index 225c27f..225c27f 100644 --- a/build/.gitignore +++ b/libhello/build/.gitignore diff --git a/build/bootstrap.build b/libhello/build/bootstrap.build index 1ff153d..1ff153d 100644 --- a/build/bootstrap.build +++ b/libhello/build/bootstrap.build diff --git a/build/export.build b/libhello/build/export.build index 0151425..0151425 100644 --- a/build/export.build +++ b/libhello/build/export.build diff --git a/build/root.build b/libhello/build/root.build index 8ceadfa..8ceadfa 100644 --- a/build/root.build +++ b/libhello/build/root.build diff --git a/libhello/buildfile b/libhello/buildfile index e65edde..b3ad7e3 100644 --- a/libhello/buildfile +++ b/libhello/buildfile @@ -1,26 +1,9 @@ -import int_libs = libformat%lib{format} -import imp_libs = libprint%lib{print} +./: libhello/ tests/ doc{INSTALL version} file{manifest} -lib{hello}: {hxx cxx}{hello} hxx{export} $imp_libs $int_libs +doc{version}: file{manifest} # Generated by the version module. +doc{version}: dist = true -# For pre-releases use the complete version to make sure they cannot be used -# in place of another pre-release or the final version. +# Don't install tests or the INSTALL file. # -if $version.pre_release - lib{hello}: bin.lib.version = @"-$version.project_id" -else - lib{hello}: bin.lib.version = @"-$version.major.$version.minor" - -cxx.poptions =+ "-I$out_root" "-I$src_root" -obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD -objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD - -lib{hello}: cxx.export.poptions = "-I$out_root" "-I$src_root" -liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC -libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED - -lib{hello}: cxx.export.libs = $int_libs - -# Install into the libhello/ subdirectory of, say, /usr/include/. -# -install.include = $install.include/libhello/ +dir{tests/}: install = false +doc{INSTALL}@./: install = false diff --git a/libhello/libhello/buildfile b/libhello/libhello/buildfile new file mode 100644 index 0000000..e65edde --- /dev/null +++ b/libhello/libhello/buildfile @@ -0,0 +1,26 @@ +import int_libs = libformat%lib{format} +import imp_libs = libprint%lib{print} + +lib{hello}: {hxx cxx}{hello} hxx{export} $imp_libs $int_libs + +# 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{hello}: bin.lib.version = @"-$version.project_id" +else + lib{hello}: bin.lib.version = @"-$version.major.$version.minor" + +cxx.poptions =+ "-I$out_root" "-I$src_root" +obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD +objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD + +lib{hello}: cxx.export.poptions = "-I$out_root" "-I$src_root" +liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC +libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED + +lib{hello}: cxx.export.libs = $int_libs + +# Install into the libhello/ subdirectory of, say, /usr/include/. +# +install.include = $install.include/libhello/ diff --git a/libhello/export.hxx b/libhello/libhello/export.hxx index e6c723e..e6c723e 100644 --- a/libhello/export.hxx +++ b/libhello/libhello/export.hxx diff --git a/libhello/hello.cxx b/libhello/libhello/hello.cxx index f7e3b7f..f7e3b7f 100644 --- a/libhello/hello.cxx +++ b/libhello/libhello/hello.cxx diff --git a/libhello/hello.hxx b/libhello/libhello/hello.hxx index ccc43c2..ccc43c2 100644 --- a/libhello/hello.hxx +++ b/libhello/libhello/hello.hxx diff --git a/manifest b/libhello/manifest index fee9ce7..fee9ce7 100644 --- a/manifest +++ b/libhello/manifest diff --git a/tests/.gitignore b/libhello/tests/.gitignore index e54525b..e54525b 100644 --- a/tests/.gitignore +++ b/libhello/tests/.gitignore diff --git a/tests/build/.gitignore b/libhello/tests/build/.gitignore index 225c27f..225c27f 100644 --- a/tests/build/.gitignore +++ b/libhello/tests/build/.gitignore diff --git a/tests/build/bootstrap.build b/libhello/tests/build/bootstrap.build index 2c2de24..2c2de24 100644 --- a/tests/build/bootstrap.build +++ b/libhello/tests/build/bootstrap.build diff --git a/tests/build/root.build b/libhello/tests/build/root.build index a2ee38a..a2ee38a 100644 --- a/tests/build/root.build +++ b/libhello/tests/build/root.build diff --git a/tests/buildfile b/libhello/tests/buildfile index 1a8bcc9..1a8bcc9 100644 --- a/tests/buildfile +++ b/libhello/tests/buildfile diff --git a/tests/test/buildfile b/libhello/tests/test/buildfile index a46969d..a46969d 100644 --- a/tests/test/buildfile +++ b/libhello/tests/test/buildfile diff --git a/tests/test/driver.cxx b/libhello/tests/test/driver.cxx index 38937f0..38937f0 100644 --- a/tests/test/driver.cxx +++ b/libhello/tests/test/driver.cxx diff --git a/tests/test/test.out b/libhello/tests/test/test.out index 8ab686e..8ab686e 100644 --- a/tests/test/test.out +++ b/libhello/tests/test/test.out |