Permalink
Browse files

Changed transport files to use underscores rather than dashes. This h…

…elps SCons glob correctly.
  • Loading branch information...
1 parent d6a4e5c commit 6a0ddd83d073c258b07ce8fe3bbfabed33cc7f1e @ajtack committed Apr 22, 2012
View
@@ -25,7 +25,8 @@ else:
env = common_env
headers = Glob(library_build_path + '*.hxx') + \
- Glob(library_build_path + 'transports/*.hxx')
+ Glob(library_build_path + '*.pb.h')
+transports = Glob(library_build_path + 'transports/*.hxx')
sources = Glob(library_build_path + '*.cxx') + \
Glob(library_build_path + '*.proto') + \
Glob(library_build_path + 'transports/*.cxx')
@@ -52,3 +53,4 @@ Default(library, unit_tests)
prefix = '/usr/local'
env.Alias('install', env.Install('/usr/local/lib', library))
env.Alias('install', env.Install('/usr/local/include/riak', headers))
+env.Alias('install', env.Install('/usr/local/include/riak/transports', transports))
View
@@ -37,7 +37,7 @@ DEBFILES = [
("usr/include/riak/sibling_resolution.hxx", "#riak/sibling_resolution.hxx"),
("usr/include/riak/transport.hxx", "#riak/transport.hxx"),
("usr/include/riak/utilities.hxx", "#riak/utilities.hxx"),
- ("usr/include/riak/transports/single-serial-socket.hxx", "#riak/transports/single-serial-socket.hxx"),
+ ("usr/include/riak/transports/single_serial_socket.hxx", "#riak/transports/single_serial_socket.hxx"),
("usr/lib/libriak.a", "#libriak.a"),
]
View
@@ -120,7 +120,7 @@
<ClInclude Include="response_handlers.hxx" />
<ClInclude Include="sibling_resolution.hxx" />
<ClInclude Include="transport.hxx" />
- <ClInclude Include="transports\single-serial-socket.hxx" />
+ <ClInclude Include="transports\single_serial_socket.hxx" />
<ClInclude Include="utilities.hxx" />
</ItemGroup>
<ItemGroup>
@@ -65,7 +65,7 @@
<ClInclude Include="transport.hxx">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="transports\single-serial-socket.hxx">
+ <ClInclude Include="transports\single_serial_socket.hxx">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="utilities.hxx">
@@ -1,7 +1,7 @@
#include <boost/asio/read.hpp>
#include <boost/asio/write.hpp>
#include <boost/lexical_cast.hpp>
-#include <riak/transports/single-serial-socket.hxx>
+#include <riak/transports/single_serial_socket.hxx>
#include <system_error>
namespace asio = boost::asio;
View
@@ -5,7 +5,7 @@
#include <cstdatomic>
#include <functional>
#include <riak/client.hxx>
-#include <riak/transports/single-serial-socket.hxx>
+#include <riak/transports/single_serial_socket.hxx>
#include <test/tools/use-case-control.hxx>
using namespace boost;
@@ -2,7 +2,7 @@
#include <boost/format.hpp>
#include <functional>
#include <riak/client.hxx>
-#include <riak/transports/single-serial-socket.hxx>
+#include <riak/transports/single_serial_socket.hxx>
#include <test/tools/use-case-control.hxx>
using namespace boost;
@@ -2,7 +2,7 @@
#include <boost/format.hpp>
#include <functional>
#include <riak/client.hxx>
-#include <riak/transports/single-serial-socket.hxx>
+#include <riak/transports/single_serial_socket.hxx>
#include <test/tools/use-case-control.hxx>
using namespace boost;
@@ -2,7 +2,7 @@
#include <boost/format.hpp>
#include <functional>
#include <riak/client.hxx>
-#include <riak/transports/single-serial-socket.hxx>
+#include <riak/transports/single_serial_socket.hxx>
#include <test/tools/use-case-control.hxx>
using namespace boost;

0 comments on commit 6a0ddd8

Please sign in to comment.