From 4415cdf7a92fb5f32abcc27899c9b71d4e359ffa Mon Sep 17 00:00:00 2001 From: Mykyta Biliavskyi Date: Tue, 12 May 2015 11:07:35 +0000 Subject: [PATCH] Command line: add new arguments into command line. Added next arguments: -v, --version show program version. -c, --copyright show copyright. -l, --license show license. --- src/bin/main.c | 16 +++++++--------- src/include/common.h | 45 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index 0c1e27c..91213bf 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -303,12 +303,12 @@ args_dispatch(int argc, char **argv, char *edc_path, Eina_List **img_path, if (argc == 1) goto defaults; static const Ecore_Getopt optdesc = { - "enventor", - NULL, - NULL, - NULL, - NULL, - NULL, + PACKAGE_NAME, + ENVENTOR_USAGE, + VERSION, + ENVENTOR_COPYRIGHT, + ENVENTOR_LICENSE, + ENVENTOR_INFO, EINA_TRUE, { ECORE_GETOPT_STORE_TRUE('t', "to", "Open template menu"), @@ -352,9 +352,7 @@ args_dispatch(int argc, char **argv, char *edc_path, Eina_List **img_path, exit(0); if (help) { - fprintf(stderr, "enventor [input file] [--to] " - "[--id image path] [--sd sound path] " - "[--fd font path] [--dd data path]\n"); + fprintf(stderr, ENVENTOR_HELP_EXAMPLES); exit(0); } diff --git a/src/include/common.h b/src/include/common.h index d94ab33..9caea27 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -3,6 +3,51 @@ typedef struct statusbar_s stats_data; + +#define ENVENTOR_HELP_EXAMPLES \ +"Examples of Enventor command line usage:\n \ +$ enventor\n \ +$ enventor --to\n \ +$ enventor newfile.edc --to\n \ +$ enventor sample.edc --id ./images --sd ./sounds\n" + +#define ENVENTOR_USAGE \ +"%prog [input file] [--to] [--id image path] [--sd sound path] [--fd font path] [--dd data path]" + +#define ENVENTOR_INFO \ +"\nThis is an EDC editor with some convenient functions.\n \ +It's brand new and was only started near the begining of June 2013,\n \ +so expecting it to do everything a mature script editor does \n \ +is a bit premature, but considering it's young age, it does a lot. \n \ +\nPlease see next sites for more information on these.\n \ +\n http://www.enlightenment.org \n \ +\n https://phab.enlightenment.org/w/projects/enventor/ \n \ +\n http://www.openhub.net/p/enventor\n" + +#define ENVENTOR_COPYRIGHT \ +"Copyright (C) 2013-2015 ChunEon Park and various contributors (see AUTHORS)\n \ +\nAll rights reserved.\n \ +\nRedistribution and use in source and binary forms, with or without\n \ +modification, are permitted provided that the following conditions are met:\n \ +\n 1. Redistributions of source code must retain the above copyright\n \ + notice, this list of conditions and the following disclaimer.\n \ +\n 2. Redistributions in binary form must reproduce the above copyright \n \ + notice, this list of conditions and the following disclaimer in the \n \ + documentation and/or other materials provided with the distribution.\n" + +#define ENVENTOR_LICENSE \ +"\nTHIS SOFTWARE IS PROVIDED \"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, \n \ +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND\n \ +FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE\n \ +COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,\n \ +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n \ +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,\n \ +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF\n \ +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING\n \ +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,\n \ +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" + + #define EOL "
" #define EOL_LEN 5 #define REL1_X 0.25f