X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tools%2Flttng-gen-tp;h=5937dfdfe1793f61b46c43e544d41f2b109d0674;hb=d307167e57f3cba83c37da0c8b71618325d6ae8e;hp=1ff91464acc0a4441efa9a4a1a8a0ff6c5b7b8e3;hpb=47eba1fd0b22821100f18893d1b7e88b12d9c99f;p=lttng-ust.git diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp index 1ff91464..5937dfdf 100755 --- a/tools/lttng-gen-tp +++ b/tools/lttng-gen-tp @@ -145,8 +145,6 @@ class ObjFile: cflags = "" command = cc + " -c " + cflags + " -I. -llttng-ust" + " -o " + self.outputFilename + " " + cFilename - if verbose: - print("Compile command: " + command) subprocess.call(command.split()) class TemplateFile: @@ -161,16 +159,12 @@ class TemplateFile: self.text = f.read() - #Remove # comments (from input and output file) but keep - # #include in the output file - removeComments = re.compile("#[^include].*$",flags=re.MULTILINE) + #Remove # comments (from input and output file + removeComments = re.compile("#.*$",flags=re.MULTILINE) self.text = removeComments.sub("",self.text) - # Remove #include directive from the parsed text - removePreprocess = re.compile("#.*$",flags=re.MULTILINE) - noPreprocess = removePreprocess.sub("", self.text) #Remove // comments removeLineComment = re.compile("\/\/.*$",flags=re.MULTILINE) - nolinecomment = removeLineComment.sub("", noPreprocess) + nolinecomment = removeLineComment.sub("",self.text) #Remove all spaces and lines cleantext = re.sub("\s*","",nolinecomment) #Remove multine C style comments @@ -190,8 +184,6 @@ class TemplateFile: if self.domain != domain: print "Warning: different domain provided (%s,%s)" % (self.domain, domain) -verbose=False - usage=""" lttng-gen-tp - Generate the LTTng-UST header and source based on a simple template @@ -214,7 +206,7 @@ def main(argv=None): try: try: - opts, args = getopt.gnu_getopt(argv[1:], "ho:av", ["help","verbose"]) + opts, args = getopt.gnu_getopt(argv[1:], "ho:a", ["help"]) except getopt.error, msg: raise Usage(msg) @@ -232,9 +224,6 @@ def main(argv=None): outputNames.append(a) if o in ("-a",""): all = True - if o in ("-v", "--verbose"): - global verbose - verbose = True try: if len(args) == 0: raise Usage("No template file given")