-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch develop v0.1.0.3116-Beta
- Loading branch information
Showing
38 changed files
with
684 additions
and
188 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
v0.1.0.3116-Beta |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<note> | ||
<version>0.0.0.#BuildNo#</version> | ||
<channel>Beta</channel> | ||
<timestamp>#Timestamp#</timestamp> | ||
<uri>https://github.com/anoyetta-academy/kagami/releases/download/#Tag#/#ArchiveFileName#</uri> | ||
<description> | ||
descriptions... | ||
</description> | ||
</note> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<release_notes> | ||
<name>kagami</name> | ||
|
||
<!-- | ||
#Placeholder# | ||
BuildNo : ビルド番号 | ||
Timestamp : タイムスタンプ | ||
Tag : タグ | ||
ArchiveFileName : アーカイブファイル名 | ||
--> | ||
|
||
<note> | ||
<version>0.1.0.3116</version> | ||
<channel>Beta</channel> | ||
<timestamp>2019-07-05T16:24:43.9716721+09:00</timestamp> | ||
<uri>https://github.com/anoyetta-academy/kagami/releases/download/v0.1.0.3116-Beta/kagami_v0_1_0_3116_Beta.zip</uri> | ||
<description> | ||
* Beta1 | ||
* 範囲スキルが重複してしまう場合がある不具合を修正した | ||
* スキルが抜けてしまう場合がある不具合を修正した | ||
* アクションのソート順をタイムスタンプ順から発生順に変更した | ||
* isActiveフラグが機能していなかった不具合を修正した | ||
* ログファイルのファイル名の書式を変更した | ||
* ログファイルの出力タイミングを変更した | ||
* encount の終了時に onEndEncounter イベントを発生させるようにした | ||
* PCをターゲットまたはフォーカスターゲットしたときそのPCのアクションをキャプチャーするようにした | ||
</description> | ||
</note> | ||
</release_notes> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
$cd = Split-Path -Parent $MyInvocation.MyCommand.Path | ||
Set-Location $cd | ||
|
||
# version | ||
$tag = $(Get-Content .\CURRENT_VERSION).Trim("\r").Trim("\n") | ||
Write-Output ("-> " + $tag) | ||
|
||
'-> commit' | ||
git commit -a -m $tag | ||
|
||
'-> checkout master' | ||
git checkout master | ||
|
||
'-> merge develop into master' | ||
git merge develop -m ("Merge branch develop " + $tag) --no-ff | ||
|
||
Write-Output ("-> tag " + $tag) | ||
git tag $tag | ||
|
||
git checkout develop | ||
|
||
'done!' | ||
pause |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
'-> pull master' | ||
git pull origin master | ||
|
||
'-> pull develop' | ||
git pull origin develop | ||
|
||
'done!' | ||
pause |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
'-> push master' | ||
git push origin master --tags | ||
|
||
'-> push develop' | ||
git push origin develop --tags | ||
|
||
'done!' | ||
pause |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,164 @@ | ||
# DebugMode? | ||
$isDebug = $false | ||
#$isDebug = $true | ||
|
||
function EndMake() { | ||
if (!$isDebug) { | ||
Stop-Transcript | Out-Null | ||
} | ||
|
||
'' | ||
Read-Host "終了するには何かキーを教えてください..." | ||
exit | ||
} | ||
|
||
function GetBuildNo( | ||
[datetime]$timestamp) { | ||
return ([int]($timestamp.ToString("yy")) + $timestamp.Month + $timestamp.Day).ToString("00") + $timestamp.ToString("HH") | ||
} | ||
|
||
# 現在のディレクトリを取得する | ||
$cd = Split-Path -Parent $MyInvocation.MyCommand.Path | ||
Set-Location $cd | ||
|
||
if (!$isDebug) { | ||
Start-Transcript make.log | Out-Null | ||
} | ||
|
||
# target | ||
$targetClientDirectory = Get-Item .\source\kagami | ||
$targetDirectories = @($targetClientDirectory) | ||
$depolyDirectory = ".\source\deploy" | ||
|
||
# tools | ||
$msbuild = "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" | ||
|
||
# バージョンを取得する | ||
## ビルド番号を決定する | ||
$timestamp = Get-Date | ||
$buildNo = GetBuildNo($timestamp) | ||
|
||
## リリースノートを取得する | ||
if ($isDebug) { | ||
if (Test-Path .\RELEASE_NOTES.bak) { | ||
Copy-Item -Force .\RELEASE_NOTES.bak .\RELEASE_NOTES.xml | ||
} | ||
} | ||
$releaseNotesXML = [xml] (Get-Content .\RELEASE_NOTES.xml -Encoding utf8) | ||
if ($releaseNotesXML -eq $null) { | ||
EndMake | ||
} | ||
$lastestNote = $releaseNotesXML.release_notes.note | Select-Object -Last 1 | ||
|
||
## バージョン番号を決定する | ||
$version = $lastestNote.version.Replace("#BuildNo#", $buildNo) | ||
$channel = $lastestNote.channel | ||
$tag = ("v" + $version + "-" + $channel) | ||
|
||
## アプリケーション名を取得する | ||
$appName = $releaseNotesXML.release_notes.name | ||
|
||
## アーカイブファイル名を決定する | ||
$archiveFileName = $appName + "_v" + $version.Replace(".", "_") + "_" + $channel + ".zip" | ||
|
||
## リリースノートを置換する | ||
$content = Get-Content .\RELEASE_NOTES.xml -Encoding utf8 | ||
$content = $content.Replace("#BuildNo#", $buildNo) | ||
$content = $content.Replace("#Timestamp#", $timestamp.ToString("o")) | ||
$content = $content.Replace("#ArchiveFileName#", $archiveFileName) | ||
$content = $content.Replace("#Tag#", $tag) | ||
Copy-Item -Force .\RELEASE_NOTES.xml .\RELEASE_NOTES.bak | ||
$content | Out-File -FilePath .\RELEASE_NOTES.xml -Encoding utf8 | ||
|
||
Write-Output "***" | ||
Write-Output ("*** " + $appName + " v" + $version + " " + $channel + " ***") | ||
Write-Output "***" | ||
|
||
# Version.cs を上書きする | ||
$content = Get-Content .\source\tools\Version.master.cs -Encoding utf8 | ||
$content = $content.Replace("#VERSION#", $version) | ||
$content = $content.Replace("#CHANNEL#", $channel) | ||
foreach ($d in $targetDirectories) { | ||
$content | Out-File -FilePath (Join-Path $d "Version.cs") -Encoding utf8 | ||
} | ||
|
||
'-> Build' | ||
# Delete Release Directory | ||
foreach ($d in $targetDirectories) { | ||
$out = Join-Path $d "bin\Release\*" | ||
if (Test-Path $out) { | ||
Remove-Item -Recurse -Force $out | ||
} | ||
} | ||
|
||
$target = Get-Item .\source\*.sln | ||
& $msbuild $target /nologo /v:minimal /t:Clean /p:Configuration=Release | ||
Start-Sleep -m 100 | ||
|
||
'-> Build Client' | ||
$target = Get-Item $targetClientDirectory\*.csproj | ||
& $msbuild $target /nologo /v:minimal /t:Build /p:Configuration=Release | Write-Output | ||
Start-Sleep -m 100 | ||
|
||
# Successed? build | ||
foreach ($d in $targetDirectories) { | ||
$out = Join-Path $d "bin\Release" | ||
if (!(Test-Path $out)) { | ||
EndMake | ||
} | ||
} | ||
|
||
foreach ($d in $targetDirectories) { | ||
# pdb を削除する | ||
# Remove-Item -Force (Join-Path $d "bin\Release\*.pdb") | ||
|
||
# app.config を削除する | ||
$targets = @( | ||
(Join-Path $d "bin\Release\RINGS.exe.config"), | ||
(Join-Path $d "bin\Release\aframe.Updater.exe.config")) | ||
|
||
foreach ($t in $targets) { | ||
if (Test-Path $t) { | ||
Remove-Item -Force $t | ||
} | ||
} | ||
} | ||
|
||
'-> Deploy' | ||
# deploy ディレクトリを作る | ||
if (!(Test-Path $depolyDirectory)) { | ||
New-Item -ItemType Directory $depolyDirectory >$null | ||
} | ||
|
||
$deployBase = Join-Path $depolyDirectory $archiveFileName.Replace(".zip", "") | ||
if (Test-Path $deployBase) { | ||
Get-ChildItem -Path $deployBase -Recurse | Remove-Item -Force -Recurse | ||
Remove-Item -Recurse -Force $deployBase | ||
} | ||
|
||
$deployClient = $deployBase | ||
New-Item -ItemType Directory $deployClient >$null | ||
|
||
# client を配置する | ||
'-> Deploy Client' | ||
Copy-Item -Force -Recurse $targetClientDirectory\bin\Release\* $deployClient | ||
|
||
# client をアーカイブする | ||
'-> Archive Client' | ||
Compress-Archive -Force $deployClient\* $deployBase\..\$archiveFileName | ||
Get-ChildItem -Path $deployBase -Recurse | Remove-Item -Force -Recurse | ||
Remove-Item -Recurse -Force $deployBase | ||
|
||
if (!$isDebug) { | ||
if (Test-Path .\RELEASE_NOTES.bak) { | ||
Remove-Item -Force .\RELEASE_NOTES.bak | ||
} | ||
} | ||
|
||
$tag | Out-File .\CURRENT_VERSION -Encoding utf8 | ||
|
||
Write-Output "***" | ||
Write-Output ("*** " + $appName + " v" + $version + " " + $channel + ", Completed! ***") | ||
Write-Output "***" | ||
|
||
EndMake |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/src |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
Oops, something went wrong.