diff --git a/3rdparty/bin/aria2c.exe b/3rdparty/bin/aria2c.exe deleted file mode 100644 index 38caa6ab31..0000000000 Binary files a/3rdparty/bin/aria2c.exe and /dev/null differ diff --git a/src/MeoAssistant/Version.h b/src/MeoAssistant/Version.h index 116b5c30bb..de415f9699 100644 --- a/src/MeoAssistant/Version.h +++ b/src/MeoAssistant/Version.h @@ -2,5 +2,5 @@ namespace asst { - constexpr static const char* Version = "v4.0-alpha.1"; + constexpr static const char* Version = "DEBUG VERSION"; } diff --git a/src/Python/asst.py b/src/Python/asst.py index 20630f514a..e06f0261d6 100644 --- a/src/Python/asst.py +++ b/src/Python/asst.py @@ -36,7 +36,7 @@ class Asst: Asst.__lib = ctypes.WinDLL(str(Asst.__libpath)) else: Asst.__libpath = pathlib.Path(path) / 'libMeoAssistant.so' - os.environ['LD_LIBRARY_PATH'] += path + os.environ['LD_LIBRARY_PATH'] += os.pathsep + path Asst.__lib = ctypes.CDLL(str(Asst.__libpath)) Asst.__set_lib_properties() diff --git a/src/Python/sample.py b/src/Python/sample.py index 69f85c4110..ba1a64df17 100644 --- a/src/Python/sample.py +++ b/src/Python/sample.py @@ -58,7 +58,8 @@ if __name__ == "__main__": asst.append_task('Award') # asst.append_task('Copilot', { # 'stage_name': '千层蛋糕', - # 'filename': './GA-EX8-raid.json' + # 'filename': './GA-EX8-raid.json', + # 'formation': False # }) asst.start() diff --git a/tools/build_release.bat b/tools/build_release.bat index 0e93a7cb4b..e00d15e635 100644 --- a/tools/build_release.bat +++ b/tools/build_release.bat @@ -1,3 +1,4 @@ +sh ./update_version.sh MSBuild.exe ..\MeoAssistantArknights.sln /p:Configuration=Release /p:Platform=x64 /t:Rebuild call .\update_resource_rel.bat pause diff --git a/tools/update_version.sh b/tools/update_version.sh new file mode 100644 index 0000000000..f8f1de50b9 --- /dev/null +++ b/tools/update_version.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +. ./version.sh + +sed -i "s/DEBUG VERSION/"$Version"/" ../src/MeoAssistant/Version.h diff --git a/tools/version.sh b/tools/version.sh new file mode 100644 index 0000000000..f85663a5f9 --- /dev/null +++ b/tools/version.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +LatestTagId=$(git rev-list --tags --max-count=1 --abbrev-commit) +LatestCommitId=$(git rev-list --all --max-count=1 --abbrev-commit) + +if [ $LatestTagId = $LatestCommitId ]; then + Version=$(git describe --tags $LatestTagId) +else + Version="c""$LatestCommitId" +fi + +echo "Version: $Version" diff --git a/tools/zip_release.sh b/tools/zip_release.sh index f2f89f262a..c7c841e919 100644 --- a/tools/zip_release.sh +++ b/tools/zip_release.sh @@ -1,8 +1,9 @@ #!/bin/sh -TargetDir="../x64/Release" -LatestTag=$(git describe --tags $(git rev-list --tags --max-count=1)) -Package="../x64/MeoAssistantArknights_"$LatestTag".zip" +. ./version.sh -cp ./*.url $TargetDir -7z.exe a $Package $TargetDir/resource $TargetDir/*.dll $TargetDir/aria2c.exe $TargetDir/MeoAsstGui.exe $TargetDir/*.url \ No newline at end of file +Package="../x64/MaaCore-Windows-x64-"$Version".zip" + +TargetDir="../x64/Release" + +7z.exe a $Package $TargetDir/resource $TargetDir/*.dll $TargetDir/Python diff --git a/tools/使用说明.url b/tools/使用说明.url deleted file mode 100644 index 00bff04f26..0000000000 --- a/tools/使用说明.url +++ /dev/null @@ -1,2 +0,0 @@ -[InternetShortcut] -URL=https://github.com/MistEO/MeoAssistantArknights/blob/master/README.md diff --git a/tools/问题反馈.url b/tools/问题反馈.url deleted file mode 100644 index 40d2c43106..0000000000 --- a/tools/问题反馈.url +++ /dev/null @@ -1,2 +0,0 @@ -[InternetShortcut] -URL=https://github.com/MistEO/MeoAssistantArknights/issues