From e8050651c0f26dfbba15ae4777d39036553117d0 Mon Sep 17 00:00:00 2001 From: Davide Beatrici Date: Wed, 3 Oct 2018 07:24:42 +0200 Subject: [PATCH] Copy authors file into "src/bin/hamcore" automatically --- .gitignore | 3 +- CMakeLists.txt | 2 + src/BuildAll.cmd | 12 +-- src/bin/hamcore/authors.txt | 159 ------------------------------------ 4 files changed, 11 insertions(+), 165 deletions(-) delete mode 100644 src/bin/hamcore/authors.txt diff --git a/.gitignore b/.gitignore index 0ebcf69b..c7c93a57 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ Makefile bin/ build/ cmake-build-debug/ +src/bin/hamcore/authors.txt src/bin/BuiltHamcoreFiles/ tmp/ .gitconfig @@ -193,4 +194,4 @@ developer_tools/stbchecker/**/OpenCover/ developer_tools/stbchecker/**/ASALocalRun/ developer_tools/stbchecker/**/*.binlog developer_tools/stbchecker/**/*.nvuser -developer_tools/stbchecker/**/.mfractor/ \ No newline at end of file +developer_tools/stbchecker/**/.mfractor/ diff --git a/CMakeLists.txt b/CMakeLists.txt index e077ef09..c156afda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,8 @@ if (NOT ${PROJECT_VERSION} VERSION_EQUAL "${CurrentBuild_MAJOR}.${CurrentBuild_M message (FATAL_ERROR "PROJECT_VERSION does not match to src/CurrentBuild.txt") endif() +configure_file("${SoftEtherVPN_SOURCE_DIR}/AUTHORS.TXT" "${SoftEtherVPN_SOURCE_DIR}/src/bin/hamcore/authors.txt" COPYONLY) + set(BUILD_DIRECTORY ${SoftEtherVPN_SOURCE_DIR}/build) add_subdirectory(src) diff --git a/src/BuildAll.cmd b/src/BuildAll.cmd index 2ceec531..17d96e35 100644 --- a/src/BuildAll.cmd +++ b/src/BuildAll.cmd @@ -1,6 +1,6 @@ SETLOCAL SET BATCH_FILE_NAME=%0 -SET BATCH_DIR_NAME=%0\.. +SET BATCH_DIR_PATH=%~dp0 SET NOW_TMP=%time:~0,2% SET NOW=%date:~0,4%%date:~5,2%%date:~8,2%_%NOW_TMP: =0%%time:~3,2%%time:~6,2% @@ -20,13 +20,15 @@ if not exist "C:\windows\Microsoft.NET\Framework\v3.5" ( echo on -if exist "%BATCH_DIR_NAME%\bin\BuildUtil.exe" ( - del "%BATCH_DIR_NAME%\bin\BuildUtil.exe" +copy "%BATCH_DIR_PATH%..\AUTHORS.TXT" "%BATCH_DIR_PATH%bin\hamcore\authors.txt" + +if exist "%BATCH_DIR_PATH%bin\BuildUtil.exe" ( + del "%BATCH_DIR_PATH%bin\BuildUtil.exe" ) -C:\windows\Microsoft.NET\Framework\v3.5\MSBuild.exe /toolsversion:3.5 /target:Clean;Rebuild /property:Configuration=Debug "%BATCH_DIR_NAME%\BuildUtil\BuildUtil.csproj" +C:\windows\Microsoft.NET\Framework\v3.5\MSBuild.exe /toolsversion:3.5 /target:Clean;Rebuild /property:Configuration=Debug "%BATCH_DIR_PATH%BuildUtil\BuildUtil.csproj" -cd %BATCH_DIR_NAME%\bin +cd "%BATCH_DIR_PATH%bin" BuildUtil.exe /CMD:All diff --git a/src/bin/hamcore/authors.txt b/src/bin/hamcore/authors.txt deleted file mode 100644 index b89c36a1..00000000 --- a/src/bin/hamcore/authors.txt +++ /dev/null @@ -1,159 +0,0 @@ -SoftEther VPN is developed by SoftEther VPN Project at University of Tsukuba. -http://www.softether.org/ - -AUTHORS OF SOFTETHER VPN ------------------------- - -CORE DEVELOPERS: - - - Daiyuu Nobori, Ph.D. - Computer Science, Graduate School of University of Tsukuba - SoftEther Corporation - E-mail: daiyuu-nobori [at] softether.org - - - Tetsuo Sugiyama, Ph.D. - SoftEther Corporation - - - Junpei Kuwana, Ph.D. - Risk Engineering, Graduate School of University of Tsukuba - SoftEther Corporation - - - Takao Ito, Ph.D. - Computer Science, Graduate School of University of Tsukuba - SoftEther Corporation - - - Mei Sharie Ann Yamaguchi, Ph.D. - Life and Environmental Sciences, Graduate School of University of Tsukuba - - - Christopher Smith - College of Information Science, University of Tsukuba - - -WEB-SITE DESIGNER: - - - Genya Hatakeyama - College of Information Science, University of Tsukuba - - -CONTRIBUTORS on GitHub: - - - Melvyn - https://github.com/yaurthek - - - nattoheaven - https://github.com/nattoheaven - - - ELIN - https://github.com/el1n - - - Dmitry Orlov - https://github.com/mosquito - - - Renaud Allard - https://github.com/renaudallard - - - Hideki Saito - https://github.com/hsaito - - - Dexter Ang - https://github.com/thepoch - - - YF - https://github.com/yfdyh000 - - - Sahal Ansari - https://github.com/sahal - - - ygrek - https://github.com/ygrek - - - ajee cai - https://github.com/ajeecai - - - NOKUBI Takatsugu - https://github.com/knok - - - Den Lesnov - https://github.com/Leden - - - Ilya Shipitsin - https://github.com/chipitsine - - - Matt Lewandowsky - https://github.com/lewellyn - - - Raymond Tau - https://github.com/rtau - - - Luiz Eduardo Gava - https://github.com/LegDog - - - Charles Surett - https://github.com/scj643 - - - Jeff Tang - https://github.com/mrjefftang - - - Victor Salgado - https://github.com/mcsalgado - - - micsell - https://github.com/micsell - - - yehorov - https://github.com/yehorov - - - dglushenok - https://github.com/dglushenok - - - NoNameA 774 - https://github.com/nna774 - - - Alexandre De Oliveira - https://github.com/yodresh - - - Bernhard Rosenkraenzer - https://github.com/berolinux - - - Sacha Bernstein - https://github.com/sacha - - - cm0x4D - https://github.com/cm0x4D - - - DDGo - https://github.com/DDGo - - - Noah O'Donoghue - https://github.com/NoahO - - - Moataz Elmasry - https://github.com/moatazelmasry2 - - - Zulyandri Zardi - https://github.com/zulzardi - - - rel22 - https://github.com/rel22 - - - Guanzhong Chen - https://github.com/quantum5 - - - Nguyen Hong Quan - https://github.com/hongquan - - - macvk - https://github.com/macvk - - - Guido Vranken - https://github.com/guidovranken - - -JOIN THE SOFTETHER VPN DEVELOPMENT ----------------------------------- - -Want to become a contributor? Please send us a patch. - -See also: SoftEther VPN Patch Acceptance Policy -http://www.softether.org/5-download/src/9.patch -