blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 03:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

AR2V file should be in wsr88d, not in RPG subdirectory

Browse source
This commit is contained in:
Dan Paulat 2021-06-13 18:11:55 -05:00
parent 85ccd25705
commit f36d57b71d
6 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/source/scwx/wsr88d/rpg/ar2v_file.test.cpp → test/source/scwx/wsr88d/ar2v_file.test.cpp
View file

@ -1,4 +1,4 @@
#include <scwx/wsr88d/rpg/ar2v_file.hpp> #include <scwx/wsr88d/ar2v_file.hpp>
#include <fstream> #include <fstream>
@ -8,8 +8,6 @@ namespace scwx
{ {
namespace wsr88d namespace wsr88d
{ {
namespace rpg
{
TEST(ar2v_file, klsx) TEST(ar2v_file, klsx)
{ {
@ -21,6 +19,5 @@ TEST(ar2v_file, klsx)
EXPECT_EQ(fileValid, true); EXPECT_EQ(fileValid, true);
} }
} // namespace rpg
} // namespace wsr88d } // namespace wsr88d
} // namespace scwx } // namespace scwx

6
test/source/scwx/wxtest.cpp
View file

@ -1,7 +1,13 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <boost/log/expressions.hpp>
#include <boost/log/trivial.hpp>
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
boost::log::core::get()->set_filter(boost::log::trivial::severity >=
boost::log::trivial::debug);
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
} }

6
test/test.cmake
View file

@ -9,15 +9,15 @@ find_package(GTest)
set(SRC_MAIN source/scwx/wxtest.cpp) set(SRC_MAIN source/scwx/wxtest.cpp)
set(SRC_UTIL_TESTS source/scwx/util/rangebuf.test.cpp) set(SRC_UTIL_TESTS source/scwx/util/rangebuf.test.cpp)
set(SRC_WSR88D_RPG_TESTS source/scwx/wsr88d/rpg/ar2v_file.test.cpp) set(SRC_WSR88D_TESTS source/scwx/wsr88d/ar2v_file.test.cpp)
add_executable(wxtest ${SRC_MAIN} add_executable(wxtest ${SRC_MAIN}
${SRC_UTIL_TESTS} ${SRC_UTIL_TESTS}
${SRC_WSR88D_RPG_TESTS}) ${SRC_WSR88D_TESTS})
source_group("Source Files\\main" FILES ${SRC_MAIN}) source_group("Source Files\\main" FILES ${SRC_MAIN})
source_group("Source Files\\util" FILES ${SRC_UTIL_TESTS}) source_group("Source Files\\util" FILES ${SRC_UTIL_TESTS})
source_group("Source Files\\wsr88d\\rpg" FILES ${SRC_WSR88D_RPG_TESTS}) source_group("Source Files\\wsr88d" FILES ${SRC_WSR88D_TESTS})
target_include_directories(wxtest PRIVATE ${GTest_INCLUDE_DIRS}) target_include_directories(wxtest PRIVATE ${GTest_INCLUDE_DIRS})

3
wxdata/include/scwx/wsr88d/rpg/ar2v_file.hpp → wxdata/include/scwx/wsr88d/ar2v_file.hpp
View file

@ -7,8 +7,6 @@ namespace scwx
{ {
namespace wsr88d namespace wsr88d
{ {
namespace rpg
{
class Ar2vFileImpl; class Ar2vFileImpl;
@ -35,6 +33,5 @@ private:
std::unique_ptr<Ar2vFileImpl> p; std::unique_ptr<Ar2vFileImpl> p;
}; };
} // namespace rpg
} // namespace wsr88d } // namespace wsr88d
} // namespace scwx } // namespace scwx

7
wxdata/source/scwx/wsr88d/rpg/ar2v_file.cpp → wxdata/source/scwx/wsr88d/ar2v_file.cpp
View file

@ -1,4 +1,4 @@
#include <scwx/wsr88d/rpg/ar2v_file.hpp> #include <scwx/wsr88d/ar2v_file.hpp>
#include <scwx/wsr88d/rda/message_header.hpp> #include <scwx/wsr88d/rda/message_header.hpp>
#include <scwx/util/rangebuf.hpp> #include <scwx/util/rangebuf.hpp>
@ -20,10 +20,8 @@ namespace scwx
{ {
namespace wsr88d namespace wsr88d
{ {
namespace rpg
{
static const std::string logPrefix_ = "[scwx::wsr88d::rpg::ar2v_file] "; static const std::string logPrefix_ = "[scwx::wsr88d::ar2v_file] ";
class Ar2vFileImpl class Ar2vFileImpl
{ {
@ -215,6 +213,5 @@ void Ar2vFileImpl::ParseLDMRecords()
} }
} }
} // namespace rpg
} // namespace wsr88d } // namespace wsr88d
} // namespace scwx } // namespace scwx

14
wxdata/wxdata.cmake
View file

@ -4,24 +4,24 @@ find_package(Boost)
set(HDR_UTIL include/scwx/util/rangebuf.hpp) set(HDR_UTIL include/scwx/util/rangebuf.hpp)
set(SRC_UTIL source/scwx/util/rangebuf.cpp) set(SRC_UTIL source/scwx/util/rangebuf.cpp)
set(HDR_WSR88D_RPG include/scwx/wsr88d/rpg/ar2v_file.hpp) set(HDR_WSR88D include/scwx/wsr88d/ar2v_file.hpp)
set(SRC_WSR88D_RPG source/scwx/wsr88d/rpg/ar2v_file.cpp) set(SRC_WSR88D source/scwx/wsr88d/ar2v_file.cpp)
set(HDR_WSR88D_RDA include/scwx/wsr88d/rda/message_header.hpp) set(HDR_WSR88D_RDA include/scwx/wsr88d/rda/message_header.hpp)
set(SRC_WSR88D_RDA source/scwx/wsr88d/rda/message_header.cpp) set(SRC_WSR88D_RDA source/scwx/wsr88d/rda/message_header.cpp)
add_library(wxdata OBJECT ${HDR_UTIL} add_library(wxdata OBJECT ${HDR_UTIL}
${SRC_UTIL} ${SRC_UTIL}
${HDR_WSR88D}
${SRC_WSR88D}
${HDR_WSR88D_RDA} ${HDR_WSR88D_RDA}
${SRC_WSR88D_RDA} ${SRC_WSR88D_RDA})
${HDR_WSR88D_RPG}
${SRC_WSR88D_RPG})
source_group("Header Files\\util" FILES ${HDR_UTIL}) source_group("Header Files\\util" FILES ${HDR_UTIL})
source_group("Source Files\\util" FILES ${SRC_UTIL}) source_group("Source Files\\util" FILES ${SRC_UTIL})
source_group("Header Files\\wsr88d" FILES ${HDR_WSR88D})
source_group("Source Files\\wsr88d" FILES ${SRC_WSR88D})
source_group("Header Files\\wsr88d\\rda" FILES ${HDR_WSR88D_RDA}) source_group("Header Files\\wsr88d\\rda" FILES ${HDR_WSR88D_RDA})
source_group("Source Files\\wsr88d\\rda" FILES ${SRC_WSR88D_RDA}) source_group("Source Files\\wsr88d\\rda" FILES ${SRC_WSR88D_RDA})
source_group("Header Files\\wsr88d\\rpg" FILES ${HDR_WSR88D_RPG})
source_group("Source Files\\wsr88d\\rpg" FILES ${SRC_WSR88D_RPG})
target_include_directories(wxdata PRIVATE ${Boost_INCLUDE_DIR} target_include_directories(wxdata PRIVATE ${Boost_INCLUDE_DIR}
${scwx-data_SOURCE_DIR}/include ${scwx-data_SOURCE_DIR}/include