projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use ust_lock during sock_info operations for atomicity against fork
[lttng-ust.git]
/
tools
/
lttng-gen-tp
diff --git
a/tools/lttng-gen-tp
b/tools/lttng-gen-tp
index ed0c48fa549973f844e4001cb99adbc2b8325959..6aa1bba15d05012cf75e8d3aa0af69d4efa67bdf 100755
(executable)
--- a/
tools/lttng-gen-tp
+++ b/
tools/lttng-gen-tp
@@
-1,4
+1,4
@@
-#!/usr/bin/python
+#!/usr/bin/
env
python
#
# Copyright (c) 2012 Yannick Brosseau <yannick.brosseau@gmail.com>
#
#
# Copyright (c) 2012 Yannick Brosseau <yannick.brosseau@gmail.com>
#
@@
-79,7
+79,9
@@
class CFile:
def write(self):
outputFile = open(self.outputFilename,"w")
def write(self):
outputFile = open(self.outputFilename,"w")
- headerFilename = self.outputFilename.replace(".c",".h")
+ headerFilename = self.outputFilename
+ if headerFilename.endswith(".c"):
+ headerFilename = headerFilename[:-2] + ".h"
outputFile.write(CFile.FILE_TPL.format(
headerFilename = headerFilename))
outputFile.write(CFile.FILE_TPL.format(
headerFilename = headerFilename))
@@
-94,7
+96,7
@@
class ObjFile:
if 'CC' in os.environ:
cc = os.environ['CC']
try:
if 'CC' in os.environ:
cc = os.environ['CC']
try:
- subprocess.call(cc,
+ subprocess.call(cc
.split()
,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
except OSError as msg:
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
except OSError as msg:
@@
-126,24
+128,27
@@
class ObjFile:
return cc
def write(self):
return cc
def write(self):
- cFilename = self.outputFilename.replace(".o",".c")
+ cFilename = self.outputFilename
+ if cFilename.endswith(".o"):
+ cFilename = cFilename[:-2] + ".c"
+
cc = self._detectCC()
if cc == "":
raise RuntimeError("No C Compiler detected")
if 'CPPFLAGS' in os.environ:
cc = self._detectCC()
if cc == "":
raise RuntimeError("No C Compiler detected")
if 'CPPFLAGS' in os.environ:
- cppflags = os.environ['CPPFLAGS']
+ cppflags =
" " +
os.environ['CPPFLAGS']
else:
cppflags = ""
if 'CFLAGS' in os.environ:
else:
cppflags = ""
if 'CFLAGS' in os.environ:
- cflags = os.environ['CFLAGS']
+ cflags =
" " +
os.environ['CFLAGS']
else:
cflags = ""
if 'LDFLAGS' in os.environ:
else:
cflags = ""
if 'LDFLAGS' in os.environ:
- ldflags = os.environ['LDFLAGS']
+ ldflags =
" " +
os.environ['LDFLAGS']
else:
ldflags = ""
else:
ldflags = ""
- command = cc + " -c
" + cppflags + cflags + ldflags + " -I. -llttng-ust" + " -o " + self.outputFilename + " " + cFilename
+ command = cc + " -c" + cppflags + cflags + ldflags + " -I. -llttng-ust" + " -o " + self.outputFilename + " " + cFilename
if verbose:
print("Compile command: " + command)
subprocess.call(command.split())
if verbose:
print("Compile command: " + command)
subprocess.call(command.split())
This page took
0.025632 seconds
and
4
git commands to generate.