gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整目录结构，增加RPM打包功能

Browse Source 
* 调整目录结构，原conf目录分拆为conf和resource目录。其中，conf目录在软件更新时不会更新，resource则更新；
* 增加RPM打包功能，利用CI发布软件的RPM，对应调整GitLAB-CI脚本。
This commit is contained in:
Lu Qiuwen
2018-11-16 20:27:36 +08:00
parent 3da25a31ff
commit 88e9eecf09
22 changed files with 154 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
platform/CMakeLists.txt
View File

@@ -1,4 +1,6 @@
add_executable(tfe src/key_keeper.cpp src/kni_acceptor.cpp src/ssl_stream.cpp src/ssl_sess_cache.cpp src/ssl_trusted_cert_storage.cpp src/ssl_utils.cc src/tcp_stream.cpp src/main.cpp src/proxy.cpp)
add_executable(tfe src/key_keeper.cpp src/kni_acceptor.cpp src/ssl_stream.cpp
src/ssl_sess_cache.cpp src/ssl_trusted_cert_storage.cpp
src/ssl_utils.cc src/tcp_stream.cpp src/main.cpp src/proxy.cpp)
target_include_directories(tfe PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include/external)
target_include_directories(tfe PRIVATE ${CMAKE_CURRENT_LIST_DIR}/include/internal)
@@ -18,11 +20,19 @@ target_link_libraries(tfe pthread dl
MESA_htable wiredcfg
MESA_field_stat)
target_link_libraries(tfe -Wl,--whole-archive http -Wl,--no-whole-archive)
target_link_libraries(tfe -Wl,--whole-archive pangu-http -Wl,--no-whole-archive)
#target_link_libraries(tfe -Wl,--whole-archive decrypt-mirroring -Wl,--no-whole-archive)
if(ENABLE_PLUGIN_HTTP)
target_link_libraries(tfe -Wl,--whole-archive http -Wl,--no-whole-archive)
endif()
install(TARGETS tfe RUNTIME DESTINATION ./)
if(ENABLE_PLUGIN_DECRYPT_MIRRORING)
target_link_libraries(tfe -Wl,--whole-archive decrypt-mirroring -Wl,--no-whole-archive)
endif()
if(ENABLE_PLUGIN_PANGU_HTTP)
target_link_libraries(tfe -Wl,--whole-archive pangu-http -Wl,--no-whole-archive)
endif()
install(TARGETS tfe RUNTIME DESTINATION bin COMPONENT Program)
### test_key_keeper
add_executable(test_key_keeper test/test_key_keeper.cpp src/key_keeper.cpp src/ssl_sess_cache.cpp src/ssl_utils.cc )