a44421a79fb36cc2036fe116b97ea3bc9590cd0c
braney
  Fri Dec 2 09:34:39 2011 -0800
removed rcsid (#295)
diff --git src/hg/autoSql/autoSql.c src/hg/autoSql/autoSql.c
index e8bb640..7e753a0 100644
--- src/hg/autoSql/autoSql.c
+++ src/hg/autoSql/autoSql.c
@@ -6,62 +6,58 @@
  * changes from here I'd rewrite it though.  The tokenizer is
  * pretty sound, the parser isn't bad (though the language it
  * parses is quirky), but the code generator is u-g-l-y.
  *
  * This file is copyright 2002-2005 Jim Kent, but license is hereby
  * granted for all use - public, private or commercial. */
 
 #include "common.h"
 #include "errabort.h"
 #include "linefile.h"
 #include "obscure.h"
 #include "dystring.h"
 #include "asParse.h"
 #include "options.h"
 
-static char const rcsid[] = "$Id: autoSql.c,v 1.39 2010/01/07 19:13:42 markd Exp $";
 
 boolean withNull = FALSE;
 boolean makeJson = FALSE;
-boolean addRcsId = TRUE;
 
 void usage()
 /* Explain usage and exit. */
 {
 errAbort("autoSql - create SQL and C code for permanently storing\n"
          "a structure in database and loading it back into memory\n"
 	 "based on a specification file\n"
 	 "usage:\n"
 	 "    autoSql specFile outRoot {optional: -dbLink -withNull -json} \n"
 	 "This will create outRoot.sql outRoot.c and outRoot.h based\n"
 	 "on the contents of specFile. \n"
          "\n"
          "options:\n"
          "  -dbLink - optionally generates code to execute queries and\n"
          "            updates of the table.\n"
 	 "  -withNull - optionally generates code and .sql to enable\n"
          "              applications to accept and load data into objects\n"
 	 "              with potential 'missing data' (NULL in SQL)\n"
          "              situations.\n"
-         "  -noRcsIds - don't add rcsid definitions to generate code.\n"
 	 "  -json - generate method to output the object in JSON format.\n");
 }
 
 static struct optionSpec optionSpecs[] = {
     {"dbLink", OPTION_BOOLEAN},
     {"withNull", OPTION_BOOLEAN},
-    {"noRcsIds", OPTION_BOOLEAN},
     {"json", OPTION_BOOLEAN},
     {NULL, 0}
 };
 
 void sqlColumn(struct asColumn *col, FILE *f)
 /* Print out column in SQL. */
 {
 fprintf(f, "    %s ", col->name);
 struct dyString *type = asColumnToSqlType(col);
 fprintf(f, "%s", type->string);
 if (!withNull)
     fprintf(f, " not null");
 fputc(',', f);
 fprintf(f, "\t# %s\n", col->comment);
 dyStringFree(&type);
@@ -1750,31 +1746,30 @@
 {
 struct asObject *objList, *obj;
 char *outRoot, outTail[256];
 char dotC[256];
 char dotH[256];
 char dotSql[256];
 FILE *cFile;
 FILE *hFile;
 FILE *sqlFile;
 char defineName[256];
 boolean doDbLoadAndSave = FALSE;
 
 optionInit(&argc, argv, optionSpecs);
 doDbLoadAndSave = optionExists("dbLink");
 withNull = optionExists("withNull");
-addRcsId = !optionExists("noRcsIds");
 makeJson = optionExists("json");
 
 if (argc != 3)
     usage();
 
 objList = asParseFile(argv[1]);
 outRoot = argv[2];
 /* don't embed directories in files */
 splitPath(outRoot, NULL, outTail, NULL);
 
 sprintf(dotC, "%s.c", outRoot);
 cFile = mustOpen(dotC, "w");
 sprintf(dotH, "%s.h", outRoot);
 hFile = mustOpen(dotH, "w");
 sprintf(dotSql, "%s.sql", outRoot);
@@ -1804,34 +1799,29 @@
 fprintf(hFile, "#ifndef %s\n", defineName);
 fprintf(hFile, "#define %s\n\n", defineName);
 if(doDbLoadAndSave)
     {
     fprintf(hFile, "#include \"jksql.h\"\n");
     }
 
 /* Put the usual includes in .c file, and also include .h file we are
  * generating. */
 fprintf(cFile, "#include \"common.h\"\n");
 fprintf(cFile, "#include \"linefile.h\"\n");
 fprintf(cFile, "#include \"dystring.h\"\n");
 fprintf(cFile, "#include \"jksql.h\"\n");
 fprintf(cFile, "#include \"%s\"\n", dotH);
 fprintf(cFile, "\n");
-if (addRcsId)
-    {
-    /* split string so cvs doesn't substitute in this file */
-    fprintf(cFile, "static char const rcsid[] = \"$" "Id:" "$\";\n");
-    }
 fprintf(cFile, "\n");
 
 /* Process each object in specification file and output to .c, 
  * .h, and .sql. */
 for (obj = objList; obj != NULL; obj = obj->next)
     genObjectCode(obj, doDbLoadAndSave, cFile, hFile, sqlFile);
 
 fprintf(cFile, "/* -------------------------------- End autoSql Generated Code -------------------------------- */\n\n");
 fprintf(hFile, "/* -------------------------------- End autoSql Generated Code -------------------------------- */\n\n");
 /* Finish off H file bracket. */
 fprintf(hFile, "#endif /* %s */\n\n", defineName);
 return 0;
 }