commit fc33834d06d565f3c3ba0258f42f1a394affe446
parent dc52dfe186c9abe0be9bf5dcd2fb6b5ebc5b695e
Author: Kyle Milz <kyle@getaddrinfo.net>
Date: Tue, 7 Jun 2016 19:54:37 -0600
rename citrun_gl to citrun-gl
Diffstat:
10 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/Jamrules b/Jamrules
@@ -14,7 +14,7 @@ if $(OS) = OPENBSD {
PKG_CONFIG_LIBS = gl glew freetype2 ;
# Link directly against libestdc++ from ports
- LINKLIBS on citrun_gl = -lestdc++ -lm -lglut ;
+ LINKLIBS on citrun-gl = -lestdc++ -lm -lglut ;
LINKLIBS on citrun-inst =
-lestdc++
@@ -43,8 +43,8 @@ if $(OS) = MACOSX {
C++FLAGS = -Wno-deprecated -DLLVM_VER=37 ;
PKG_CONFIG_LIBS = glew freetype2 ;
- LINKLIBS on citrun_gl = -framework OpenGL -framework GLUT ;
- LINKLIBS on citrun_gl += -lc++ -lm ;
+ LINKLIBS on citrun-gl = -framework OpenGL -framework GLUT ;
+ LINKLIBS on citrun-gl += -lc++ -lm ;
# We must specify that the entry point will be available at runtime
LINKFLAGS on libcitrun.$(SHLIB_SUF) = -Wl,-U,__citrun_tu_head ;
@@ -74,7 +74,7 @@ if $(OS) = LINUX {
PKG_CONFIG_LIBS = gl glew freetype2 ;
# Link directly against libestdc++ from ports
- LINKLIBS on citrun_gl = -lstdc++ -lm -lglut ;
+ LINKLIBS on citrun-gl = -lstdc++ -lm -lglut ;
LINKLIBS on citrun-inst =
-Wl,--start-group
diff --git a/bin/citrun-wrap.1 b/bin/citrun-wrap.1
@@ -62,5 +62,5 @@ to the native build command. In this case that build command is
.Pp
.Dl $ citrun-wrap make
.Sh SEE ALSO
-.Xr citrun_gl 1 ,
+.Xr citrun-gl 1 ,
.Xr citrun-inst 1
diff --git a/lib/runtime.c b/lib/runtime.c
@@ -50,7 +50,7 @@ control_thread(void *arg)
/* The default socket location can be overridden */
if ((viewer_sock = getenv("CITRUN_SOCKET")) == NULL)
/* There was an error getting the env var, use the default */
- viewer_sock = "/tmp/citrun_gl.socket";
+ viewer_sock = "/tmp/citrun-gl.socket";
/* Connect the socket to the server */
memset(&addr, 0, sizeof(addr));
diff --git a/pkg/openbsd/devel/citrun/pkg/PLIST b/pkg/openbsd/devel/citrun/pkg/PLIST
@@ -1,9 +1,9 @@
@comment $OpenBSD$
-@bin bin/citrun_gl
+@bin bin/citrun-gl
@bin bin/citrun-inst
bin/citrun-wrap
@lib lib/libcitrun.so.${LIBcitrun_VERSION}
-@man man/man1/citrun_gl.1
+@man man/man1/citrun-gl.1
@man man/man1/citrun-inst.1
@man man/man1/citrun-wrap.1
share/citrun/
diff --git a/src/Jamfile b/src/Jamfile
@@ -29,14 +29,14 @@ ObjectC++Flags $(CITRUN_SRCS) : -I/usr/local/include ;
# Common link libraries on all platforms
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` ;
+LINKLIBS on citrun-gl += `pkg-config $(PKG_CONFIG_LIBS) --libs` ;
Main citrun-inst : $(INSTRUMENT_SRCS) ;
-Main citrun_gl : $(CITRUN_SRCS) ;
+Main citrun-gl : $(CITRUN_SRCS) ;
-LinkLibraries citrun_gl : libglyphy ;
+LinkLibraries citrun-gl : libglyphy ;
-InstallBin $(PREFIX)/bin : citrun-inst citrun_gl ;
-InstallMan $(PREFIX)/man : citrun-inst.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/af_unix.cc b/src/af_unix.cc
@@ -40,7 +40,7 @@ af_unix::set_listen()
struct sockaddr_un addr;
memset(&addr, 0, sizeof(addr));
addr.sun_family = AF_UNIX;
- strncpy(addr.sun_path, "/tmp/citrun_gl.socket", sizeof(addr.sun_path) - 1);
+ strncpy(addr.sun_path, "/tmp/citrun-gl.socket", sizeof(addr.sun_path) - 1);
if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)))
err(1, "bind");
@@ -122,5 +122,5 @@ af_unix::read_all(uint8_t *buf, size_t bytes_total)
af_unix::~af_unix()
{
close(fd);
- unlink("/tmp/citrun_gl.socket");
+ unlink("/tmp/citrun-gl.socket");
}
diff --git a/src/citrun-gl.1 b/src/citrun-gl.1
@@ -0,0 +1,26 @@
+.Dd April 9, 2016
+.Dt CITRUN-GL 1
+.Os
+.Sh NAME
+.Nm citrun-gl
+.Nd watch instrumented binaries run
+.Sh SYNOPSIS
+.Nm
+.Sh DESCRIPTION
+Displays executing source code from any instrumented binaries running on the
+system.
+.Pp
+Instrumented binaries built with
+.Xr citrun-wrap 1
+automatically attempt connections to the
+.Nm
+socket.
+.Sh FILES
+.Bl -tag -width Ds
+.It Pa /tmp/citrun-gl.socket
+Default listening socket.
+.El
+.Sh EXIT STATUS
+.Ex -std
+.Sh SEE ALSO
+.Xr citrun-wrap 1
diff --git a/src/citrun-inst.1 b/src/citrun-inst.1
@@ -12,7 +12,7 @@ Instead
.Nm
is called from compiler named symlinks put on the
PATH by
-.Xr citrun_wrap 1 .
+.Xr citrun-wrap 1 .
This makes adding instrumentation transparent to the native build system with no
special modifications necessary.
.Pp
@@ -48,5 +48,5 @@ instrumented application.
.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO
-.Xr citrun_gl 1 ,
-.Xr citrun_wrap 1
+.Xr citrun-gl 1 ,
+.Xr citrun-wrap 1
diff --git a/src/citrun_gl.1 b/src/citrun_gl.1
@@ -1,26 +0,0 @@
-.Dd April 9, 2016
-.Dt CITRUN_GL 1
-.Os
-.Sh NAME
-.Nm citrun_gl
-.Nd watch instrumented binaries run
-.Sh SYNOPSIS
-.Nm
-.Sh DESCRIPTION
-Displays executing source code from any instrumented binaries running on the
-system.
-.Pp
-Instrumented binaries built with
-.Xr citrun_wrap 1
-automatically attempt connections to the
-.Nm
-socket.
-.Sh FILES
-.Bl -tag -width Ds
-.It Pa /tmp/citrun_gl.socket
-Default listening socket.
-.El
-.Sh EXIT STATUS
-.Ex -std
-.Sh SEE ALSO
-.Xr citrun_wrap 1
diff --git a/www/index.html b/www/index.html
@@ -69,9 +69,9 @@
<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-gl.1.html">citrun-gl(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>
+ <li><a href="man/citrun-wrap.1.html">citrun-wrap(1)</a>
</ul>
<h2>Building</h2>
