Merge pull request #9 from OpenTouryoProject/develop

Release work ( ~ April 1, 2019)
OpenTouryoProject · Mar 28, 2019 · f9cb5ef · f9cb5ef
2 parents 8753a66 + 42df7ba
commit f9cb5ef
Show file tree

Hide file tree

Showing 123 changed files with 358 additions and 10,069 deletions.
diff --git a/root/nuget.exe b/root/nuget.exe
diff --git a/...a double-click to build bat file here.txt → ...a double-click to build bat file here.txt b/...a double-click to build bat file here.txt → ...a double-click to build bat file here.txt
diff --git a/root/programs/CS/1_DeleteDir.bat → root/programs/1_DeleteDir.bat b/root/programs/CS/1_DeleteDir.bat → root/programs/1_DeleteDir.bat
diff --git a/root/programs/CS/2_DeleteFile.bat → root/programs/2_DeleteFile.bat b/root/programs/CS/2_DeleteFile.bat → root/programs/2_DeleteFile.bat
diff --git a/root/programs/3_BuildLibsAtOtherRepos.bat b/root/programs/3_BuildLibsAtOtherRepos.bat
@@ -0,0 +1,63 @@
+@echo off
+
+@rem 本バッチファイルの作成にあたり、以下のサイトを参考にしました。
+@rem 【Bat】【vim】香り屋Vimをダウンロードしてインストールまでするbatファイル - Qiita
+@rem https://qiita.com/koryuohproject/items/beed1a28ad6a1f60256d
+
+setlocal
+
+@rem ZIPファイル名
+set zipfilename=Temp.zip
+
+@rem GitHubのZIPパス
+set srcUrl=https://github.com/OpenTouryoProject/OpenTouryoTemplates/archive/master.zip
+
+@rem 解凍ディレクトリ
+set extDir=%CD%
+
+@rem 一時ディレクトリ
+set tmpDir=Temp
+
+:Download
+@rem ダウンロードされたZIPファイルがあるなら解凍
+if exist %extDir%\%zipfilename% GOTO Extract
+
+@rem ZIPファイルのダウンロード
+@powershell -NoProfile -ExecutionPolicy Bypass -Command "$d=new-object System.Net.WebClient; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12; $d.Proxy.Credentials=[System.Net.CredentialCache]::DefaultNetWorkCredentials; $d.DownloadFile('%srcUrl%','%extDir%/%zipfilename%')"
+
+:Extract
+@rem 一時ディレクトリがあるならビルドへ
+if exist %extDir%\%tmpDir% GOTO Build
+
+@rem ZIPファイルを一時ディレクトリに解凍
+@powershell -NoProfile -ExecutionPolicy Bypass -Command "expand-archive %zipfilename%"
+
+:Build
+@rem ビルドがあるならコピーへ
+if exist "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\Frameworks\Infrastructure\Build_netcore30" GOTO Xcopy
+
+@rem batファイルを使用してビルド
+cd "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\"
+echo | call 2_Build_NuGet_net45.bat
+echo | call 2_Build_NuGet_net46.bat
+echo | call 2_Build_NuGet_net47.bat
+echo | call 2_Build_NuGet_netstd20.bat
+echo | call 3_Build_Business_net45.bat
+echo | call 3_Build_Business_net46.bat
+echo | call 3_Build_Business_net47.bat
+echo | call 3_Build_Business_netcore20.bat
+echo | call 3_Build_Business_netcore30.bat
+
+:Xcopy
+@rem ビルド出力をコピー
+cd %extDir%
+xcopy /Y /E "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\Frameworks\Infrastructure\Build_net45" "OpenTouryoAssemblies\Build_net45\"
+xcopy /Y /E "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\Frameworks\Infrastructure\Build_net46" "OpenTouryoAssemblies\Build_net46\"
+xcopy /Y /E "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\Frameworks\Infrastructure\Build_net47" "OpenTouryoAssemblies\Build_net47\"
+xcopy /Y /E "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\Frameworks\Infrastructure\Build_netcore20" "OpenTouryoAssemblies\Build_netcore20\"
+xcopy /Y /E "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\Frameworks\Infrastructure\Build_netcore30" "OpenTouryoAssemblies\Build_netcore30\"
+
+pause
+
+:EOF
+endlocal
diff --git a/root/programs/3_BuildLibsAtOtherReposInTimeOfDev.bat b/root/programs/3_BuildLibsAtOtherReposInTimeOfDev.bat
@@ -0,0 +1,63 @@
+@echo off
+
+@rem 本バッチファイルの作成にあたり、以下のサイトを参考にしました。
+@rem 【Bat】【vim】香り屋Vimをダウンロードしてインストールまでするbatファイル - Qiita
+@rem https://qiita.com/koryuohproject/items/beed1a28ad6a1f60256d
+
+setlocal
+
+@rem ZIPファイル名
+set zipfilename=Temp.zip
+
+@rem GitHubのZIPパス
+set srcUrl=https://github.com/OpenTouryoProject/OpenTouryo/archive/develop.zip
+
+@rem 解凍ディレクトリ
+set extDir=%CD%
+
+@rem 一時ディレクトリ
+set tmpDir=Temp
+
+:Download
+@rem ダウンロードされたZIPファイルがあるなら解凍
+if exist %extDir%\%zipfilename% GOTO Extract
+
+@rem ZIPファイルのダウンロード
+@powershell -NoProfile -ExecutionPolicy Bypass -Command "$d=new-object System.Net.WebClient; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12; $d.Proxy.Credentials=[System.Net.CredentialCache]::DefaultNetWorkCredentials; $d.DownloadFile('%srcUrl%','%extDir%/%zipfilename%')"
+
+:Extract
+@rem 一時ディレクトリがあるならビルドへ
+if exist %extDir%\%tmpDir% GOTO Build
+
+@rem ZIPファイルを一時ディレクトリに解凍
+@powershell -NoProfile -ExecutionPolicy Bypass -Command "expand-archive %zipfilename%"
+
+:Build
+@rem ビルドがあるならコピーへ
+if exist "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore30" GOTO Xcopy
+
+@rem batファイルを使用してビルド
+cd "Temp\OpenTouryo-develop\root\programs\CS\"
+echo | call 2_Build_NuGet_net45.bat
+echo | call 2_Build_NuGet_net46.bat
+echo | call 2_Build_NuGet_net47.bat
+echo | call 2_Build_NuGet_netstd20.bat
+echo | call 3_Build_Business_net45.bat
+echo | call 3_Build_Business_net46.bat
+echo | call 3_Build_Business_net47.bat
+echo | call 3_Build_Business_netcore20.bat
+echo | call 3_Build_Business_netcore30.bat
+
+:Xcopy
+@rem ビルド出力をコピー
+cd %extDir%
+xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_net45" "OpenTouryoAssemblies\Build_net45\"
+xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_net46" "OpenTouryoAssemblies\Build_net46\"
+xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_net47" "OpenTouryoAssemblies\Build_net47\"
+xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore20" "OpenTouryoAssemblies\Build_netcore20\"
+xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore30" "OpenTouryoAssemblies\Build_netcore30\"
+
+pause
+
+:EOF
+endlocal
diff --git a/root/programs/CS/5_Build_AsyncSvcSample.bat → root/programs/4_Build_Frameworks.bat b/root/programs/CS/5_Build_AsyncSvcSample.bat → root/programs/4_Build_Frameworks.bat
@@ -16,11 +16,10 @@ set CURRENT_DIR="%~dp0"
 call %CURRENT_DIR%z_Common.bat
 
 rem --------------------------------------------------
-rem Build the batch Infrastructure(Business)
+rem Output xcopy after you build the batch Infrastructure(AsyncProcessing)
 rem --------------------------------------------------
 
-..\nuget.exe restore "Samples\AsyncSvc_sample\AsyncSvc_sample.sln"
-%BUILDFILEPATH% %COMMANDLINE% "Samples\AsyncSvc_sample\AsyncSvc_sample.sln"
+%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\AsyncProcessing.sln"
 
 pause
 

diff --git a/...ams/CS/4_Build_AsyncProcessingService.bat → ...ograms/5_Build_AsyncProcessingService.bat b/...ams/CS/4_Build_AsyncProcessingService.bat → ...ograms/5_Build_AsyncProcessingService.bat
diff --git a/root/programs/VB/5_Build_AsyncSvcSample.bat → root/programs/5_Build_AsyncSvcSample.bat b/root/programs/VB/5_Build_AsyncSvcSample.bat → root/programs/5_Build_AsyncSvcSample.bat
@@ -19,8 +19,11 @@ rem --------------------------------------------------
 rem Build the batch Infrastructure(Business)
 rem --------------------------------------------------
 
-..\nuget.exe restore "Samples\AsyncSvc_sample\AsyncSvc_sample.sln"
-%BUILDFILEPATH% %COMMANDLINE% "Samples\AsyncSvc_sample\AsyncSvc_sample.sln"
+..\nuget.exe restore "Samples\CS\AsyncSvc_sample.sln"
+%BUILDFILEPATH% %COMMANDLINE% "Samples\CS\AsyncSvc_sample.sln"
+
+..\nuget.exe restore "Samples\VB\AsyncSvc_sample.sln"
+%BUILDFILEPATH% %COMMANDLINE% "Samples\VB\AsyncSvc_sample.sln"
 
 pause
 

diff --git a/root/programs/CS/6_CopyToService.bat → root/programs/6_CopyToService.bat b/root/programs/CS/6_CopyToService.bat → root/programs/6_CopyToService.bat
diff --git a/root/programs/CS/7_SubmitTask.bat → root/programs/7_SubmitTask.bat b/root/programs/CS/7_SubmitTask.bat → root/programs/7_SubmitTask.bat
diff --git a/root/programs/CS/3_Build_Framework.bat b/root/programs/CS/3_Build_Framework.bat