commit dc52dfe186c9abe0be9bf5dcd2fb6b5ebc5b695e
parent 0eb6a900e87f234bb7bd32821217be3e9e0afb34
Author: Kyle Milz <kyle@getaddrinfo.net>
Date: Tue, 7 Jun 2016 19:43:30 -0600
rename citrun_instrument to citrun-inst
Diffstat:
11 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/Jamrules b/Jamrules
@@ -16,7 +16,7 @@ if $(OS) = OPENBSD {
# Link directly against libestdc++ from ports
LINKLIBS on citrun_gl = -lestdc++ -lm -lglut ;
- LINKLIBS on citrun_instrument =
+ LINKLIBS on citrun-inst =
-lestdc++
-Wl,--start-group
-lclangAST
@@ -49,7 +49,7 @@ if $(OS) = MACOSX {
# We must specify that the entry point will be available at runtime
LINKFLAGS on libcitrun.$(SHLIB_SUF) = -Wl,-U,__citrun_tu_head ;
- LINKLIBS on citrun_instrument =
+ LINKLIBS on citrun-inst =
-lc++
-lclangAST
-lclangAnalysis
@@ -76,7 +76,7 @@ if $(OS) = LINUX {
# Link directly against libestdc++ from ports
LINKLIBS on citrun_gl = -lstdc++ -lm -lglut ;
- LINKLIBS on citrun_instrument =
+ LINKLIBS on citrun-inst =
-Wl,--start-group
-lclangAST
-lclangAnalysis
diff --git a/bin/citrun-wrap.1 b/bin/citrun-wrap.1
@@ -37,7 +37,7 @@ environment variables before calling the native build command.
.Bl -tag -width Ds
.It Ev CITRUN_PATH
Points to a directory containing compiler named symlinks that all point to
-.Xr citrun_instrument 1 .
+.Xr citrun-inst 1 .
.It Ev PATH
Is prepended with
.Ev CITRUN_PATH
@@ -63,4 +63,4 @@ to the native build command. In this case that build command is
.Dl $ citrun-wrap make
.Sh SEE ALSO
.Xr citrun_gl 1 ,
-.Xr citrun_instrument 1
+.Xr citrun-inst 1
diff --git a/pkg/openbsd/devel/citrun/pkg/PLIST b/pkg/openbsd/devel/citrun/pkg/PLIST
@@ -1,11 +1,11 @@
@comment $OpenBSD$
@bin bin/citrun_gl
-@bin bin/citrun_instrument
-bin/citrun_wrap
+@bin bin/citrun-inst
+bin/citrun-wrap
@lib lib/libcitrun.so.${LIBcitrun_VERSION}
@man man/man1/citrun_gl.1
-@man man/man1/citrun_instrument.1
-@man man/man1/citrun_wrap.1
+@man man/man1/citrun-inst.1
+@man man/man1/citrun-wrap.1
share/citrun/
share/citrun/c++
share/citrun/cc
diff --git a/share/Jamfile b/share/Jamfile
@@ -4,14 +4,14 @@ actions InstallCompilerSyms
{
mkdir $(PREFIX)/share
mkdir $(PREFIX)/share/citrun
- ln -s ../../bin/citrun_instrument $(PREFIX)/share/citrun/cc
- ln -s ../../bin/citrun_instrument $(PREFIX)/share/citrun/gcc
- ln -s ../../bin/citrun_instrument $(PREFIX)/share/citrun/egcc
- ln -s ../../bin/citrun_instrument $(PREFIX)/share/citrun/clang
- ln -s ../../bin/citrun_instrument $(PREFIX)/share/citrun/c++
- ln -s ../../bin/citrun_instrument $(PREFIX)/share/citrun/g++
- ln -s ../../bin/citrun_instrument $(PREFIX)/share/citrun/eg++
- ln -s ../../bin/citrun_instrument $(PREFIX)/share/citrun/clang++
+ ln -s ../../bin/citrun-inst $(PREFIX)/share/citrun/cc
+ ln -s ../../bin/citrun-inst $(PREFIX)/share/citrun/gcc
+ ln -s ../../bin/citrun-inst $(PREFIX)/share/citrun/egcc
+ ln -s ../../bin/citrun-inst $(PREFIX)/share/citrun/clang
+ ln -s ../../bin/citrun-inst $(PREFIX)/share/citrun/c++
+ ln -s ../../bin/citrun-inst $(PREFIX)/share/citrun/g++
+ ln -s ../../bin/citrun-inst $(PREFIX)/share/citrun/eg++
+ ln -s ../../bin/citrun-inst $(PREFIX)/share/citrun/clang++
}
InstallCompilerSyms install : ;
diff --git a/share/cc b/share/cc
@@ -1 +1 @@
-../src/citrun_instrument
-\ No newline at end of file
+../src/citrun-inst
+\ No newline at end of file
diff --git a/share/gcc b/share/gcc
@@ -1 +1 @@
-../src/citrun_instrument
-\ No newline at end of file
+../src/citrun-inst
+\ No newline at end of file
diff --git a/src/Jamfile b/src/Jamfile
@@ -27,16 +27,16 @@ ObjectC++Flags $(CITRUN_SRCS) : `pkg-config $(PKG_CONFIG_LIBS) --cflags` ;
ObjectC++Flags $(CITRUN_SRCS) : -I/usr/local/include ;
# Common link libraries on all platforms
-LINKFLAGS on citrun_instrument = `llvm-config --ldflags` ;
-LINKLIBS on citrun_instrument += `llvm-config --libs bitreader mcparser transformutils option --system-libs` ;
+LINKFLAGS on citrun-inst = `llvm-config --ldflags` ;
+LINKLIBS on citrun-inst += `llvm-config --libs bitreader mcparser transformutils option --system-libs` ;
LINKLIBS on citrun_gl += `pkg-config $(PKG_CONFIG_LIBS) --libs` ;
-Main citrun_instrument : $(INSTRUMENT_SRCS) ;
+Main citrun-inst : $(INSTRUMENT_SRCS) ;
Main citrun_gl : $(CITRUN_SRCS) ;
LinkLibraries citrun_gl : libglyphy ;
-InstallBin $(PREFIX)/bin : citrun_instrument citrun_gl ;
-InstallMan $(PREFIX)/man : citrun_instrument.1 citrun_gl.1 ;
+InstallBin $(PREFIX)/bin : citrun-inst citrun_gl ;
+InstallMan $(PREFIX)/man : citrun-inst.1 citrun_gl.1 ;
SubInclude TOP src glyphy ;
diff --git a/src/citrun-inst.1 b/src/citrun-inst.1
@@ -0,0 +1,52 @@
+.Dd April 1, 2016
+.Dt CITRUN-INST 1
+.Os
+.Sh NAME
+.Nm citrun-inst
+.Nd modify command line and instrument source
+.Sh DESCRIPTION
+.Nm
+will not function correctly when invoked directly.
+.Pp
+Instead
+.Nm
+is called from compiler named symlinks put on the
+PATH by
+.Xr citrun_wrap 1 .
+This makes adding instrumentation transparent to the native build system with no
+special modifications necessary.
+.Pp
+Instrumentation will be attempted on any arguments found on the command line
+that have one of the following suffixes:
+.Pp
+.Bl -tag -width Ds -offset indent -compact
+.It c
+.It cc
+.It cpp
+.It cxx
+.El
+.Pp
+When instrumentation is successful original source file paths are replaced with
+instrumented ones. Finally the real compiler is called.
+.Pp
+When application link commands are detected flags for the citrun runtime are
+automatically added.
+.Sh ENVIRONMENT
+.Bl -tag -width Ds
+.It Ev CITRUN_PATH
+Location where compiler named symlinks are installed.
+.It Ev PATH
+Must contain
+.Ev CITRUN_PATH .
+.El
+.Sh FILES
+.Bl -tag -width Ds
+.It Pa LAST_NODE
+Last instrumented symbol name. Must be deleted after successfully linking an
+instrumented application.
+.El
+.Sh EXIT STATUS
+.Ex -std
+.Sh SEE ALSO
+.Xr citrun_gl 1 ,
+.Xr citrun_wrap 1
diff --git a/src/citrun_instrument.1 b/src/citrun_instrument.1
@@ -1,52 +0,0 @@
-.Dd April 1, 2016
-.Dt CITRUN_INSTRUMENT 1
-.Os
-.Sh NAME
-.Nm citrun_instrument
-.Nd modify command line and instrument source
-.Sh DESCRIPTION
-.Nm
-will not function correctly when invoked directly.
-.Pp
-Instead
-.Nm
-is called from compiler named symlinks put on the
-PATH by
-.Xr citrun_wrap 1 .
-This makes adding instrumentation transparent to the native build system with no
-special modifications necessary.
-.Pp
-Instrumentation will be attempted on any arguments found on the command line
-that have one of the following suffixes:
-.Pp
-.Bl -tag -width Ds -offset indent -compact
-.It c
-.It cc
-.It cpp
-.It cxx
-.El
-.Pp
-When instrumentation is successful original source file paths are replaced with
-instrumented ones. Finally the real compiler is called.
-.Pp
-When application link commands are detected flags for the citrun runtime are
-automatically added.
-.Sh ENVIRONMENT
-.Bl -tag -width Ds
-.It Ev CITRUN_PATH
-Location where compiler named symlinks are installed.
-.It Ev PATH
-Must contain
-.Ev CITRUN_PATH .
-.El
-.Sh FILES
-.Bl -tag -width Ds
-.It Pa LAST_NODE
-Last instrumented symbol name. Must be deleted after successfully linking an
-instrumented application.
-.El
-.Sh EXIT STATUS
-.Ex -std
-.Sh SEE ALSO
-.Xr citrun_gl 1 ,
-.Xr citrun_wrap 1
diff --git a/src/instrument_main.cc b/src/instrument_main.cc
@@ -120,7 +120,7 @@ int
main(int argc, char *argv[])
{
// Set a better name than the symlink that was used to find this program
- setprogname("citrun_instrument");
+ setprogname("citrun-inst");
clean_path();
std::vector<char *> args(argv, argv + argc);
diff --git a/www/index.html b/www/index.html
@@ -69,8 +69,8 @@
<p> The source tarball comes with these manuals:
</p>
<ul>
- <li><a href="man/citrun_wrap.1.html">citrun_wrap(1)</a>
- <li><a href="man/citrun_instrument.1.html">citrun_instrument(1)</a>
+ <li><a href="man/citrun-wrap.1.html">citrun-wrap(1)</a>
+ <li><a href="man/citrun-inst.1.html">citrun-inst(1)</a>
<li><a href="man/citrun_gl.1.html">citrun_gl(1)</a>
</ul>
