github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

libfreerdp-common: move assistance code

Browse Source
This commit is contained in:
Marc-André Moreau 2014-06-30 09:40:24 -04:00
parent dadba85f99
commit 7a50525880
9 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/common/CMakeLists.txt
View File

@ -28,7 +28,6 @@ endif()
set(${MODULE_PREFIX}_SRCS set(${MODULE_PREFIX}_SRCS
client.c client.c
cmdline.c cmdline.c
assistance.c
compatibility.c compatibility.c
compatibility.h compatibility.h
file.c) file.c)
@ -73,4 +72,5 @@ set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Common")
if(BUILD_TESTING) if(BUILD_TESTING)
add_subdirectory(test) add_subdirectory(test)
endif() endif()
export_complex_library(LIBNAME ${MODULE_NAME}) export_complex_library(LIBNAME ${MODULE_NAME})

2
client/common/client.c
View File

@ -24,10 +24,10 @@
#include <freerdp/client.h> #include <freerdp/client.h>
#include <freerdp/addin.h> #include <freerdp/addin.h>
#include <freerdp/assistance.h>
#include <freerdp/client/file.h> #include <freerdp/client/file.h>
#include <freerdp/client/cmdline.h> #include <freerdp/client/cmdline.h>
#include <freerdp/client/channels.h> #include <freerdp/client/channels.h>
#include <freerdp/client/assistance.h>
int freerdp_client_common_new(freerdp* instance, rdpContext* context) int freerdp_client_common_new(freerdp* instance, rdpContext* context)
{ {

3
client/common/test/CMakeLists.txt
View File

@ -6,8 +6,7 @@ set(${MODULE_PREFIX}_DRIVER ${MODULE_NAME}.c)
set(${MODULE_PREFIX}_TESTS set(${MODULE_PREFIX}_TESTS
TestClientRdpFile.c TestClientRdpFile.c
TestClientChannels.c TestClientChannels.c)
TestClientAssistance.c)
create_test_sourcelist(${MODULE_PREFIX}_SRCS create_test_sourcelist(${MODULE_PREFIX}_SRCS
${${MODULE_PREFIX}_DRIVER} ${${MODULE_PREFIX}_DRIVER}

6
include/freerdp/client/assistance.h → include/freerdp/assistance.h
View File

@ -17,8 +17,8 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef FREERDP_CLIENT_ASSISTANCE_H #ifndef FREERDP_REMOTE_ASSISTANCE_H
#define FREERDP_CLIENT_ASSISTANCE_H #define FREERDP_REMOTE_ASSISTANCE_H
#include <freerdp/api.h> #include <freerdp/api.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
@ -69,5 +69,5 @@ FREERDP_API void freerdp_client_assistance_file_free(rdpAssistanceFile* file);
} }
#endif #endif
#endif /* FREERDP_CLIENT_ASSISTANCE_H */ #endif /* FREERDP_REMOTE_ASSISTANCE_H */

12
libfreerdp/common/CMakeLists.txt
View File

@ -20,15 +20,22 @@ set(MODULE_PREFIX "FREERDP_COMMON")
set(${MODULE_PREFIX}_SRCS set(${MODULE_PREFIX}_SRCS
addin.c addin.c
settings.c) settings.c
assistance.c)
add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT" add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
MONOLITHIC ${MONOLITHIC_BUILD} MONOLITHIC ${MONOLITHIC_BUILD}
SOURCES ${${MODULE_PREFIX}_SRCS} SOURCES ${${MODULE_PREFIX}_SRCS}
EXPORT) EXPORT)
include_directories(${OPENSSL_INCLUDE_DIR})
include_directories(${ZLIB_INCLUDE_DIRS})
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib") set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS}
${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS MONOLITHIC ${MONOLITHIC_BUILD} set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS MONOLITHIC ${MONOLITHIC_BUILD}
MODULE winpr MODULE winpr
MODULES winpr-crt winpr-path winpr-file winpr-library winpr-utils) MODULES winpr-crt winpr-path winpr-file winpr-library winpr-utils)
@ -42,3 +49,6 @@ endif()
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/libfreerdp") set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/libfreerdp")
if(BUILD_TESTING)
add_subdirectory(test)
endif()

2
client/common/assistance.c → libfreerdp/common/assistance.c
View File

@ -37,7 +37,7 @@
#include <freerdp/client/file.h> #include <freerdp/client/file.h>
#include <freerdp/client/cmdline.h> #include <freerdp/client/cmdline.h>
#include <freerdp/client/assistance.h> #include <freerdp/assistance.h>
/** /**
* Password encryption in establishing a remote assistance session of type 1: * Password encryption in establishing a remote assistance session of type 1:

3
libfreerdp/common/test/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
TestCommon
TestCommon.c

31
libfreerdp/common/test/CMakeLists.txt Normal file
View File

@ -0,0 +1,31 @@
set(MODULE_NAME "TestCommon")
set(MODULE_PREFIX "TEST_COMMON")
set(${MODULE_PREFIX}_DRIVER ${MODULE_NAME}.c)
set(${MODULE_PREFIX}_TESTS
TestCommonAssistance.c)
create_test_sourcelist(${MODULE_PREFIX}_SRCS
${${MODULE_PREFIX}_DRIVER}
${${MODULE_PREFIX}_TESTS})
add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
MONOLITHIC ${MONOLITHIC_BUILD}
MODULE freerdp
MODULES freerdp-common)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
set_target_properties(${MODULE_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")
foreach(test ${${MODULE_PREFIX}_TESTS})
get_filename_component(TestName ${test} NAME_WE)
add_test(${TestName} ${TESTING_OUTPUT_DIRECTORY}/${MODULE_NAME} ${TestName})
endforeach()
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "FreeRDP/Common/Test")

4
client/common/test/TestClientAssistance.c → libfreerdp/common/test/TestCommonAssistance.c
View File

@ -2,7 +2,7 @@
#include <winpr/crt.h> #include <winpr/crt.h>
#include <winpr/print.h> #include <winpr/print.h>
#include <freerdp/client/assistance.h> #include <freerdp/assistance.h>
const char* TEST_MSRC_INCIDENT_PASSWORD_TYPE1 = "Password1"; const char* TEST_MSRC_INCIDENT_PASSWORD_TYPE1 = "Password1";
@ -160,7 +160,7 @@ int test_msrsc_incident_file_type2()
return 0; return 0;
} }
int TestClientAssistance(int argc, char* argv[]) int TestCommonAssistance(int argc, char* argv[])
{ {
test_msrsc_incident_file_type1(); test_msrsc_incident_file_type1();