Skip to content

Commit f9cb5ef

Browse files
yusukemaegawayusukemaegawa
authored
Merge pull request #9 from OpenTouryoProject/develop
Release work ( ~ April 1, 2019)
2 parents 8753a66 + 42df7ba commit f9cb5ef

File tree

123 files changed

+358
-10069
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+358
-10069
lines changed

‎root/nuget.exe

5.42 MB
Binary file not shown.

‎root/programs/CS/0_Please run with a double-click to build bat file here.txt renamed to ‎root/programs/0_Please run with a double-click to build bat file here.txt

File renamed without changes.

‎root/programs/CS/1_DeleteDir.bat renamed to ‎root/programs/1_DeleteDir.bat

File renamed without changes.

‎root/programs/CS/2_DeleteFile.bat renamed to ‎root/programs/2_DeleteFile.bat

File renamed without changes.

‎root/programs/3_BuildLibsAtOtherRepos.bat

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
@echo off
2+
3+
@rem 本バッチファイルの作成にあたり、以下のサイトを参考にしました。
4+
@rem 【Bat】【vim】香り屋Vimをダウンロードしてインストールまでするbatファイル - Qiita
5+
@rem https://qiita.com/koryuohproject/items/beed1a28ad6a1f60256d
6+
7+
setlocal
8+
9+
@rem ZIPファイル名
10+
set zipfilename=Temp.zip
11+
12+
@rem GitHubのZIPパス
13+
set srcUrl=https://github.com/OpenTouryoProject/OpenTouryoTemplates/archive/master.zip
14+
15+
@rem 解凍ディレクトリ
16+
set extDir=%CD%
17+
18+
@rem 一時ディレクトリ
19+
set tmpDir=Temp
20+
21+
:Download
22+
@rem ダウンロードされたZIPファイルがあるなら解凍
23+
if exist %extDir%\%zipfilename% GOTO Extract
24+
25+
@rem ZIPファイルのダウンロード
26+
@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%')"
27+
28+
:Extract
29+
@rem 一時ディレクトリがあるならビルドへ
30+
if exist %extDir%\%tmpDir% GOTO Build
31+
32+
@rem ZIPファイルを一時ディレクトリに解凍
33+
@powershell -NoProfile -ExecutionPolicy Bypass -Command "expand-archive %zipfilename%"
34+
35+
:Build
36+
@rem ビルドがあるならコピーへ
37+
if exist "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\Frameworks\Infrastructure\Build_netcore30" GOTO Xcopy
38+
39+
@rem batファイルを使用してビルド
40+
cd "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\"
41+
echo | call 2_Build_NuGet_net45.bat
42+
echo | call 2_Build_NuGet_net46.bat
43+
echo | call 2_Build_NuGet_net47.bat
44+
echo | call 2_Build_NuGet_netstd20.bat
45+
echo | call 3_Build_Business_net45.bat
46+
echo | call 3_Build_Business_net46.bat
47+
echo | call 3_Build_Business_net47.bat
48+
echo | call 3_Build_Business_netcore20.bat
49+
echo | call 3_Build_Business_netcore30.bat
50+
51+
:Xcopy
52+
@rem ビルド出力をコピー
53+
cd %extDir%
54+
xcopy /Y /E "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\Frameworks\Infrastructure\Build_net45" "OpenTouryoAssemblies\Build_net45\"
55+
xcopy /Y /E "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\Frameworks\Infrastructure\Build_net46" "OpenTouryoAssemblies\Build_net46\"
56+
xcopy /Y /E "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\Frameworks\Infrastructure\Build_net47" "OpenTouryoAssemblies\Build_net47\"
57+
xcopy /Y /E "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\Frameworks\Infrastructure\Build_netcore20" "OpenTouryoAssemblies\Build_netcore20\"
58+
xcopy /Y /E "Temp\OpenTouryoTemplates-develop\root_VS2017\programs\CS\Frameworks\Infrastructure\Build_netcore30" "OpenTouryoAssemblies\Build_netcore30\"
59+
60+
pause
61+
62+
:EOF
63+
endlocal

‎root/programs/3_BuildLibsAtOtherReposInTimeOfDev.bat

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
@echo off
2+
3+
@rem 本バッチファイルの作成にあたり、以下のサイトを参考にしました。
4+
@rem 【Bat】【vim】香り屋Vimをダウンロードしてインストールまでするbatファイル - Qiita
5+
@rem https://qiita.com/koryuohproject/items/beed1a28ad6a1f60256d
6+
7+
setlocal
8+
9+
@rem ZIPファイル名
10+
set zipfilename=Temp.zip
11+
12+
@rem GitHubのZIPパス
13+
set srcUrl=https://github.com/OpenTouryoProject/OpenTouryo/archive/develop.zip
14+
15+
@rem 解凍ディレクトリ
16+
set extDir=%CD%
17+
18+
@rem 一時ディレクトリ
19+
set tmpDir=Temp
20+
21+
:Download
22+
@rem ダウンロードされたZIPファイルがあるなら解凍
23+
if exist %extDir%\%zipfilename% GOTO Extract
24+
25+
@rem ZIPファイルのダウンロード
26+
@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%')"
27+
28+
:Extract
29+
@rem 一時ディレクトリがあるならビルドへ
30+
if exist %extDir%\%tmpDir% GOTO Build
31+
32+
@rem ZIPファイルを一時ディレクトリに解凍
33+
@powershell -NoProfile -ExecutionPolicy Bypass -Command "expand-archive %zipfilename%"
34+
35+
:Build
36+
@rem ビルドがあるならコピーへ
37+
if exist "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore30" GOTO Xcopy
38+
39+
@rem batファイルを使用してビルド
40+
cd "Temp\OpenTouryo-develop\root\programs\CS\"
41+
echo | call 2_Build_NuGet_net45.bat
42+
echo | call 2_Build_NuGet_net46.bat
43+
echo | call 2_Build_NuGet_net47.bat
44+
echo | call 2_Build_NuGet_netstd20.bat
45+
echo | call 3_Build_Business_net45.bat
46+
echo | call 3_Build_Business_net46.bat
47+
echo | call 3_Build_Business_net47.bat
48+
echo | call 3_Build_Business_netcore20.bat
49+
echo | call 3_Build_Business_netcore30.bat
50+
51+
:Xcopy
52+
@rem ビルド出力をコピー
53+
cd %extDir%
54+
xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_net45" "OpenTouryoAssemblies\Build_net45\"
55+
xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_net46" "OpenTouryoAssemblies\Build_net46\"
56+
xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_net47" "OpenTouryoAssemblies\Build_net47\"
57+
xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore20" "OpenTouryoAssemblies\Build_netcore20\"
58+
xcopy /Y /E "Temp\OpenTouryo-develop\root\programs\CS\Frameworks\Infrastructure\Build_netcore30" "OpenTouryoAssemblies\Build_netcore30\"
59+
60+
pause
61+
62+
:EOF
63+
endlocal

‎root/programs/CS/5_Build_AsyncSvcSample.bat renamed to ‎root/programs/4_Build_Frameworks.bat

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ set CURRENT_DIR="%~dp0"
1616
call %CURRENT_DIR%z_Common.bat
1717

1818
rem --------------------------------------------------
19-
rem Build the batch Infrastructure(Business)
19+
rem Output xcopy after you build the batch Infrastructure(AsyncProcessing)
2020
rem --------------------------------------------------
2121

22-
..\nuget.exe restore "Samples\AsyncSvc_sample\AsyncSvc_sample.sln"
23-
%BUILDFILEPATH% %COMMANDLINE% "Samples\AsyncSvc_sample\AsyncSvc_sample.sln"
22+
%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Infrastructure\AsyncProcessing.sln"
2423

2524
pause
2625

‎root/programs/CS/4_Build_AsyncProcessingService.bat renamed to ‎root/programs/5_Build_AsyncProcessingService.bat

File renamed without changes.

‎root/programs/VB/5_Build_AsyncSvcSample.bat renamed to ‎root/programs/5_Build_AsyncSvcSample.bat

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@ rem --------------------------------------------------
1919
rem Build the batch Infrastructure(Business)
2020
rem --------------------------------------------------
2121

22-
..\nuget.exe restore "Samples\AsyncSvc_sample\AsyncSvc_sample.sln"
23-
%BUILDFILEPATH% %COMMANDLINE% "Samples\AsyncSvc_sample\AsyncSvc_sample.sln"
22+
..\nuget.exe restore "Samples\CS\AsyncSvc_sample.sln"
23+
%BUILDFILEPATH% %COMMANDLINE% "Samples\CS\AsyncSvc_sample.sln"
24+
25+
..\nuget.exe restore "Samples\VB\AsyncSvc_sample.sln"
26+
%BUILDFILEPATH% %COMMANDLINE% "Samples\VB\AsyncSvc_sample.sln"
2427

2528
pause
2629

‎root/programs/CS/6_CopyToService.bat renamed to ‎root/programs/6_CopyToService.bat

File renamed without changes.

‎root/programs/CS/7_SubmitTask.bat renamed to ‎root/programs/7_SubmitTask.bat

File renamed without changes.

‎root/programs/CS/3_Build_Framework.bat

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)