This reverts commit
47eba1fd0b22821100f18893d1b7e88b12d9c99f.
This commit introduce a new feature in lttng-gen-tp, but still has some
semantic issue in the notion of comments vs #include. Postpone this
feature to 2.3.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
cflags = ""
command = cc + " -c " + cflags + " -I. -llttng-ust" + " -o " + self.outputFilename + " " + cFilename
cflags = ""
command = cc + " -c " + cflags + " -I. -llttng-ust" + " -o " + self.outputFilename + " " + cFilename
- if verbose:
- print("Compile command: " + command)
subprocess.call(command.split())
class TemplateFile:
subprocess.call(command.split())
class TemplateFile:
- #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)
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)
#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
#Remove all spaces and lines
cleantext = re.sub("\s*","",nolinecomment)
#Remove multine C style comments
if self.domain != domain:
print "Warning: different domain provided (%s,%s)" % (self.domain, domain)
if self.domain != domain:
print "Warning: different domain provided (%s,%s)" % (self.domain, domain)
usage="""
lttng-gen-tp - Generate the LTTng-UST header and source based on a simple template
usage="""
lttng-gen-tp - Generate the LTTng-UST header and source based on a simple template
- 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)
except getopt.error, msg:
raise Usage(msg)
outputNames.append(a)
if o in ("-a",""):
all = True
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")
try:
if len(args) == 0:
raise Usage("No template file given")