diff --git a/app-win/nsis/v1.x/xxxk_1.x_gb18030.nsi b/app-win/nsis/deprecated/xxxk_1.x_gb18030.nsi similarity index 100% rename from app-win/nsis/v1.x/xxxk_1.x_gb18030.nsi rename to app-win/nsis/deprecated/xxxk_1.x_gb18030.nsi diff --git a/app-win/nsis/xxxk.nsi b/app-win/nsis/xxxk.nsi index 6fb4f04..41cc555 100644 --- a/app-win/nsis/xxxk.nsi +++ b/app-win/nsis/xxxk.nsi @@ -6,8 +6,8 @@ # 声明常量 !define XXXK_NAME_CN "小小星空" !define XXXK_NAME_EN "xxxk" -!define XXXK_VER "2.0.0.0" -!define XXXK_VER_DATE "20241117" +!define XXXK_VER "2.0.1.0" +!define XXXK_VER_DATE "20241124" !define XXXK_URL_HOME "https://xkinput.github.io/xxxk-help" !define XXXK_URL_DOWNLOAD "http://xxxk.ysepan.com" !define XXXK_REG_ROOT "HKLM" diff --git a/app-win/nsis/xxxkFuncAppFiles.nsh b/app-win/nsis/xxxkFuncAppFiles.nsh index 7ee74f2..34af55d 100644 --- a/app-win/nsis/xxxkFuncAppFiles.nsh +++ b/app-win/nsis/xxxkFuncAppFiles.nsh @@ -39,8 +39,6 @@ Function xxxkFuncAppFiles File "${XXXK_DIR_DATA_BASE}\bd.txt" File "${XXXK_DIR_DATA_BASE}\bihua.bin" File "${XXXK_DIR_DATA_BASE}\crab.txt" - File "${XXXK_DIR_DATA_BASE}\keyboard.ini" - File "${XXXK_DIR_DATA_BASE}\layout.txt" File "${XXXK_DIR_DATA_BASE}\menu.ini" WriteINIStr $INSTDIR\menu.ini "about" "exec" "$$MSG(v${XXXK_VER}-Build${XXXK_VER_DATE})" File "${XXXK_DIR_DATA_BASE}\README.txt" @@ -101,8 +99,8 @@ Function un.xxxkFuncAppFiles Delete "$INSTDIR\bd.txt" Delete "$INSTDIR\bihua.bin" Delete "$INSTDIR\crab.txt" - Delete "$INSTDIR\keyboard.ini" - Delete "$INSTDIR\layout.txt" + Delete "$INSTDIR\keyboard.ini" # 历史遗留 + Delete "$INSTDIR\layout.txt" # 历史遗留 Delete "$INSTDIR\menu.ini" Delete "$INSTDIR\README.txt" Delete "$INSTDIR\urls.txt" diff --git a/app-win/nsis/xxxkFuncYongIni.nsh b/app-win/nsis/xxxkFuncYongIni.nsh index cc2b70a..ef55c56 100644 --- a/app-win/nsis/xxxkFuncYongIni.nsh +++ b/app-win/nsis/xxxkFuncYongIni.nsh @@ -2,6 +2,7 @@ !include "IniGetSectionNames.nsh" !include "xxxkFuncBase.nsh" !include "WinVer.nsh" +Var /GLOBAL xxxkVarHomeDir # 变量不会自动提升,因此要放前面 # 把 pinyin 方案添加到目标 yong.ini # 调用方法:${xxxkAddPinyinToIni} "目标ini" @@ -148,7 +149,6 @@ FunctionEnd Function xxxkFuncYongIni - Var /GLOBAL xxxkVarHomeDir ${xxxkGetHomeDir} $xxxkVarHomeDir "$INSTDIR" ${If} "$xxxkVarHomeDir" == "$INSTDIR\.yong" ${OrIf} ${SectionIsSelected} ${optPortable} diff --git a/data-base/keyboard.ini b/data-base/deprecated/keyboard.ini similarity index 100% rename from data-base/keyboard.ini rename to data-base/deprecated/keyboard.ini diff --git a/data-base/layout.txt b/data-base/deprecated/layout.txt similarity index 100% rename from data-base/layout.txt rename to data-base/deprecated/layout.txt diff --git "a/data-base/yong_android(\351\234\200\350\246\201\345\237\272\344\272\216Yong.ini\346\233\264\346\226\260).ini" "b/data-base/deprecated/yong_android(\351\234\200\350\246\201\345\237\272\344\272\216Yong.ini\346\233\264\346\226\260).ini" similarity index 100% rename from "data-base/yong_android(\351\234\200\350\246\201\345\237\272\344\272\216Yong.ini\346\233\264\346\226\260).ini" rename to "data-base/deprecated/yong_android(\351\234\200\350\246\201\345\237\272\344\272\216Yong.ini\346\233\264\346\226\260).ini" diff --git "a/data-base/yong_win(\344\270\212\344\270\200\347\211\210\346\234\254).ini" "b/data-base/deprecated/yong_win(\344\270\212\344\270\200\347\211\210\346\234\254).ini" similarity index 100% rename from "data-base/yong_win(\344\270\212\344\270\200\347\211\210\346\234\254).ini" rename to "data-base/deprecated/yong_win(\344\270\212\344\270\200\347\211\210\346\234\254).ini"