[GRASS-SVN] r63222 - in grass/branches/releasebranch_7_0: . general/g.parser include lib/gis
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Nov 28 01:04:18 PST 2014
Author: martinl
Date: 2014-11-28 01:04:17 -0800 (Fri, 28 Nov 2014)
New Revision: 63222
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/general/g.parser/standard_option.c
grass/branches/releasebranch_7_0/include/gis.h
grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
Log:
libgis: add G_OPT_F_BIN_INPUT (make distclean REQUIRED)
(merge r63220 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,
63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,
63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220
Modified: grass/branches/releasebranch_7_0/general/g.parser/standard_option.c
===================================================================
--- grass/branches/releasebranch_7_0/general/g.parser/standard_option.c 2014-11-28 09:01:38 UTC (rev 63221)
+++ grass/branches/releasebranch_7_0/general/g.parser/standard_option.c 2014-11-28 09:04:17 UTC (rev 63222)
@@ -48,6 +48,7 @@
"G_OPT_V_ID",
"G_OPT_V_IDS",
"G_OPT_F_INPUT",
+ "G_OPT_F_BIN_INPUT",
"G_OPT_F_OUTPUT",
"G_OPT_F_SEP",
"G_OPT_C_FG",
Modified: grass/branches/releasebranch_7_0/include/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/gis.h 2014-11-28 09:01:38 UTC (rev 63221)
+++ grass/branches/releasebranch_7_0/include/gis.h 2014-11-28 09:04:17 UTC (rev 63222)
@@ -254,6 +254,7 @@
G_OPT_V_IDS, /*!< more feature ids */
G_OPT_F_INPUT, /*!< old input file */
+ G_OPT_F_BIN_INPUT, /*!< old binary input file */
G_OPT_F_OUTPUT, /*!< new output file */
G_OPT_F_SEP, /*!< data field separator */
Modified: grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c 2014-11-28 09:01:38 UTC (rev 63221)
+++ grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c 2014-11-28 09:04:17 UTC (rev 63222)
@@ -3,7 +3,7 @@
\brief GIS Library - Argument parsing functions (standard options)
- (C) 2001-2013 by the GRASS Development Team
+ (C) 2001-2014 by the GRASS Development Team
This program is free software under the GNU General Public License
(>=v2). Read the file COPYING that comes with GRASS for details.
@@ -87,6 +87,7 @@
- files
- G_OPT_F_INPUT
+ - G_OPT_F_BIN_INPUT
- G_OPT_F_OUTPUT
- G_OPT_F_SEP
@@ -561,6 +562,14 @@
Opt->gisprompt = "old,file,file";
Opt->description = _("Name of input file");
break;
+ case G_OPT_F_BIN_INPUT:
+ Opt->key = "input";
+ Opt->type = TYPE_STRING;
+ Opt->key_desc = "name";
+ Opt->required = YES;
+ Opt->gisprompt = "old,bin,file";
+ Opt->description = _("Name of input file");
+ break;
case G_OPT_F_OUTPUT:
Opt->key = "output";
Opt->type = TYPE_STRING;
More information about the grass-commit
mailing list