Commit 8bb0bda2 authored by Paul Lensing's avatar Paul Lensing
Browse files

Updated examples to 3.0.0 API changes. Updated CMake file to build 

automatically with 3.0.0 client.
parent 73f3330a

CMakeLists.txt

+20 −25
Original line number Diff line number Diff line
@@ -9,38 +9,33 @@ set(GENERATED_SOURCES_PATH ${kinetic_cpp_client_SOURCE_DIR}/src/main/generated) 


include(ExternalProject)



set(KINETIC_CLIENT_PATH "~/git/kinetic-cpp-client")

set(KINETIC_BUILD_PATH "~/git/kinetic-cpp-client")



#option(USE_LOCAL_KINETIC_CLIENT "Uses the kinetic client at the KINETIC_CLIENT_PATH variable instead of downloading library from Git" off)

#set(KINETIC_CLIENT_PATH "~/git/kinetic-cpp-client")

#else(USE_LOCAL_KINETIC_CLIENT)

#    set(KINETIC_CLIENT_PATH "${CMAKE_BINARY_DIR}/vendor/src/kinetic_cpp_client")

#

#    ExternalProject_add(

#        kinetic_cpp_client

#        PREFIX "vendor"

#        GIT_REPOSITORY "https://github.com/Seagate/kinetic-cpp-client.git"

#        GIT_TAG "0.0.9"

#        BUILD_IN_SOURCE 1

#        INSTALL_COMMAND ""

#    )

#endif(USE_LOCAL_KINETIC_CLIENT)

option(USE_LOCAL_KINETIC_CLIENT "Uses the kinetic client at the KINETIC_CLIENT_PATH variable instead of downloading library from Git" off)

if(USE_LOCAL_KINETIC_CLIENT)

else(USE_LOCAL_KINETIC_CLIENT)

    set(KINETIC_CLIENT_PATH "${CMAKE_BINARY_DIR}/vendor/src/kinetic_cpp_client")

    ExternalProject_add(

        kinetic_cpp_client

        PREFIX "vendor"

        GIT_REPOSITORY "https://github.com/plensing/kinetic-cpp-client.git"

        GIT_TAG ""

        BUILD_IN_SOURCE 1

        INSTALL_COMMAND ""

    )

endif(USE_LOCAL_KINETIC_CLIENT)



include_directories(

    ${KINETIC_BUILD_PATH}/vendor/include

    ${KINETIC_CLIENT_PATH}/vendor/include

    ${KINETIC_CLIENT_PATH}/src/main/generated

    ${KINETIC_CLIENT_PATH}/include

)





set(LIBRARY_DEPENDENCIES

    ${KINETIC_BUILD_PATH}/libkinetic_client.a

    ${KINETIC_BUILD_PATH}/vendor/lib/libglog.a

    ${KINETIC_BUILD_PATH}/vendor/lib/libgflags.a

    ${KINETIC_BUILD_PATH}/vendor/lib/libssl.a

    ${KINETIC_BUILD_PATH}/vendor/lib/libcrypto.a

    ${KINETIC_BUILD_PATH}/vendor/lib/libprotobuf.a

    ${KINETIC_CLIENT_PATH}/libkinetic_client.a

    ${KINETIC_CLIENT_PATH}/vendor/lib/libglog.a

    ${KINETIC_CLIENT_PATH}/vendor/lib/libgflags.a

    ${KINETIC_CLIENT_PATH}/vendor/lib/libssl.a

    ${KINETIC_CLIENT_PATH}/vendor/lib/libcrypto.a

    ${KINETIC_CLIENT_PATH}/vendor/lib/libprotobuf.a

    ${CMAKE_THREAD_LIBS_INIT}

    dl

)

src/ise.cc

+10 −2
Original line number Diff line number Diff line
@@ -41,11 +41,19 @@ int example_main( 
        char** argv) {

    shared_ptr<string> pin(new string(FLAGS_pin));



    KineticStatus status = blocking_connection->InstantSecureErase(pin);

    KineticStatus status = blocking_connection->InstantErase(pin);

    bool success = status.ok();



    if (!success) {

        printf("Unable to execute ISE: %d %s\n", static_cast<int>(status.statusCode()), status.message().c_str());

        printf("Unable to execute InstantErase: %d %s\n", static_cast<int>(status.statusCode()), status.message().c_str());

        return 1;

    }



    status = blocking_connection->SecureErase(pin);

    success = status.ok();



    if (!success) {

        printf("Unable to execute SecureErase: %d %s\n", static_cast<int>(status.statusCode()), status.message().c_str());

        return 1;

    }

src/setpin.cc

+4 −4
Original line number Diff line number Diff line
@@ -43,17 +43,17 @@ int example_main( 
    bool success;



    if (FLAGS_old_pin.empty()) {

        success = blocking_connection->SetPin(make_shared<string>(FLAGS_new_pin)).ok();

        success = blocking_connection->SetErasePIN(make_shared<string>(FLAGS_new_pin)).ok();

    } else {

        auto pin = make_shared<string>(FLAGS_old_pin);

        success = blocking_connection->SetPin(make_shared<string>(FLAGS_new_pin), pin).ok();

        success = blocking_connection->SetErasePIN(make_shared<string>(FLAGS_new_pin), pin).ok();

    }



    if (success) {

        printf("Finished setting pin\n");

        printf("Finished setting erase pin\n");

        return 0;

    } else {

        printf("Unable to change pin\n");

        printf("Unable to change erase pin\n");

        return 1;

    }

}