Tera TermRevision: 8935
https://osdn.net/projects/ttssh2/scm/svn/commits/8935
Author: zmatsuo
Date: 2020-09-09 00:14:22 +0900 (Wed, 09 Sep 2020)
Log Message:
-----------
cmake,perl を buildtools/ に移動
- svn, git を使用していないとき、エラーメッセージを表示しないよう修正
- ci_scripts/appveyor.yml
- buildtools をキャッシュ対象に追加
- ci_scripts/build_appveyor.bat
- キャッシュサイズを小さくするため不要、未使用ファイルを削除
- buildtools\download
- buildtools\perl\c
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/buildinfo.txt.in
trunk/ci_scripts/appveyor.yml
trunk/ci_scripts/build_appveyor.bat
trunk/doc/en/html/reference/build_with_cmake.md
trunk/doc/ja/html/reference/build_with_cmake.md
trunk/libs/buildall.cmake
trunk/libs/buildall_cmake.bat
trunk/libs/openssl11.cmake
trunk/svnrev_perl/readme.md
trunk/svnrev_perl/svnrev.pl
Added Paths:
-----------
trunk/buildtools/
trunk/buildtools/getcmake.bat
trunk/buildtools/getcmake.ps1
trunk/buildtools/getperl.bat
trunk/buildtools/getperl.ps1
trunk/buildtools/perl.cmake
Removed Paths:
-------------
trunk/libs/getcmake.bat
trunk/libs/getcmake.ps1
trunk/libs/getperl.bat
trunk/libs/getperl.ps1
trunk/libs/perl.cmake
-------------- next part --------------
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/CMakeLists.txt 2020-09-08 15:14:22 UTC (rev 8935)
@@ -73,7 +73,7 @@
if (MSVC OR (MINGW AND (EXISTS "c:/windows")))
find_program(
PERL perl.exe
- HINTS ${CMAKE_CURRENT_SOURCE_DIR}/libs/perl/perl/bin
+ HINTS ${CMAKE_SOURCE_DIR}/buildtools/perl/perl/bin
HINTS c:/Strawberry/perl/bin
HINTS c:/Perl64/bin
HINTS c:/Perl/bin
@@ -87,8 +87,8 @@
endif()
message("perl=${PERL}")
# svn / git-svn
-if(EXISTS "${CMAKE_SOURCE_DIR}/.git/svn")
- # git-svn
+if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+ # git (git-svn)
find_package(Git)
message("git=${GIT_EXECUTABLE}")
elseif(EXISTS "${CMAKE_SOURCE_DIR}/.svn")
@@ -145,12 +145,6 @@
endif()
endif()
-### create buildinfo.txt
-configure_file(
- buildinfo.txt.in
- buildinfo.txt
- @ONLY)
-
### subdirectories
add_subdirectory(teraterm)
add_subdirectory(ttpmenu)
@@ -165,3 +159,8 @@
add_subdirectory(doc_internal)
add_subdirectory(tools)
+### create buildinfo.txt
+configure_file(
+ buildinfo.txt.in
+ buildinfo.txt
+ @ONLY)
Modified: trunk/buildinfo.txt.in
===================================================================
--- trunk/buildinfo.txt.in 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/buildinfo.txt.in 2020-09-08 15:14:22 UTC (rev 8935)
@@ -56,5 +56,7 @@
@GIT_EXECUTABLE@
ISCC(inno setup)
@ISCC@
+HHC(help compiler)
+ @HHC@
see CMakeCache.txt for more details
Copied: trunk/buildtools/getcmake.bat (from rev 8933, trunk/libs/getcmake.bat)
===================================================================
--- trunk/buildtools/getcmake.bat (rev 0)
+++ trunk/buildtools/getcmake.bat 2020-09-08 15:14:22 UTC (rev 8935)
@@ -0,0 +1,10 @@
+ ＠ echo off
+setlocal
+cd /d %~dp0
+IF NOT EXIST cmake-3.11.4-win32-x86 (
+ echo cmake\x82\xF0\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82\xC4lib/cmake\x82ɓW\x8AJ\x82\xB5\x82܂\xB7
+ IF NOT "%1" == "nopause" pause
+ powershell -NoProfile -ExecutionPolicy Unrestricted .\getcmake.ps1
+)
+endlocal
+IF NOT "%1" == "nopause" pause
Copied: trunk/buildtools/getcmake.ps1 (from rev 8933, trunk/libs/getcmake.ps1)
===================================================================
--- trunk/buildtools/getcmake.ps1 (rev 0)
+++ trunk/buildtools/getcmake.ps1 2020-09-08 15:14:22 UTC (rev 8935)
@@ -0,0 +1,33 @@
+$CMAKE_URL = "https://cmake.org/files/v3.11/cmake-3.11.4-win32-x86.zip"
+$CMAKE_ZIP = ($CMAKE_URL -split "/")[-1]
+$CMAKE_DIR = [System.IO.Path]::GetFileNameWithoutExtension($CMAKE_ZIP)
+
+$CMAKE_ZIP = "download\cmake\" + $CMAKE_ZIP
+
+echo $CMAKE_URL
+echo $CMAKE_ZIP
+echo $CMAKE_DIR
+
+# TLS1.2 \x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9 (cmake.org\x82\xCD TLS1.2)
+# [Net.ServicePointManager]::SecurityProtocol
+# \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x82\xC4 "Ssl3, Tls" \x82Əo\x82\xBD\x8Fꍇ\x81ATLS1.2\x82͖\xB3\x8C\xF8\x82ƂȂ\xC1\x82Ă\xA2\x82\xE9
+[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;
+
+# \x93W\x8AJ\x8Dς݃t\x83H\x83\x8B\x83_\x82\xAA\x82\xA0\x82\xE9?
+if((Test-Path $CMAKE_DIR) -eq $true) {
+ # \x8D폜\x82\xB7\x82\xE9
+ Remove-Item -Recurse -Force $CMAKE_DIR
+ # \x8FI\x97\xB9\x82\xB7\x82\xE9
+ #exit
+}
+
+# \x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB7\x82\xE9
+if((Test-Path $CMAKE_ZIP) -eq $false) {
+ if((Test-Path "download\cmake") -ne $true) {
+ mkdir "download\cmake"
+ }
+ wget $CMAKE_URL -Outfile $CMAKE_ZIP
+}
+
+# \x93W\x8AJ\x82\xB7\x82\xE9
+Expand-Archive $CMAKE_ZIP -DestinationPath .
Copied: trunk/buildtools/getperl.bat (from rev 8933, trunk/libs/getperl.bat)
===================================================================
--- trunk/buildtools/getperl.bat (rev 0)
+++ trunk/buildtools/getperl.bat 2020-09-08 15:14:22 UTC (rev 8935)
@@ -0,0 +1,8 @@
+ ＠ echo off
+setlocal
+cd /d %~dp0
+echo perl\x82\xF0\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82\xC4lib/perl\x82ɓW\x8AJ\x82\xB5\x82܂\xB7
+pause
+powershell -NoProfile -ExecutionPolicy Unrestricted .\getperl.ps1
+endlocal
+pause
Copied: trunk/buildtools/getperl.ps1 (from rev 8933, trunk/libs/getperl.ps1)
===================================================================
--- trunk/buildtools/getperl.ps1 (rev 0)
+++ trunk/buildtools/getperl.ps1 2020-09-08 15:14:22 UTC (rev 8935)
@@ -0,0 +1,28 @@
+$PERL_URL = "http://strawberryperl.com/download/5.30.1.1/strawberry-perl-5.30.1.1-32bit.zip"
+$PERL_ZIP = ($PERL_URL -split "/")[-1]
+$PERL_DIR = "perl"
+
+$PERL_ZIP = "download\perl\" + $PERL_ZIP
+
+echo $PERL_URL
+echo $PERL_ZIP
+echo $PERL_DIR
+
+# \x93W\x8AJ\x8Dς݃t\x83H\x83\x8B\x83_\x82\xAA\x82\xA0\x82\xE9?
+if((Test-Path $PERL_DIR) -eq $true) {
+ # \x8D폜\x82\xB7\x82\xE9
+ Remove-Item -Recurse -Force $PERL_DIR
+ # \x8FI\x97\xB9\x82\xB7\x82\xE9
+ #exit
+}
+
+# \x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB7\x82\xE9
+if((Test-Path $PERL_ZIP) -eq $false) {
+ if((Test-Path "download\perl") -ne $true) {
+ mkdir "download\perl"
+ }
+ wget $PERL_URL -Outfile $PERL_ZIP
+}
+
+# \x93W\x8AJ\x82\xB7\x82\xE9
+Expand-Archive $PERL_ZIP -DestinationPath $PERL_DIR
Copied: trunk/buildtools/perl.cmake (from rev 8933, trunk/libs/perl.cmake)
===================================================================
--- trunk/buildtools/perl.cmake (rev 0)
+++ trunk/buildtools/perl.cmake 2020-09-08 15:14:22 UTC (rev 8935)
@@ -0,0 +1,25 @@
+# cmake -P perl.cmake
+
+set(SRC_ARC "strawberry-perl-5.30.1.1-32bit.zip")
+set(SRC_URL "http://strawberryperl.com/download/5.30.1.1/strawberry-perl-5.30.1.1-32bit.zip")
+set(SRC_ARC_HASH_SHA256 cd9d7d5a3d0099752d6587770f4920b2b3818b16078e7b4dbf83f2aa2c037f70)
+set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/perl")
+set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/perl")
+
+if(NOT EXISTS ${INSTALL_DIR}/perl/bin/perl.exe)
+
+ file(DOWNLOAD
+ ${SRC_URL}
+ ${DOWN_DIR}/${SRC_ARC}
+ EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
+ SHOW_PROGRESS
+ )
+
+ file(MAKE_DIRECTORY ${INSTALL_DIR})
+
+ execute_process(
+ COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
+ WORKING_DIRECTORY ${INSTALL_DIR}
+ )
+
+endif()
Modified: trunk/ci_scripts/appveyor.yml
===================================================================
--- trunk/ci_scripts/appveyor.yml 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/ci_scripts/appveyor.yml 2020-09-08 15:14:22 UTC (rev 8935)
@@ -95,6 +95,7 @@
cache:
- libs
+ - buildtools
artifacts:
- path: build\%ZIP_FILE%
Modified: trunk/ci_scripts/build_appveyor.bat
===================================================================
--- trunk/ci_scripts/build_appveyor.bat 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/ci_scripts/build_appveyor.bat 2020-09-08 15:14:22 UTC (rev 8935)
@@ -1,7 +1,7 @@
call svnrev_perl\svnrev.bat
call svnrev_perl\sourcetree_info.bat
if "%GENERATOR%" == "Visual Studio 8 2005" (
- cd libs
+ cd buildtools
call getcmake.bat nopause
cd ..
)
@@ -32,9 +32,10 @@
"%CMAKE_COMMAND%" -DCMAKE_GENERATOR="%GENERATOR%" %CMAKE_OPTION_LIBS% -P buildall.cmake
if exist build rmdir /s /q build
if exist download rmdir /s /q download
- if exist perl\c rmdir /s /q perl\c
if exist openssl_%COMPILER%\html rmdir /s /q openssl_%COMPILER%\html
if exist openssl_%COMPILER%_debug\html rmdir /s /q openssl_%COMPILER%_debug\html
+ if exist ..\buildtools\perl\c rmdir /s /q ..\buildtools\perl\c
+ if exist ..\buildtools\download rmdir /s /q ..\buildtools\download
)
cd ..
if not exist %BUILD_DIR% mkdir %BUILD_DIR%
Modified: trunk/doc/en/html/reference/build_with_cmake.md
===================================================================
--- trunk/doc/en/html/reference/build_with_cmake.md 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/doc/en/html/reference/build_with_cmake.md 2020-09-08 15:14:22 UTC (rev 8935)
@@ -27,8 +27,8 @@
mkdir build_vs2005
cd build_vs2005
- ..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe .. -G "Visual Studio 8 2005"
- ..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe --build . --config release
+ ..\buildtools\cmake-3.11.4-win32-x86\bin\cmake.exe .. -G "Visual Studio 8 2005"
+ ..\buildtools\cmake-3.11.4-win32-x86\bin\cmake.exe --build . --config release
- Change a string after `-G` option according to Visual Studio version.
- The sln file is created, so the file can be opened with Visual Studio.
Modified: trunk/doc/ja/html/reference/build_with_cmake.md
===================================================================
--- trunk/doc/ja/html/reference/build_with_cmake.md 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/doc/ja/html/reference/build_with_cmake.md 2020-09-08 15:14:22 UTC (rev 8935)
@@ -27,8 +27,8 @@
mkdir build_vs2005
cd build_vs2005
- ..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe .. -G "Visual Studio 8 2005"
- ..\libs\cmake-3.11.4-win32-x86\bin\cmake.exe --build . --config release
+ ..\buildtools\cmake-3.11.4-win32-x86\bin\cmake.exe .. -G "Visual Studio 8 2005"
+ ..\buildtools\cmake-3.11.4-win32-x86\bin\cmake.exe --build . --config release
- `-G` オプションの後ろは使用する Visual Studio のバージョンに合わせて調整します
- sln ファイルが生成されるので Visual Studio で開くことができます
Modified: trunk/libs/buildall.cmake
===================================================================
--- trunk/libs/buildall.cmake 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/libs/buildall.cmake 2020-09-08 15:14:22 UTC (rev 8935)
@@ -19,6 +19,7 @@
message("perl")
execute_process(
COMMAND ${CMAKE_COMMAND} -P perl.cmake
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../buildtools
)
endif()
endif()
Modified: trunk/libs/buildall_cmake.bat
===================================================================
--- trunk/libs/buildall_cmake.bat 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/libs/buildall_cmake.bat 2020-09-08 15:14:22 UTC (rev 8935)
@@ -55,10 +55,10 @@
exit
:cmake_3_11_4
-set CMAKE=%~dp0cmake-3.11.4-win32-x86\bin\cmake.exe
-echo 1. \x8E\xA9\x95\xAA\x82\xCCcmake.exe\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9(PATH\x82\xF0\x92ʂ\xB5\x82Ă\xA0\x82\xE9)
+set CMAKE=%~dp0..\buildtools\cmake-3.11.4-win32-x86\bin\cmake.exe
+echo 1. PATH\x8F\xE3\x82\xCCcmake.exe\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9
echo 2. VS2005\x82ł\xE0\x8Eg\x97p\x82ł\xAB\x82\xE9cmake\x8Eg\x97p\x82\xB7\x82\xE9
-echo (\x95K\x97v\x82Ȃ玩\x93\xAE\x82Ń_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82āA\x82\xB1\x82̃t\x83H\x83\x8B\x83_\x82ɃC\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82\xE9)
+echo (\x95K\x97v\x82Ȃ玩\x93\xAE\x82Ń_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82āA\x82\xB1\x82\xCCbuildtools/\x82ɃC\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82\xE9)
if exist %CMAKE% echo \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x8Dς\xDD(%CMAKE%)
set /p no="select no "
@@ -71,7 +71,7 @@
:download
if exist %CMAKE% goto finish_cmake
-call getcmake.bat
+call ..\buildtools\getcmake.bat
:finish_cmake
exit /b
Deleted: trunk/libs/getcmake.bat
===================================================================
--- trunk/libs/getcmake.bat 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/libs/getcmake.bat 2020-09-08 15:14:22 UTC (rev 8935)
@@ -1,10 +0,0 @@
- ＠ echo off
-setlocal
-cd /d %~dp0
-IF NOT EXIST cmake-3.11.4-win32-x86 (
- echo cmake\x82\xF0\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82\xC4lib/cmake\x82ɓW\x8AJ\x82\xB5\x82܂\xB7
- IF NOT "%1" == "nopause" pause
- powershell -NoProfile -ExecutionPolicy Unrestricted .\getcmake.ps1
-)
-endlocal
-IF NOT "%1" == "nopause" pause
Deleted: trunk/libs/getcmake.ps1
===================================================================
--- trunk/libs/getcmake.ps1 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/libs/getcmake.ps1 2020-09-08 15:14:22 UTC (rev 8935)
@@ -1,33 +0,0 @@
-$CMAKE_URL = "https://cmake.org/files/v3.11/cmake-3.11.4-win32-x86.zip"
-$CMAKE_ZIP = ($CMAKE_URL -split "/")[-1]
-$CMAKE_DIR = [System.IO.Path]::GetFileNameWithoutExtension($CMAKE_ZIP)
-
-$CMAKE_ZIP = "download\cmake\" + $CMAKE_ZIP
-
-echo $CMAKE_URL
-echo $CMAKE_ZIP
-echo $CMAKE_DIR
-
-# TLS1.2 \x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9 (cmake.org\x82\xCD TLS1.2)
-# [Net.ServicePointManager]::SecurityProtocol
-# \x82\xF0\x8E\xC0\x8Ds\x82\xB5\x82\xC4 "Ssl3, Tls" \x82Əo\x82\xBD\x8Fꍇ\x81ATLS1.2\x82͖\xB3\x8C\xF8\x82ƂȂ\xC1\x82Ă\xA2\x82\xE9
-[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;
-
-# \x93W\x8AJ\x8Dς݃t\x83H\x83\x8B\x83_\x82\xAA\x82\xA0\x82\xE9?
-if((Test-Path $CMAKE_DIR) -eq $true) {
- # \x8D폜\x82\xB7\x82\xE9
- Remove-Item -Recurse -Force $CMAKE_DIR
- # \x8FI\x97\xB9\x82\xB7\x82\xE9
- #exit
-}
-
-# \x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB7\x82\xE9
-if((Test-Path $CMAKE_ZIP) -eq $false) {
- if((Test-Path "download\cmake") -ne $true) {
- mkdir "download\cmake"
- }
- wget $CMAKE_URL -Outfile $CMAKE_ZIP
-}
-
-# \x93W\x8AJ\x82\xB7\x82\xE9
-Expand-Archive $CMAKE_ZIP -DestinationPath .
Deleted: trunk/libs/getperl.bat
===================================================================
--- trunk/libs/getperl.bat 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/libs/getperl.bat 2020-09-08 15:14:22 UTC (rev 8935)
@@ -1,8 +0,0 @@
- ＠ echo off
-setlocal
-cd /d %~dp0
-echo perl\x82\xF0\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB5\x82\xC4lib/perl\x82ɓW\x8AJ\x82\xB5\x82܂\xB7
-pause
-powershell -NoProfile -ExecutionPolicy Unrestricted .\getperl.ps1
-endlocal
-pause
Deleted: trunk/libs/getperl.ps1
===================================================================
--- trunk/libs/getperl.ps1 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/libs/getperl.ps1 2020-09-08 15:14:22 UTC (rev 8935)
@@ -1,28 +0,0 @@
-$PERL_URL = "http://strawberryperl.com/download/5.30.1.1/strawberry-perl-5.30.1.1-32bit.zip"
-$PERL_ZIP = ($PERL_URL -split "/")[-1]
-$PERL_DIR = "perl"
-
-$PERL_ZIP = "download\perl\" + $PERL_ZIP
-
-echo $PERL_URL
-echo $PERL_ZIP
-echo $PERL_DIR
-
-# \x93W\x8AJ\x8Dς݃t\x83H\x83\x8B\x83_\x82\xAA\x82\xA0\x82\xE9?
-if((Test-Path $PERL_DIR) -eq $true) {
- # \x8D폜\x82\xB7\x82\xE9
- Remove-Item -Recurse -Force $PERL_DIR
- # \x8FI\x97\xB9\x82\xB7\x82\xE9
- #exit
-}
-
-# \x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82\xB7\x82\xE9
-if((Test-Path $PERL_ZIP) -eq $false) {
- if((Test-Path "download\perl") -ne $true) {
- mkdir "download\perl"
- }
- wget $PERL_URL -Outfile $PERL_ZIP
-}
-
-# \x93W\x8AJ\x82\xB7\x82\xE9
-Expand-Archive $PERL_ZIP -DestinationPath $PERL_DIR
Modified: trunk/libs/openssl11.cmake
===================================================================
--- trunk/libs/openssl11.cmake 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/libs/openssl11.cmake 2020-09-08 15:14:22 UTC (rev 8935)
@@ -96,7 +96,7 @@
# Active/Strawberry Perl
find_program(
PERL perl.exe
- HINTS ${CMAKE_CURRENT_SOURCE_DIR}/perl/perl/bin
+ HINTS ${CMAKE_CURRENT_SOURCE_DIR}/../buildtools/perl/perl/bin
HINTS c:/Perl64/bin
HINTS c:/Perl/bin
HINTS c:/Strawberry/perl/bin
Deleted: trunk/libs/perl.cmake
===================================================================
--- trunk/libs/perl.cmake 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/libs/perl.cmake 2020-09-08 15:14:22 UTC (rev 8935)
@@ -1,25 +0,0 @@
-# cmake -P perl.cmake
-
-set(SRC_ARC "strawberry-perl-5.30.1.1-32bit.zip")
-set(SRC_URL "http://strawberryperl.com/download/5.30.1.1/strawberry-perl-5.30.1.1-32bit.zip")
-set(SRC_ARC_HASH_SHA256 cd9d7d5a3d0099752d6587770f4920b2b3818b16078e7b4dbf83f2aa2c037f70)
-set(DOWN_DIR "${CMAKE_SOURCE_DIR}/download/perl")
-set(INSTALL_DIR "${CMAKE_SOURCE_DIR}/perl")
-
-if(NOT EXISTS ${INSTALL_DIR}/perl/bin/perl.exe)
-
- file(DOWNLOAD
- ${SRC_URL}
- ${DOWN_DIR}/${SRC_ARC}
- EXPECTED_HASH SHA256=${SRC_ARC_HASH_SHA256}
- SHOW_PROGRESS
- )
-
- file(MAKE_DIRECTORY ${INSTALL_DIR})
-
- execute_process(
- COMMAND ${CMAKE_COMMAND} -E tar "xvf" ${DOWN_DIR}/${SRC_ARC}
- WORKING_DIRECTORY ${INSTALL_DIR}
- )
-
-endif()
Modified: trunk/svnrev_perl/readme.md
===================================================================
--- trunk/svnrev_perl/readme.md 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/svnrev_perl/readme.md 2020-09-08 15:14:22 UTC (rev 8935)
@@ -10,7 +10,7 @@
- 実行できない場合もヘッダファイルは作成されます
- perlを実行できるようパスを設定する
- libs/perl があれば利用します
- - libs/getperl.bat をダブルクリックすると
+ - buildtools/getperl.bat をダブルクリックすると
strawberry perl を libs/perl に展開します
# ヘッダの作成方法
Modified: trunk/svnrev_perl/svnrev.pl
===================================================================
--- trunk/svnrev_perl/svnrev.pl 2020-09-05 11:20:46 UTC (rev 8934)
+++ trunk/svnrev_perl/svnrev.pl 2020-09-08 15:14:22 UTC (rev 8935)
@@ -12,6 +12,7 @@
$date = strftime "%Y%m%d", localtime;
$time = strftime "%H%M%S", localtime;
$verbose = 0;
+$script_name = $0;
GetOptions(
'root=s' => \$source_root,
@@ -36,11 +37,11 @@
$header = "This file was generated by svnrev_perl/svnrev.pl";
-if (-d "$source_root/.svn") {
+if (-d "$source_root/.svn" && $svn ne "") {
# svn infoを実行、出力をすべて取り込む
if (!open(my $FD, "-|", "\"$svn\" info $source_root 2>&1")) {
# svn が実行できない
- print "'$svn' can not execute\n";
+ print "$script_name: '$svn' can not execute\n";
}
else {
# 出力をすべて取り込む
@@ -69,11 +70,11 @@
}
}
}
-elsif(-d "$source_root/.git") {
+elsif(-d "$source_root/.git" && $git ne "") {
my $branch = `\"$git\" rev-parse --abbrev-ref HEAD`;
if ($branch eq '') {
# git が実行できない
- print "\"$git\" can not execute\n";
+ print "$script_name: \"$git\" can not execute\n";
}
else {
$branch =~ s/[\r\n]$//g;