diff --git a/libgrive/CMakeLists.txt b/libgrive/CMakeLists.txt index b000be3..2ee6d92 100644 --- a/libgrive/CMakeLists.txt +++ b/libgrive/CMakeLists.txt @@ -69,8 +69,8 @@ add_definitions( -DSRC_DIR="${libgrive_SOURCE_DIR}/src" ) -add_library( grive SHARED ${LIBGRIVE_SRC} ${OPT_SRC} ) -add_library( grive-static STATIC ${LIBGRIVE_SRC} ${OPT_SRC} ) +#add_library( grive SHARED ${LIBGRIVE_SRC} ${OPT_SRC} ) +add_library( grive STATIC ${LIBGRIVE_SRC} ${OPT_SRC} ) target_link_libraries( grive ${CURL_LIBRARIES} @@ -83,19 +83,19 @@ target_link_libraries( grive ${OPT_LIBS} ) -set_target_properties(grive PROPERTIES - SOVERSION 0 VERSION ${GRIVE_VERSION} -) +#set_target_properties(grive PROPERTIES +# SOVERSION 0 VERSION ${GRIVE_VERSION} +#) -set_target_properties(grive grive-static PROPERTIES OUTPUT_NAME grive) +#set_target_properties(grive grive-static PROPERTIES OUTPUT_NAME grive) if ( LIB_INSTALL_DIR ) else() set ( LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib ) endif() -install(TARGETS grive LIBRARY DESTINATION ${LIB_INSTALL_DIR} ) -install(TARGETS grive-static ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ) +#install(TARGETS grive LIBRARY DESTINATION ${LIB_INSTALL_DIR} ) +install(TARGETS grive ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ) install(FILES ${DRIVE_HEADERS} DESTINATION include/grive/drive) install(FILES ${PROTOCOL_HEADERS} DESTINATION include/grive/protocol) install(FILES ${UTIL_HEADERS} DESTINATION include/grive/util) diff --git a/libgrive/test/drive/ResourceTest.cc b/libgrive/test/drive/ResourceTest.cc index 38f958e..adee751 100644 --- a/libgrive/test/drive/ResourceTest.cc +++ b/libgrive/test/drive/ResourceTest.cc @@ -36,10 +36,11 @@ ResourceTest::ResourceTest( ) void ResourceTest::TestNormal( ) { - Json json ; - json.Add( "name", Json( "abc.txt" ) ) ; + Resource root ; + Resource subject( "abc.txt", "file" ) ; + root.AddChild( &subject ) ; -// Resource subject( json, 0 ) ; + GRUT_ASSERT_EQUAL( subject.Path(), fs::path( "./abc.txt" ) ) ; } } // end of namespace grut diff --git a/libgrive/test/drive/StateTest.cc b/libgrive/test/drive/StateTest.cc index 71ed8be..9e33fcf 100644 --- a/libgrive/test/drive/StateTest.cc +++ b/libgrive/test/drive/StateTest.cc @@ -37,15 +37,6 @@ StateTest::StateTest( ) void StateTest::TestSync( ) { - State s( TEST_DATA "/test_dir1.state", Json() ) ; - Resource *r = s.Find( "./folder1/abc.txt" ) ; - CPPUNIT_ASSERT( r != 0 ) ; - GRUT_ASSERT_EQUAL( r->Name(), "abc.txt" ) ; - - Trace( "state %1% = %2%", r->Name(), r->StateStr() ) ; - - // load directory - s.FromLocal( TEST_DATA "/test_dir1" ) ; } } // end of namespace grut