From ff3a43a4a6969768eaae344f85b85a92bd754216 Mon Sep 17 00:00:00 2001 From: wh201906 Date: Sun, 13 Mar 2022 20:36:50 +0800 Subject: [PATCH] V0.2.5 --- CHANGELOG.md | 61 ++++++++++++++++++++++++++++++++ README.md | 58 ++---------------------------- deploy/deploy.py | 54 +++++++++++++++++++++------- doc/CHANGELOG/CHANGELOG_zh_CN.md | 61 ++++++++++++++++++++++++++++++++ doc/README/README_zh_CN.md | 59 ++---------------------------- src/Proxmark3GUI.pro | 2 +- 6 files changed, 170 insertions(+), 125 deletions(-) create mode 100644 CHANGELOG.md create mode 100644 doc/CHANGELOG/CHANGELOG_zh_CN.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..698e40f --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,61 @@ +# Change Log + +[中文](doc/CHANGELOG/CHANGELOG_zh_CN.md) + +### V0.2.5 ++ Fix bug [#28](https://github.com/wh201906/Proxmark3GUI/issues/28) + +### V0.2.4 ++ Clone EM410x card to T55xx card + +### V0.2.3 ++ Fix bug [#27](https://github.com/wh201906/Proxmark3GUI/issues/27) ++ Try to support Non-ASCII path + +### V0.2.2 ++ Load command format from external json file ++ Fix bug [#20](https://github.com/wh201906/Proxmark3GUI/issues/20), [#21](https://github.com/wh201906/Proxmark3GUI/issues/21), [#22](https://github.com/wh201906/Proxmark3GUI/issues/22) ++ Support Iceman/RRG repo v4.13441 + +### V0.2.1 ++ Optimize MIFARE Classic reading logic ++ Fix bug [#16](https://github.com/wh201906/Proxmark3GUI/issues/16) ++ Fix bug [#15](https://github.com/wh201906/Proxmark3GUI/issues/15) partially (the path can contain spaces now) + +### V0.2 ++ Use Dock widget for more flexible layout ++ Support basic LF commands ++ Fix a bug in RawCommand tab + +### V0.1.4 ++ Optimize performance ++ Optimize UI ++ Search available ports automatically ++ Add High-DPI support ++ Support configuring environment variables by script +(Useful when the client requires specific environment variables) ++ All functions are compatible with Iceman/RRG repo(tested on v4.9237) ++ Support specifying client working directory ++ Fix some bugs + +### V0.1.3 ++ Fix Trailer Decoder ++ Add feedback when writing selected blocks + +### V0.1.2 ++ Optimize read logic ++ Make UI Customizable ++ Save client path automatically ++ Add Trailer Decoder(Deprecated, plz use V0.1.3 or higher version) ++ Support read/write selected blocks ++ Support a few Iceman functions ++ Fix some bugs + +### V0.1.1 ++ Complete Mifare module(support simulate and sniff) + +### V0.1 ++ Able to deal with Mifare card and related files + +### V0.0.1 ++ a dumb version with a useless GUI and a serial choose box. \ No newline at end of file diff --git a/README.md b/README.md index db089ae..a3aa31e 100644 --- a/README.md +++ b/README.md @@ -68,59 +68,5 @@ Great thanks to him. [2.Edit Mifare Classic data](doc/tutorial/Edit_Mifare_Classic_data/Edit_Mifare_Classic_data.md)(Proxmark3 hardware is not necessary) *** -## Update Log: - -### V0.2.4 -+ Clone EM410x card to T55xx card - -### V0.2.3 -+ Fix bug [#27](https://github.com/wh201906/Proxmark3GUI/issues/27) -+ Try to support Non-ASCII path - -### V0.2.2 -+ Load command format from external json file -+ Fix bug [#20](https://github.com/wh201906/Proxmark3GUI/issues/20), [#21](https://github.com/wh201906/Proxmark3GUI/issues/21), [#22](https://github.com/wh201906/Proxmark3GUI/issues/22) -+ Support Iceman/RRG repo v4.13441 - -### V0.2.1 -+ Optimize MIFARE Classic reading logic -+ Fix bug [#16](https://github.com/wh201906/Proxmark3GUI/issues/16) -+ Fix bug [#15](https://github.com/wh201906/Proxmark3GUI/issues/15) partially (the path can contain spaces now) - -### V0.2 -+ Use Dock widget for more flexible layout -+ Support basic LF commands -+ Fix a bug in RawCommand tab - -### V0.1.4 -+ Optimize performance -+ Optimize UI -+ Search available ports automatically -+ Add High-DPI support -+ Support configuring environment variables by script -(Useful when the client requires specific environment variables) -+ All functions are compatible with Iceman/RRG repo(tested on v4.9237) -+ Support specifying client working directory -+ Fix some bugs - -### V0.1.3 -+ Fix Trailer Decoder -+ Add feedback when writing selected blocks - -### V0.1.2 -+ Optimize read logic -+ Make UI Customizable -+ Save client path automatically -+ Add Trailer Decoder(Deprecated, plz use V0.1.3 or higher version) -+ Support read/write selected blocks -+ Support a few Iceman functions -+ Fix some bugs - -### V0.1.1 -+ Complete Mifare module(support simulate and sniff) - -### V0.1 -+ Able to deal with Mifare card and related files - -### V0.0.1 -+ a dumb version with a useless GUI and a serial choose box. \ No newline at end of file +## Change Log +[Change Log](CHANGELOG.md) diff --git a/deploy/deploy.py b/deploy/deploy.py index e527060..44ced91 100644 --- a/deploy/deploy.py +++ b/deploy/deploy.py @@ -3,6 +3,8 @@ from win32api import GetFileVersionInfo from json import load from re import fullmatch, IGNORECASE +compressDirList = [] + def getPEVersion(fname): try: @@ -66,6 +68,7 @@ if os.path.exists(configPath): print(configPath, "exists, replacing...") shutil.rmtree(configPath) shutil.copytree("../config", configPath) +compressDirList.append(dst32Dir) if os.path.exists(dst64Dir) and os.path.exists(dst64Path): print(dst64Path, "exists, replacing...") @@ -79,20 +82,47 @@ if os.path.exists(configPath): print(configPath, "exists, replacing...") shutil.rmtree(configPath) shutil.copytree("../config", configPath) +compressDirList.append(dst64Dir) # TODO: GUI+client +clientList = [ + "official-v3.1.0", "rrg_other-v4.13441", "rrg_other-v4.14434", + "rrg_other-v4.14831" +] + + +def generateClient(clientName): + global compressDirList + clientSrcDir = "./client/" + clientName + clientDstDir = "./" + ver64 + "-win64-" + clientName + clientDstGUIDir = clientDstDir + "/GUI" + + if os.path.exists(clientDstDir) and os.path.exists(clientDstGUIDir): + print(clientDstGUIDir, "exists, replacing...") + shutil.rmtree(clientDstGUIDir) + elif not os.path.exists(clientDstDir): + print(clientDstDir, "doesn't exist, creating...") + shutil.copytree(clientSrcDir, clientDstDir) + shutil.copytree(dst64Dir, clientDstGUIDir) + if "official" in clientName: + shutil.copyfile("./client/GUIsettings_Official.ini", + clientDstGUIDir + "/GUIsettings.ini") + elif "rrg" in clientName: + shutil.copyfile("./client/GUIsettings_RRG.ini", + clientDstGUIDir + "/GUIsettings.ini") + compressDirList.append(clientDstDir) + + +for cl in clientList: + generateClient(cl) use7z = input("Compress?(y/N)") if fullmatch("yes|y", use7z, IGNORECASE): - archive32Path = dst32Dir + ".7z" - archive64Path = dst64Dir + ".7z" - - if os.path.exists(archive32Path): - print(archive32Path, "exists, replacing...") - os.remove(archive32Path) - os.system("7z a -t7z -mmt8 -mx9 " + archive32Path + " " + dst32Dir) - - if os.path.exists(archive64Path): - print(archive64Path, "exists, replacing...") - os.remove(archive64Path) - os.system("7z a -t7z -mmt8 -mx9 " + archive64Path + " " + dst64Dir) + print(compressDirList) + for it in compressDirList: + archivePath = it + ".7z" + + if os.path.exists(archivePath): + print(archivePath, "exists, replacing...") + os.remove(archivePath) + os.system("7z a -t7z -mmt8 -mx9 " + archivePath + " " + it) diff --git a/doc/CHANGELOG/CHANGELOG_zh_CN.md b/doc/CHANGELOG/CHANGELOG_zh_CN.md new file mode 100644 index 0000000..f71b335 --- /dev/null +++ b/doc/CHANGELOG/CHANGELOG_zh_CN.md @@ -0,0 +1,61 @@ +# 更新日志 + +[English](../../CHANGELOG.md) + +### V0.2.5 ++ 修复 [#28](https://github.com/wh201906/Proxmark3GUI/issues/28) + +### V0.2.4 ++ 复制EM410x卡（一种常见的低频ID卡） + +### V0.2.3 ++ 修复 [#27](https://github.com/wh201906/Proxmark3GUI/issues/27) ++ 尝试支持中文启动路径 + +### V0.2.2 ++ 从外部文件加载客户端命令格式 ++ 修复 [#20](https://github.com/wh201906/Proxmark3GUI/issues/20), [#21](https://github.com/wh201906/Proxmark3GUI/issues/21), [#22](https://github.com/wh201906/Proxmark3GUI/issues/22) ++ 兼容冰人版客户端 v4.13441 + +### V0.2.1 ++ 优化MIFARE Classic读卡逻辑 ++ 修复 [#16](https://github.com/wh201906/Proxmark3GUI/issues/16) （配合新版RRG固件时无法读取扇区数据） ++ 修复 [#15](https://github.com/wh201906/Proxmark3GUI/issues/15) （路径中支持空格） + +### V0.2 ++ 使用浮动窗口，界面配置更加灵活 ++ 支持部分低频命令 ++ 修复原始命令选项卡中的一个Bug + +### V0.1.4 ++ 优化性能 ++ 优化用户界面 ++ 自动搜索可用端口 ++ 支持高分屏 ++ 可通过外部脚本配置环境变量 +(在客户端需要配置环境变量时很有用) ++ 全功能兼容冰人版（在v4.9237上测试通过） ++ 支持指定客户端工作路径 ++ 修复部分bug + +### V0.1.3 ++ 修复访问控制位解码器 ++ 写多个块时显示写入结果 + +### V0.1.2 ++ 优化读卡逻辑 ++ UI自定义 ++ 自动保存客户端路径 ++ 添加访问控制位解码器（也可用于自己构造访问控制位）（有bug，请使用V0.1.3或更高版本） ++ 支持仅读写选中块 ++ 支持部分冰人功能 ++ 修复部分bug + +### V0.1.1 ++ 完成整个Mifare模块（支持模拟卡和嗅探功能） + +### V0.1 ++ 支持处理Mifare卡片及相关数据文件 + +### V0.0.1 ++ 一个带串口选择框的实验版本 \ No newline at end of file diff --git a/doc/README/README_zh_CN.md b/doc/README/README_zh_CN.md index d477aa3..9e050d5 100644 --- a/doc/README/README_zh_CN.md +++ b/doc/README/README_zh_CN.md @@ -65,59 +65,6 @@ release页面中有含客户端的GUI。这个GUI也可以搭配你自己的客 [1.快速上手](../tutorial/Quickstart/quickstart_zh_CN.md) [2.编辑Mifare(IC)卡数据](../tutorial/Edit_Mifare_Classic_data/Edit_Mifare_Classic_data_zh_CN.md)（无需PM3硬件） *** -## 更新日志: - -### V0.2.4 -+ 复制EM410x卡（一种常见的低频ID卡） - -### V0.2.3 -+ 修复 [#27](https://github.com/wh201906/Proxmark3GUI/issues/27) -+ 尝试支持中文启动路径 - -### V0.2.2 -+ 从外部文件加载客户端命令格式 -+ 修复 [#20](https://github.com/wh201906/Proxmark3GUI/issues/20), [#21](https://github.com/wh201906/Proxmark3GUI/issues/21), [#22](https://github.com/wh201906/Proxmark3GUI/issues/22) -+ 兼容冰人版客户端 v4.13441 - -### V0.2.1 -+ 优化MIFARE Classic读卡逻辑 -+ 修复 [#16](https://github.com/wh201906/Proxmark3GUI/issues/16) （配合新版RRG固件时无法读取扇区数据） -+ 修复 [#15](https://github.com/wh201906/Proxmark3GUI/issues/15) （路径中支持空格） - -### V0.2 -+ 使用浮动窗口，界面配置更加灵活 -+ 支持部分低频命令 -+ 修复原始命令选项卡中的一个Bug - -### V0.1.4 -+ 优化性能 -+ 优化用户界面 -+ 自动搜索可用端口 -+ 支持高分屏 -+ 可通过外部脚本配置环境变量 -(在客户端需要配置环境变量时很有用) -+ 全功能兼容冰人版（在v4.9237上测试通过） -+ 支持指定客户端工作路径 -+ 修复部分bug - -### V0.1.3 -+ 修复访问控制位解码器 -+ 写多个块时显示写入结果 - -### V0.1.2 -+ 优化读卡逻辑 -+ UI自定义 -+ 自动保存客户端路径 -+ 添加访问控制位解码器（也可用于自己构造访问控制位）（有bug，请使用V0.1.3或更高版本） -+ 支持仅读写选中块 -+ 支持部分冰人功能 -+ 修复部分bug - -### V0.1.1 -+ 完成整个Mifare模块（支持模拟卡和嗅探功能） - -### V0.1 -+ 支持处理Mifare卡片及相关数据文件 - -### V0.0.1 -+ 一个带串口选择框的实验版本 \ No newline at end of file + +## 更新日志 +[更新日志](../CHANGELOG/CHANGELOG_zh_CN.md) diff --git a/src/Proxmark3GUI.pro b/src/Proxmark3GUI.pro index 6fca549..e915502 100644 --- a/src/Proxmark3GUI.pro +++ b/src/Proxmark3GUI.pro @@ -59,7 +59,7 @@ qnx: target.path = /tmp/$${TARGET}/bin else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -VERSION = 0.2.4 +VERSION = 0.2.5 QMAKE_TARGET_PRODUCT = "Proxmark3GUI" QMAKE_TARGET_DESCRIPTION = "Proxmark3GUI" QMAKE_TARGET_COMPANY = "wh201906"