Browse Source

Remove CONFIG 'copy' operation. Bugfix release version 1.2.1.

git-svn-id: https://klish.googlecode.com/svn/trunk@200 0eaa4687-2ee9-07dd-09d9-bcdd2d2dd5fb
Serj Kalichev 13 years ago
parent
commit
9fa463bd0c
6 changed files with 14 additions and 16 deletions
  1. 2 0
      CHANGES
  2. 0 1
      clish.xsd
  3. 1 2
      clish/command.h
  4. 0 2
      clish/shell/shell_tinyxml_read.cpp
  5. 10 10
      configure
  6. 1 1
      configure.ac

+ 2 - 0
CHANGES

@@ -8,6 +8,8 @@ of Newport Networks. (http://www.newport-networks.com)
 
     Serj Kalichev
 
+\section _1_2_1 1.2.1
+
 \section _1_2_0 1.2.0
 
 \section _1_1_0 1.1.0

+ 0 - 1
clish.xsd

@@ -400,7 +400,6 @@
             <xs:enumeration value="set"/>
             <xs:enumeration value="unset"/>
             <xs:enumeration value="dump"/>
-            <xs:enumeration value="copy"/>
         </xs:restriction>
     </xs:simpleType>
 

+ 1 - 2
clish/command.h

@@ -16,8 +16,7 @@ typedef enum {
 	CLISH_CONFIG_NONE,
 	CLISH_CONFIG_SET,
 	CLISH_CONFIG_UNSET,
-	CLISH_CONFIG_DUMP,
-	CLISH_CONFIG_COPY
+	CLISH_CONFIG_DUMP
 } clish_config_operation_t;
 
 /*=====================================

+ 0 - 2
clish/shell/shell_tinyxml_read.cpp

@@ -538,8 +538,6 @@ process_config(clish_shell_t * shell, TiXmlElement * element, void *parent)
 		clish_command__set_cfg_op(cmd, CLISH_CONFIG_NONE);
 	else if (operation && !lub_string_nocasecmp(operation, "dump"))
 		clish_command__set_cfg_op(cmd, CLISH_CONFIG_DUMP);
-	else if (operation && !lub_string_nocasecmp(operation, "copy"))
-		clish_command__set_cfg_op(cmd, CLISH_CONFIG_COPY);
 	else {
 		clish_command__set_cfg_op(cmd, CLISH_CONFIG_SET);
 		/* The priority if no clearly specified */

+ 10 - 10
configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for clish 1.2.0.
+# Generated by GNU Autoconf 2.64 for clish 1.2.1.
 #
 # Report bugs to <serj.kalichev at gmail dot com>.
 #
@@ -698,8 +698,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='clish'
 PACKAGE_TARNAME='clish'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='clish 1.2.0'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='clish 1.2.1'
 PACKAGE_BUGREPORT='serj.kalichev at gmail dot com'
 PACKAGE_URL=''
 
@@ -1450,7 +1450,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures clish 1.2.0 to adapt to many kinds of systems.
+\`configure' configures clish 1.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1520,7 +1520,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of clish 1.2.0:";;
+     short | recursive ) echo "Configuration of clish 1.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1630,7 +1630,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-clish configure 1.2.0
+clish configure 1.2.1
 generated by GNU Autoconf 2.64
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2300,7 +2300,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by clish $as_me 1.2.0, which was
+It was created by clish $as_me 1.2.1, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
@@ -14368,7 +14368,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='clish'
- VERSION='1.2.0'
+ VERSION='1.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15888,7 +15888,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by clish $as_me 1.2.0, which was
+This file was extended by clish $as_me 1.2.1, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15952,7 +15952,7 @@ Report bugs to <serj.kalichev at gmail dot com>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-clish config.status 1.2.0
+clish config.status 1.2.1
 configured by $0, generated by GNU Autoconf 2.64,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

+ 1 - 1
configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 m4_define([MAJOR_VERSION], 1)
 m4_define([MINOR_VERSION], 2)
-m4_define([MICRO_VERSION], 0)
+m4_define([MICRO_VERSION], 1)
 
 AC_PREREQ(2.59)
 AC_INIT([clish],