2814729ca75272a61407f9809abec3dd6097e36e ceisenhart Tue Nov 24 12:33:00 2015 -0800 Fixing a bug Jonathan caught with compiler warnings, refs #16156 diff --git src/utils/newPythonProg/newPythonProg.c src/utils/newPythonProg/newPythonProg.c index 9511390..1452983 100644 --- src/utils/newPythonProg/newPythonProg.c +++ src/utils/newPythonProg/newPythonProg.c @@ -13,50 +13,32 @@ " newPythonProg programName \"The usage statement\"\n" "options:\n" " -xxx=XXX\n" ); } /* Command line validation table. */ static struct optionSpec options[] = { {NULL, 0}, }; void makeMakefile(char *progName, char *makeName) /* Make makefile. */ { -char *upLevel; -//char *L; -//char *myLibs; FILE *f = mustOpen(makeName, "w"); -if (fileExists("../inc/common.mk")) - upLevel = cloneString(".."); -else if (fileExists("../../inc/common.mk")) - upLevel = cloneString("../.."); -else if (fileExists("../../../inc/common.mk")) - upLevel = cloneString("../../.."); -else if (fileExists("../../../../inc/common.mk")) - upLevel = cloneString("../../../.."); -else if (fileExists("../../../../../inc/common.mk")) - upLevel = cloneString("../../../../.."); -else - { - warn("WARNING: can not find inc/common.mk 1 to 4 directories up, fix the makefile"); - upLevel = cloneString("../../../../.."); - } fprintf(f, "all::\n\t cp -p %s ${HOME}/bin\n\t cp -p %s ${HOME}/kent/src/pyLib/scripts\n" "test::\n\t@if test -d tests -a -s tests/makefile; then (cd tests && ${MAKE} test); \\ " "\n\telse echo \"# no tests directory (or perhaps no tests/makefile) in $(CURDIR)\"; fi" , progName, progName); fclose(f); } void writeProgram(char *fileName, char *programName, char *usage) { FILE *programFile = mustOpen(fileName, "w"); // Write the python skeleton fprintf(programFile, "#!/usr/bin/env python2.7\n# %s\n\"\"\"%s\"\"\"\n", programName, usage); fprintf(programFile,