summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL22
-rw-r--r--build/import/libcutl/LICENSE21
-rw-r--r--build/import/libcutl/configuration-rules.make15
-rwxr-xr-xbuild/import/libcutl/configure55
-rw-r--r--build/import/libcutl/stub.make30
-rw-r--r--cli/makefile9
6 files changed, 144 insertions, 8 deletions
diff --git a/INSTALL b/INSTALL
index 452909c..479660e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +1,18 @@
+General
+-------
+
+Unless you are using the cli+dep package, you will also need to install
+the following dependencies:
+
+ libcutl >= 1.0.0 http://www.codesynthesis.com/projects/libcult/
+
+Additionally for UNIX-like operating systems:
+
+ build >= 0.3.4 http://kolpackov.net/projects/build/
+
+The cli+dep package comes with the necessary dependencies bundled.
+
+
UNIX
----
@@ -6,13 +21,6 @@ Most recent GNU/Linux distributions should already have this version
installed. To check the GNU make version run make (or gmake) with the
--version option.
-Unless you are using the cli+dep package, you will also need to install
-build 0.3.4 or later:
-
-http://kolpackov.net/projects/build/
-
-The cli+dep package comes with the necessary build files bundled.
-
To build the compiler, tests, and examples simply run make in the root
directory of the package. To run the automated tests, run 'make test'.
To clean the object file, executables, etc., run 'make clean'. To de-
diff --git a/build/import/libcutl/LICENSE b/build/import/libcutl/LICENSE
new file mode 100644
index 0000000..5306eea
--- /dev/null
+++ b/build/import/libcutl/LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) Code Synthesis Tools CC, 2009.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/build/import/libcutl/configuration-rules.make b/build/import/libcutl/configuration-rules.make
new file mode 100644
index 0000000..e10fef3
--- /dev/null
+++ b/build/import/libcutl/configuration-rules.make
@@ -0,0 +1,15 @@
+# file : build/import/libcutl/configuration-rules.make
+# author : Boris Kolpackov <boris@kolpackov.net>
+# copyright : Copyright (c) 2009 Code Synthesis Tools CC
+# license : MIT; see accompanying LICENSE file
+
+$(dcf_root)/import/libcutl/configuration-dynamic.make: | $(dcf_root)/import/libcutl/.
+ $(call message,,$(scf_root)/import/libcutl/configure $@)
+
+ifndef %foreign%
+
+disfigure::
+ $(call message,rm $(dcf_root)/import/libcutl/configuration-dynamic.make,\
+rm -f $(dcf_root)/import/libcutl/configuration-dynamic.make)
+
+endif
diff --git a/build/import/libcutl/configure b/build/import/libcutl/configure
new file mode 100755
index 0000000..b06e6f5
--- /dev/null
+++ b/build/import/libcutl/configure
@@ -0,0 +1,55 @@
+#! /usr/bin/env bash
+
+# file : build/import/libcutl/configure
+# author : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009 Code Synthesis Tools CC
+# license : MIT; see accompanying LICENSE file
+
+
+# $1 - out file
+#
+# bld_root - build root
+# project_name - project name
+#
+
+source $bld_root/dialog.bash
+
+
+$echo
+$echo "Configuring external dependency on 'libcutl' for '$project_name'."
+$echo
+
+$echo
+$echo "Would you like to configure dependency on the installed "
+$echo "version of 'libcutl' as opposed to the development build?"
+$echo
+
+installed=`read_y_n y`
+
+path=
+
+if [ "$installed" = "n" ]; then
+
+$echo
+$echo "Please enter the src_root for 'libcutl'."
+$echo
+
+src_root=`read_path --directory --exist`
+
+$echo
+$echo "Please enter the out_root for 'libcutl'."
+$echo
+
+out_root=`read_path --directory $src_root`
+
+fi
+
+echo libcutl_installed := $installed >$1
+
+if [ "$installed" = "n" ]; then
+
+echo src_root := $src_root >>$1
+echo scf_root := \$\(src_root\)/build >>$1
+echo out_root := $out_root >>$1
+
+fi
diff --git a/build/import/libcutl/stub.make b/build/import/libcutl/stub.make
new file mode 100644
index 0000000..15fa9dd
--- /dev/null
+++ b/build/import/libcutl/stub.make
@@ -0,0 +1,30 @@
+# file : build/import/libcutl/stub.make
+# author : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009 Code Synthesis Tools CC
+# license : MIT; see accompanying LICENSE file
+
+$(call include-once,$(scf_root)/import/libcutl/configuration-rules.make,$(dcf_root))
+
+libcutl_installed :=
+
+$(call -include,$(dcf_root)/import/libcutl/configuration-dynamic.make)
+
+ifdef libcutl_installed
+
+ifeq ($(libcutl_installed),y)
+
+$(call export,l: -lcutl,cpp-options: )
+
+else
+
+# Include export stub.
+#
+$(call include,$(scf_root)/export/libcutl/stub.make)
+
+endif
+
+else
+
+.NOTPARALLEL:
+
+endif
diff --git a/cli/makefile b/cli/makefile
index faea51c..e2158d4 100644
--- a/cli/makefile
+++ b/cli/makefile
@@ -17,11 +17,18 @@ dist := $(out_base)/.dist
clean := $(out_base)/.clean
install := $(out_base)/.install
+# Import.
+#
+$(call import,\
+ $(scf_root)/import/libcutl/stub.make,\
+ l: cutl.l,cpp-options: cutl.l.cpp-options)
+
# Build.
#
-$(cli): $(cxx_obj)
+$(cli): $(cxx_obj) $(cutl.l)
$(cxx_obj) $(cxx_od): cpp_options := -I$(src_base)
+$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options)
$(call include-dep,$(cxx_od))