Merge pull request #341 from webmaster128/cmd-cli

Rename cmd/app -> cli

43 files changed, 36 insertions, 36 deletions

diff --git a/configure.py b/configure.py
index 85e441666..8c1118cc4 100755
--- a/configure.py
+++ b/configure.py
@@ -104,8 +104,8 @@ class BuildConfigurationInformation(object):
         self.build_dir = os.path.join(options.with_build_dir, 'build')
 
         self.obj_dir = os.path.join(self.build_dir, 'obj')
-        self.appobj_dir = os.path.join(self.obj_dir, 'app')
         self.libobj_dir = os.path.join(self.obj_dir, 'lib')
+        self.cliobj_dir = os.path.join(self.obj_dir, 'cli')
         self.testobj_dir = os.path.join(self.obj_dir, 'test')
 
         self.doc_output_dir = os.path.join(self.build_dir, 'docs')
@@ -134,7 +134,7 @@ class BuildConfigurationInformation(object):
                     if filename.endswith('.cpp') and not filename.startswith('.'):
                         yield os.path.join(dirpath, filename)
 
-        self.app_sources = list(find_sources_in(self.src_dir, 'cmd'))
+        self.cli_sources = list(find_sources_in(self.src_dir, 'cli'))
         self.test_sources = list(find_sources_in(self.src_dir, 'tests'))
 
         self.python_dir = os.path.join(options.src_dir, 'python')
@@ -166,7 +166,7 @@ class BuildConfigurationInformation(object):
 
         def build_dirs():
             yield self.libobj_dir
-            yield self.appobj_dir
+            yield self.cliobj_dir
             yield self.testobj_dir
             yield self.botan_include_dir
             yield self.internal_include_dir
@@ -180,8 +180,8 @@ class BuildConfigurationInformation(object):
     def src_info(self, typ):
         if typ == 'lib':
             return (self.build_sources, self.libobj_dir)
-        elif typ == 'app':
-            return (self.app_sources, self.appobj_dir)
+        elif typ == 'cli':
+            return (self.cli_sources, self.cliobj_dir)
         elif typ == 'test':
             return (self.test_sources, self.testobj_dir)
 
@@ -1155,7 +1155,7 @@ def gen_makefile_lists(var, build_config, options, modules, cc, arch, osinfo):
                 cc.output_to_option)
 
 
-    for t in ['lib', 'app', 'test']:
+    for t in ['lib', 'cli', 'test']:
         obj_key = '%s_objs' % (t)
         src_list, src_dir = build_config.src_info(t)
         var[obj_key] = makefile_list(objectfile_list(src_list, src_dir))
@@ -1267,8 +1267,8 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
 
         'build_shared_lib': options.build_shared_lib,
 
-        'appobj_dir': build_config.appobj_dir,
         'libobj_dir': build_config.libobj_dir,
+        'cliobj_dir': build_config.cliobj_dir,
         'testobj_dir': build_config.testobj_dir,
 
         'doc_output_dir': build_config.doc_output_dir,
@@ -1301,7 +1301,7 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
         'libname': 'botan' if options.os == 'windows' else 'botan-%d.%d' % (build_config.version_major, build_config.version_minor),
 
         'lib_link_cmd':  cc.so_link_command_for(osinfo.basename, options),
-        'app_link_cmd':  cc.binary_link_command_for(osinfo.basename, options),
+        'cli_link_cmd':  cc.binary_link_command_for(osinfo.basename, options),
         'test_link_cmd': cc.binary_link_command_for(osinfo.basename, options),
 
         'link_to': ' '.join([cc.add_lib_option + lib for lib in link_to()] + [cc.add_framework_option + fw for fw in link_to_frameworks()]),
@@ -1350,10 +1350,10 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
         }
 
     if options.os == 'darwin' and options.build_shared_lib:
-        vars['app_post_link_cmd']  = 'install_name_tool -change "/$(SONAME_ABI)" "@executable_path/$(SONAME_ABI)" $(APP)'
+        vars['cli_post_link_cmd']  = 'install_name_tool -change "/$(SONAME_ABI)" "@executable_path/$(SONAME_ABI)" $(CLI)'
         vars['test_post_link_cmd'] = 'install_name_tool -change "/$(SONAME_ABI)" "@executable_path/$(SONAME_ABI)" $(TEST)'
     else:
-        vars['app_post_link_cmd'] = ''
+        vars['cli_post_link_cmd'] = ''
         vars['test_post_link_cmd'] = ''
 
     gen_makefile_lists(vars, build_config, options, modules, cc, arch, osinfo)
diff --git a/doc/hacking.rst b/doc/hacking.rst
index 41ec9ca01..64098cb8a 100644
--- a/doc/hacking.rst
+++ b/doc/hacking.rst
@@ -5,7 +5,7 @@ Source Code Layout
 Under `src` there are directories
 
 * `lib` is the library itself, more on that below
-* `cmd` is the implementation of the command line application.
+* `cli` (command line interface) is the implementation of the command line application.
   It is structed as a multicall binary so each program is relatively
   independent.
 * `tests` contain what you would expect. Input files go under `tests/data`.
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in
index 4eb4b0fe6..d68db271c 100644
--- a/src/build-data/makefile/gmake.in
+++ b/src/build-data/makefile/gmake.in
@@ -3,7 +3,7 @@
 %{gmake_commands_in}
 
 # Executable targets
-APP           = %{out_dir}/botan%{program_suffix}
+CLI           = %{out_dir}/botan%{program_suffix}
 TEST          = %{out_dir}/botan-test%{program_suffix}
 
 # Library targets
@@ -16,26 +16,26 @@ INCLUDE_DIR   = %{botan_include_dir}
 
 LIBOBJS       = %{lib_objs}
 
-APPOBJS       = %{app_objs}
+CLIOBJS       = %{cli_objs}
 
 TESTOBJS      = %{test_objs}
 
 # First make target. Will be used by default
-all: $(APP) $(TEST)
+all: $(CLI) $(TEST)
 
 # Build Commands
 %{lib_build_cmds}
 
-%{app_build_cmds}
+%{cli_build_cmds}
 
 %{test_build_cmds}
 
 # Link Commands
 %{gmake_dso_in}
 
-$(APP): $(LIBRARIES) $(APPOBJS)
-	$(APP_LINK_CMD) $(LDFLAGS) $(APPOBJS) -L%{out_dir} -l%{libname} $(APP_LINKS_TO) -o $(APP)
-	$(APP_POST_LINK_CMD)
+$(CLI): $(LIBRARIES) $(CLIOBJS)
+	$(CLI_LINK_CMD) $(LDFLAGS) $(CLIOBJS) -L%{out_dir} -l%{libname} $(CLI_LINKS_TO) -o $(CLI)
+	$(CLI_POST_LINK_CMD)
 
 $(TEST): $(LIBRARIES) $(TESTOBJS)
 	$(TEST_LINK_CMD) $(LDFLAGS) $(TESTOBJS) -L%{out_dir} -l%{libname} $(TEST_LINKS_TO) -o $(TEST)
@@ -57,9 +57,9 @@ SPHINX_OPTS = -b html
 clean:
 	-$(RM) %{libobj_dir}/*
 	-$(RM) %{testobj_dir}/*
-	-$(RM) %{appobj_dir}/*
+	-$(RM) %{cliobj_dir}/*
 	-$(RM) $(SONAME) $(SYMLINK)
-	-$(RM) $(LIBRARIES) $(APP) $(TEST)
+	-$(RM) $(LIBRARIES) $(CLI) $(TEST)
 
 distclean: clean
 	$(RM) Makefile
@@ -72,5 +72,5 @@ valgrind:
 docs:
 %{build_doc_commands}
 
-install: $(APP) docs
+install: $(CLI) docs
 	$(SCRIPTS_DIR)/install.py --destdir=%{destdir} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir}
diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in
index eaf4b511d..6e432440c 100644
--- a/src/build-data/makefile/header.in
+++ b/src/build-data/makefile/header.in
@@ -7,18 +7,18 @@ WARN_FLAGS     = %{cc_warning_flags}
 SO_OBJ_FLAGS   = %{shared_flags}
 
 LIB_LINK_CMD   = %{lib_link_cmd}
-APP_LINK_CMD   = %{app_link_cmd}
+CLI_LINK_CMD   = %{cli_link_cmd}
 TEST_LINK_CMD  = %{test_link_cmd}
 
 LIB_LINKS_TO   = %{link_to}
-APP_LINKS_TO   = $(LIB_LINKS_TO)
+CLI_LINKS_TO   = $(LIB_LINKS_TO)
 TEST_LINKS_TO  = $(LIB_LINKS_TO)
 
 LIB_FLAGS      = $(SO_OBJ_FLAGS) $(CXXFLAGS) $(WARN_FLAGS)
-APP_FLAGS      = $(CXXFLAGS) $(WARN_FLAGS)
+CLI_FLAGS      = $(CXXFLAGS) $(WARN_FLAGS)
 TEST_FLAGS     = $(CXXFLAGS) $(WARN_FLAGS)
 
 SCRIPTS_DIR    = %{scripts_dir}
 
-APP_POST_LINK_CMD  = %{app_post_link_cmd}
+CLI_POST_LINK_CMD  = %{cli_post_link_cmd}
 TEST_POST_LINK_CMD = %{test_post_link_cmd}
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 88188071b..119e91849 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -14,7 +14,7 @@ RM_R          = $(RM) /S
 RMDIR         = @rmdir
 
 # Executable targets
-APP           = %{out_dir}\botan%{program_suffix}
+CLI           = %{out_dir}\botan%{program_suffix}
 TEST          = %{out_dir}\botan-test%{program_suffix}
 
 # Library targets
@@ -37,24 +37,24 @@ LIBRARIES     = $(SO_FILENAME)
 # File Lists
 LIBOBJS       = %{lib_objs}
 
-APPOBJS       = %{app_objs}
+CLIOBJS       = %{cli_objs}
 
 TESTOBJS      = %{test_objs}
 
 # First make target. Will be used by default
-all: $(APP) $(TEST)
+all: $(CLI) $(TEST)
 
 # Build Commands
 %{lib_build_cmds}
 
-%{app_build_cmds}
+%{cli_build_cmds}
 
 %{test_build_cmds}
 
 # Link Commands
-$(APP): $(LIBRARIES) $(APPOBJS)
-	$(APP_LINK_CMD) /OUT:$@ $(APPOBJS) $(LIB_FILENAME) $(APP_LINKS_TO)
-	$(APP_POST_LINK_CMD)
+$(CLI): $(LIBRARIES) $(CLIOBJS)
+	$(CLI_LINK_CMD) /OUT:$@ $(CLIOBJS) $(LIB_FILENAME) $(CLI_LINKS_TO)
+	$(CLI_POST_LINK_CMD)
 
 $(TEST): $(LIBRARIES) $(TESTOBJS)
 	$(TEST_LINK_CMD) /OUT:$@ $(TESTOBJS) $(LIB_FILENAME) $(TEST_LINKS_TO)
@@ -81,12 +81,12 @@ docs:
 
 clean:
 	-$(RM) %{libobj_dir}\*
+	-$(RM) %{cliobj_dir}\*
 	-$(RM) %{testobj_dir}\*
-	-$(RM) %{appobj_dir}\*
 	-$(RM) %{out_dir}\*.manifest
 	-$(RM) %{out_dir}\*.exp
 	-$(RM) %{out_dir}\*.dll
-	-$(RM) $(LIBRARIES) $(APP) $(TEST)
+	-$(RM) $(LIBRARIES) $(CLI) $(TEST)
 
 distclean: clean
 	$(RM_R) %{build_dir}
@@ -95,7 +95,7 @@ distclean: clean
 	$(RMDIR) %{build_dir}\include
 	$(RMDIR) %{build_dir}\lib %{build_dir}\tests
 	$(RMDIR) %{build_dir}
-	$(RM) Makefile $(LIB_BASENAME).* $(APP).*
+	$(RM) Makefile $(LIB_BASENAME).* $(CLI).*
 
-install: $(APP) docs
+install: $(CLI) docs
 	$(SCRIPTS_DIR)\install.py --destdir=%{destdir} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir}
diff --git a/src/cmd/apps.h b/src/cli/apps.h
index 9f1f00ba2..9f1f00ba2 100644
--- a/src/cmd/apps.h
+++ b/src/cli/apps.h
diff --git a/src/cmd/asn1.cpp b/src/cli/asn1.cpp
index 2aa94cc39..2aa94cc39 100644
--- a/src/cmd/asn1.cpp
+++ b/src/cli/asn1.cpp
diff --git a/src/cmd/base64.cpp b/src/cli/base64.cpp
index d2a9a1853..d2a9a1853 100644
--- a/src/cmd/base64.cpp
+++ b/src/cli/base64.cpp
diff --git a/src/cmd/bcrypt.cpp b/src/cli/bcrypt.cpp
index 81f7c536e..81f7c536e 100644
--- a/src/cmd/bcrypt.cpp
+++ b/src/cli/bcrypt.cpp
diff --git a/src/cmd/ca.cpp b/src/cli/ca.cpp
index fb6d9582a..fb6d9582a 100644
--- a/src/cmd/ca.cpp
+++ b/src/cli/ca.cpp
diff --git a/src/cmd/cert_verify.cpp b/src/cli/cert_verify.cpp
index 7a1bec983..7a1bec983 100644
--- a/src/cmd/cert_verify.cpp
+++ b/src/cli/cert_verify.cpp
diff --git a/src/cmd/compress.cpp b/src/cli/compress.cpp
index 93bc76eb4..93bc76eb4 100644
--- a/src/cmd/compress.cpp
+++ b/src/cli/compress.cpp
diff --git a/src/cmd/credentials.h b/src/cli/credentials.h
index 06349657d..06349657d 100644
--- a/src/cmd/credentials.h
+++ b/src/cli/credentials.h
diff --git a/src/cmd/dl_group.cpp b/src/cli/dl_group.cpp
index e9a4f3fd4..e9a4f3fd4 100644
--- a/src/cmd/dl_group.cpp
+++ b/src/cli/dl_group.cpp
diff --git a/src/cmd/dsa_sign.cpp b/src/cli/dsa_sign.cpp
index 03aede585..03aede585 100644
--- a/src/cmd/dsa_sign.cpp
+++ b/src/cli/dsa_sign.cpp
diff --git a/src/cmd/dsa_ver.cpp b/src/cli/dsa_ver.cpp
index 64d60a5cf..64d60a5cf 100644
--- a/src/cmd/dsa_ver.cpp
+++ b/src/cli/dsa_ver.cpp
diff --git a/src/cmd/factor.cpp b/src/cli/factor.cpp
index d2c0a2df5..d2c0a2df5 100644
--- a/src/cmd/factor.cpp
+++ b/src/cli/factor.cpp
diff --git a/src/cmd/fpe.cpp b/src/cli/fpe.cpp
index 97ca34b24..97ca34b24 100644
--- a/src/cmd/fpe.cpp
+++ b/src/cli/fpe.cpp
diff --git a/src/cmd/fuzzer.cpp b/src/cli/fuzzer.cpp
index 35adb9711..35adb9711 100644
--- a/src/cmd/fuzzer.cpp
+++ b/src/cli/fuzzer.cpp
diff --git a/src/cmd/getopt.cpp b/src/cli/getopt.cpp
index 7b7e14932..7b7e14932 100644
--- a/src/cmd/getopt.cpp
+++ b/src/cli/getopt.cpp
diff --git a/src/cmd/getopt.h b/src/cli/getopt.h
index f683159d0..f683159d0 100644
--- a/src/cmd/getopt.h
+++ b/src/cli/getopt.h
diff --git a/src/cmd/hash.cpp b/src/cli/hash.cpp
index 81a72ca17..81a72ca17 100644
--- a/src/cmd/hash.cpp
+++ b/src/cli/hash.cpp
diff --git a/src/cmd/implementation/speed.h b/src/cli/implementation/speed.h
index 3cfd0ef61..3cfd0ef61 100644
--- a/src/cmd/implementation/speed.h
+++ b/src/cli/implementation/speed.h
diff --git a/src/cmd/implementation/speed_prime.cpp b/src/cli/implementation/speed_prime.cpp
index a7a344bef..a7a344bef 100644
--- a/src/cmd/implementation/speed_prime.cpp
+++ b/src/cli/implementation/speed_prime.cpp
diff --git a/src/cmd/implementation/speed_public_key.cpp b/src/cli/implementation/speed_public_key.cpp
index 2ff49bd15..2ff49bd15 100644
--- a/src/cmd/implementation/speed_public_key.cpp
+++ b/src/cli/implementation/speed_public_key.cpp
diff --git a/src/cmd/implementation/speed_transform.cpp b/src/cli/implementation/speed_transform.cpp
index 2db5cdd70..2db5cdd70 100644
--- a/src/cmd/implementation/speed_transform.cpp
+++ b/src/cli/implementation/speed_transform.cpp
diff --git a/src/cmd/implementation/timer.cpp b/src/cli/implementation/timer.cpp
index 14e55316b..14e55316b 100644
--- a/src/cmd/implementation/timer.cpp
+++ b/src/cli/implementation/timer.cpp
diff --git a/src/cmd/implementation/timer.h b/src/cli/implementation/timer.h
index ac5bd5cef..ac5bd5cef 100644
--- a/src/cmd/implementation/timer.h
+++ b/src/cli/implementation/timer.h
diff --git a/src/cmd/is_prime.cpp b/src/cli/is_prime.cpp
index 71fec730b..71fec730b 100644
--- a/src/cmd/is_prime.cpp
+++ b/src/cli/is_prime.cpp
diff --git a/src/cmd/keygen.cpp b/src/cli/keygen.cpp
index 168b27a4a..168b27a4a 100644
--- a/src/cmd/keygen.cpp
+++ b/src/cli/keygen.cpp
diff --git a/src/cmd/main.cpp b/src/cli/main.cpp
index 8d229ce0e..8d229ce0e 100644
--- a/src/cmd/main.cpp
+++ b/src/cli/main.cpp
diff --git a/src/cmd/mce.cpp b/src/cli/mce.cpp
index 226f21e9c..226f21e9c 100644
--- a/src/cmd/mce.cpp
+++ b/src/cli/mce.cpp
diff --git a/src/cmd/ocsp.cpp b/src/cli/ocsp.cpp
index e5b42b076..e5b42b076 100644
--- a/src/cmd/ocsp.cpp
+++ b/src/cli/ocsp.cpp
diff --git a/src/cmd/pkcs10.cpp b/src/cli/pkcs10.cpp
index 106fe2c24..106fe2c24 100644
--- a/src/cmd/pkcs10.cpp
+++ b/src/cli/pkcs10.cpp
diff --git a/src/cmd/pkcs8.cpp b/src/cli/pkcs8.cpp
index 7bc1c2561..7bc1c2561 100644
--- a/src/cmd/pkcs8.cpp
+++ b/src/cli/pkcs8.cpp
diff --git a/src/cmd/prime.cpp b/src/cli/prime.cpp
index 82efa75d2..82efa75d2 100644
--- a/src/cmd/prime.cpp
+++ b/src/cli/prime.cpp
diff --git a/src/cmd/rng.cpp b/src/cli/rng.cpp
index 3fe8719ce..3fe8719ce 100644
--- a/src/cmd/rng.cpp
+++ b/src/cli/rng.cpp
diff --git a/src/cmd/self_sig.cpp b/src/cli/self_sig.cpp
index 2c43f7acc..2c43f7acc 100644
--- a/src/cmd/self_sig.cpp
+++ b/src/cli/self_sig.cpp
diff --git a/src/cmd/speed.cpp b/src/cli/speed.cpp
index e8d30c6f1..e8d30c6f1 100644
--- a/src/cmd/speed.cpp
+++ b/src/cli/speed.cpp
diff --git a/src/cmd/tls_client.cpp b/src/cli/tls_client.cpp
index 7f74e1a37..7f74e1a37 100644
--- a/src/cmd/tls_client.cpp
+++ b/src/cli/tls_client.cpp
diff --git a/src/cmd/tls_proxy.cpp b/src/cli/tls_proxy.cpp
index 5071cb8bb..5071cb8bb 100644
--- a/src/cmd/tls_proxy.cpp
+++ b/src/cli/tls_proxy.cpp
diff --git a/src/cmd/tls_server.cpp b/src/cli/tls_server.cpp
index ea68208b6..ea68208b6 100644
--- a/src/cmd/tls_server.cpp
+++ b/src/cli/tls_server.cpp
diff --git a/src/cmd/x509print.cpp b/src/cli/x509print.cpp
index e583c91c2..e583c91c2 100644
--- a/src/cmd/x509print.cpp
+++ b/src/cli/x509print.cpp