chore.修改python脚本及版本包

This commit is contained in:
MistEO
2022-04-01 23:43:16 +08:00
parent 43065775a0
commit 83112537ab
10 changed files with 28 additions and 12 deletions

Binary file not shown.

View File

@@ -2,5 +2,5 @@
namespace asst
{
constexpr static const char* Version = "v4.0-alpha.1";
constexpr static const char* Version = "DEBUG VERSION";
}

View File

@@ -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()

View File

@@ -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()

View File

@@ -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

5
tools/update_version.sh Normal file
View File

@@ -0,0 +1,5 @@
#!/bin/sh
. ./version.sh
sed -i "s/DEBUG VERSION/"$Version"/" ../src/MeoAssistant/Version.h

12
tools/version.sh Normal file
View File

@@ -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"

View File

@@ -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
Package="../x64/MaaCore-Windows-x64-"$Version".zip"
TargetDir="../x64/Release"
7z.exe a $Package $TargetDir/resource $TargetDir/*.dll $TargetDir/Python

View File

@@ -1,2 +0,0 @@
[InternetShortcut]
URL=https://github.com/MistEO/MeoAssistantArknights/blob/master/README.md

View File

@@ -1,2 +0,0 @@
[InternetShortcut]
URL=https://github.com/MistEO/MeoAssistantArknights/issues