diff --git a/Apertium4Windows/apertium-interchunk.exe b/Apertium4Windows/apertium-interchunk.exe old mode 100644 new mode 100755 index f6a9b83d..dbe81384 Binary files a/Apertium4Windows/apertium-interchunk.exe and b/Apertium4Windows/apertium-interchunk.exe differ diff --git a/Apertium4Windows/apertium-postchunk.exe b/Apertium4Windows/apertium-postchunk.exe old mode 100644 new mode 100755 index 34fc71db..6b68a202 Binary files a/Apertium4Windows/apertium-postchunk.exe and b/Apertium4Windows/apertium-postchunk.exe differ diff --git a/Apertium4Windows/apertium-preprocess-transfer.exe b/Apertium4Windows/apertium-preprocess-transfer.exe old mode 100644 new mode 100755 index 9b4f3aea..a50b98bb Binary files a/Apertium4Windows/apertium-preprocess-transfer.exe and b/Apertium4Windows/apertium-preprocess-transfer.exe differ diff --git a/Apertium4Windows/apertium-transfer.exe b/Apertium4Windows/apertium-transfer.exe old mode 100644 new mode 100755 index d0b9e670..efaee839 Binary files a/Apertium4Windows/apertium-transfer.exe and b/Apertium4Windows/apertium-transfer.exe differ diff --git a/Apertium4Windows/icudt66.dll b/Apertium4Windows/icudt74.dll old mode 100644 new mode 100755 similarity index 73% rename from Apertium4Windows/icudt66.dll rename to Apertium4Windows/icudt74.dll index e2b27eb0..2fa54206 Binary files a/Apertium4Windows/icudt66.dll and b/Apertium4Windows/icudt74.dll differ diff --git a/Apertium4Windows/icuin66.dll b/Apertium4Windows/icuin66.dll deleted file mode 100644 index a5784b02..00000000 Binary files a/Apertium4Windows/icuin66.dll and /dev/null differ diff --git a/Apertium4Windows/icuin74.dll b/Apertium4Windows/icuin74.dll new file mode 100755 index 00000000..ea00990e Binary files /dev/null and b/Apertium4Windows/icuin74.dll differ diff --git a/Apertium4Windows/icuio66.dll b/Apertium4Windows/icuio66.dll deleted file mode 100644 index 222cc962..00000000 Binary files a/Apertium4Windows/icuio66.dll and /dev/null differ diff --git a/Apertium4Windows/icuio74.dll b/Apertium4Windows/icuio74.dll new file mode 100755 index 00000000..35af44d4 Binary files /dev/null and b/Apertium4Windows/icuio74.dll differ diff --git a/Apertium4Windows/icuuc66.dll b/Apertium4Windows/icuuc66.dll deleted file mode 100644 index 23e9faaf..00000000 Binary files a/Apertium4Windows/icuuc66.dll and /dev/null differ diff --git a/Apertium4Windows/icuuc74.dll b/Apertium4Windows/icuuc74.dll new file mode 100755 index 00000000..6a6e08c7 Binary files /dev/null and b/Apertium4Windows/icuuc74.dll differ diff --git a/Apertium4Windows/libgcc_s_seh-1.dll b/Apertium4Windows/libgcc_s_seh-1.dll new file mode 100755 index 00000000..fa5ebc81 Binary files /dev/null and b/Apertium4Windows/libgcc_s_seh-1.dll differ diff --git a/Apertium4Windows/libgcc_s_sjlj-1.dll b/Apertium4Windows/libgcc_s_sjlj-1.dll deleted file mode 100644 index af60054d..00000000 Binary files a/Apertium4Windows/libgcc_s_sjlj-1.dll and /dev/null differ diff --git a/Apertium4Windows/libiconv-2.dll b/Apertium4Windows/libiconv-2.dll old mode 100644 new mode 100755 index cf75063c..3956700f Binary files a/Apertium4Windows/libiconv-2.dll and b/Apertium4Windows/libiconv-2.dll differ diff --git a/Apertium4Windows/libiconv2.dll b/Apertium4Windows/libiconv2.dll deleted file mode 100644 index 747073f1..00000000 Binary files a/Apertium4Windows/libiconv2.dll and /dev/null differ diff --git a/Apertium4Windows/libintl3.dll b/Apertium4Windows/libintl3.dll deleted file mode 100644 index ec11e6b1..00000000 Binary files a/Apertium4Windows/libintl3.dll and /dev/null differ diff --git a/Apertium4Windows/liblttoolbox.dll b/Apertium4Windows/liblttoolbox.dll new file mode 100755 index 00000000..e24f6508 Binary files /dev/null and b/Apertium4Windows/liblttoolbox.dll differ diff --git a/Apertium4Windows/liblzma-5.dll b/Apertium4Windows/liblzma-5.dll old mode 100644 new mode 100755 index 4b1c2c4a..c3cef696 Binary files a/Apertium4Windows/liblzma-5.dll and b/Apertium4Windows/liblzma-5.dll differ diff --git a/Apertium4Windows/libstdc++-6.dll b/Apertium4Windows/libstdc++-6.dll old mode 100644 new mode 100755 index 581750fe..32bf8517 Binary files a/Apertium4Windows/libstdc++-6.dll and b/Apertium4Windows/libstdc++-6.dll differ diff --git a/Apertium4Windows/libwinpthread-1.dll b/Apertium4Windows/libwinpthread-1.dll old mode 100644 new mode 100755 index 17bef62e..89e2df4c Binary files a/Apertium4Windows/libwinpthread-1.dll and b/Apertium4Windows/libwinpthread-1.dll differ diff --git a/Apertium4Windows/libxml2-2.dll b/Apertium4Windows/libxml2-2.dll old mode 100644 new mode 100755 index 83ffdc63..042a8ba3 Binary files a/Apertium4Windows/libxml2-2.dll and b/Apertium4Windows/libxml2-2.dll differ diff --git a/Apertium4Windows/lt-comp.exe b/Apertium4Windows/lt-comp.exe old mode 100644 new mode 100755 index 43499410..3a6bdb83 Binary files a/Apertium4Windows/lt-comp.exe and b/Apertium4Windows/lt-comp.exe differ diff --git a/Apertium4Windows/lt-proc.exe b/Apertium4Windows/lt-proc.exe new file mode 100755 index 00000000..b0179ddf Binary files /dev/null and b/Apertium4Windows/lt-proc.exe differ diff --git a/Apertium4Windows/zlib1.dll b/Apertium4Windows/zlib1.dll old mode 100644 new mode 100755 index c1fced5a..de4429fb Binary files a/Apertium4Windows/zlib1.dll and b/Apertium4Windows/zlib1.dll differ diff --git a/CreateInstallFolder2-0.bat b/CreateInstallFolder2-0.bat index 2e10a907..79ddfc74 100644 --- a/CreateInstallFolder2-0.bat +++ b/CreateInstallFolder2-0.bat @@ -1,4 +1,4 @@ -SET FLEXTRANS_VERSION=3.11 +SET FLEXTRANS_VERSION=3.11.1 rem It doesn't matter so much what this next version # is, 1) we get requirements.txt from it. So this folder, with flextools- prepended, has to exist rem 2) we create a folder named this in the install SET INSTALL_FOLDER_VERSION=2.2.1 diff --git a/FLExTrans-installer.nsi b/FLExTrans-installer.nsi index fdfdd5a9..614e0e09 100644 --- a/FLExTrans-installer.nsi +++ b/FLExTrans-installer.nsi @@ -10,7 +10,7 @@ !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKLM" -!define PRODUCT_VERSION "3.11" +!define PRODUCT_VERSION "3.11.1" !define PRODUCT_ZIP_FILE "FLExToolsWithFLExTrans${PRODUCT_VERSION}.zip" !define ADD_ON_ZIP_FILE "AddOnsForXMLmind${PRODUCT_VERSION}.zip" !define HERMIT_CRAB_ZIP_FILE "HermitCrabTools${PRODUCT_VERSION}.zip" @@ -29,7 +29,7 @@ VIAddVersionKey "FileDescription" "" VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}" VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}" -VIProductVersion 3.11.0.${BUILD_NUM} +VIProductVersion 3.11.1.${BUILD_NUM} ; MUI Settings !define MUI_ABORTWARNING diff --git a/LiveRuleTesterTool.py b/LiveRuleTesterTool.py index e41ec9a4..9c331772 100644 --- a/LiveRuleTesterTool.py +++ b/LiveRuleTesterTool.py @@ -5,6 +5,10 @@ # SIL International # 7/2/16 # +# Version 3.11.1 - 8/30/24 - Ron Lockwood +# apertium_transfer now gives additional info. in the trace -- namely the target lexical +# unit. Remove this when outputting to the Rule Execution Information yellow box. +# # Version 3.11 - 8/20/24 - Ron Lockwood # Bumped to 3.11. # @@ -407,7 +411,7 @@ # Documentation that the user sees: docs = {FTM_Name : "Live Rule Tester Tool", - FTM_Version : "3.11", + FTM_Version : "3.11.1", FTM_ModifiesDB : False, FTM_Synopsis : "Test transfer rules and synthesis live against specific words.", FTM_Help : "", @@ -2399,6 +2403,9 @@ def processLogLines(self, inputLines): # Split into lexical units lexUnitList = lexUnitsStr.split('\t') + + # Each lexical unit also has / plus the target lexical unit. Remove these. + lexUnitList = [myLU.split('/')[0] for myLU in lexUnitList] # Create a

html element paragraphEl = ET.Element('p') diff --git a/Makefile b/Makefile index 200a6e36..8c3f04d2 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ${TARGET_PATH}: bilingual.bin transfer_rules.t1x.bin ${SOURCE_PATH} - ${FLEXTOOLS_PATH}\apertium-transfer -t tr.t1x transfer_rules.t1x.bin bilingual.bin ${SOURCE_PATH} > ${TARGET_PATH} 2> apertium_log.txt + ${FLEXTOOLS_PATH}\lt-proc -b -N1 -L1 bilingual.bin ${SOURCE_PATH} | ${FLEXTOOLS_PATH}\apertium-transfer -b -t tr.t1x transfer_rules.t1x.bin > ${TARGET_PATH} 2> apertium_log.txt bilingual.bin: ${DICTIONARY_PATH} ${FLEXTOOLS_PATH}\lt-comp lr ${DICTIONARY_PATH} bilingual.bin transfer_rules.t1x.bin: tr.t1x diff --git a/Makefile.advanced b/Makefile.advanced index 00842d9b..a3d30a1c 100644 --- a/Makefile.advanced +++ b/Makefile.advanced @@ -2,8 +2,10 @@ ${TARGET_PATH}: transfer_rules.t3x.bin target_text2.txt ${FLEXTOOLS_PATH}\apertium-postchunk -t tr.t3x transfer_rules.t3x.bin target_text2.txt > ${TARGET_PATH} 2>>apertium_log.txt target_text2.txt: transfer_rules.t2x.bin target_text1.txt ${FLEXTOOLS_PATH}\apertium-interchunk -t tr.t2x transfer_rules.t2x.bin target_text1.txt > target_text2.txt 2>>apertium_log.txt -target_text1.txt: bilingual.bin transfer_rules.t1x.bin ${SOURCE_PATH} - ${FLEXTOOLS_PATH}\apertium-transfer -t tr.t1x transfer_rules.t1x.bin bilingual.bin ${SOURCE_PATH} > target_text1.txt 2>apertium_log.txt +target_text1.txt: transfer_rules.t1x.bin target_text0.txt + ${FLEXTOOLS_PATH}\apertium-transfer -b -t tr.t1x transfer_rules.t1x.bin target_text0.txt > target_text1.txt 2>apertium_log.txt +target_text0.txt: bilingual.bin ${SOURCE_PATH} + ${FLEXTOOLS_PATH}\lt-proc -b -N1 -L1 bilingual.bin ${SOURCE_PATH} > target_text0.txt bilingual.bin: ${DICTIONARY_PATH} ${FLEXTOOLS_PATH}\lt-comp lr ${DICTIONARY_PATH} bilingual.bin transfer_rules.t1x.bin: tr.t1x diff --git a/MakefileForLiveRuleTester b/MakefileForLiveRuleTester index 89dfb5b9..c278b060 100644 --- a/MakefileForLiveRuleTester +++ b/MakefileForLiveRuleTester @@ -1,9 +1,8 @@ target_text.txt: bilingual.bin transfer_rules.t1x.bin source_text.txt - ${FLEXTOOLS_PATH}\apertium-transfer -t transfer_rules.t1x transfer_rules.t1x.bin bilingual.bin source_text.txt > target_text.txt 2>apertium_log.txt + ${FLEXTOOLS_PATH}\lt-proc -b -N1 -L1 bilingual.bin source_text.txt | ${FLEXTOOLS_PATH}\apertium-transfer -b -t transfer_rules.t1x transfer_rules.t1x.bin > target_text.txt 2>apertium_log.txt bilingual.bin: bilingual.dix ${FLEXTOOLS_PATH}\lt-comp lr bilingual.dix bilingual.bin transfer_rules.t1x.bin: transfer_rules.t1x ${FLEXTOOLS_PATH}\apertium-preprocess-transfer transfer_rules.t1x transfer_rules.t1x.bin clean: del target_text.txt bilingual.bin transfer_rules.t1x.bin - \ No newline at end of file diff --git a/MakefileForLiveRuleTester.advanced b/MakefileForLiveRuleTester.advanced index 8d69bec5..a8f0f6bf 100644 --- a/MakefileForLiveRuleTester.advanced +++ b/MakefileForLiveRuleTester.advanced @@ -2,8 +2,10 @@ target_text.txt: transfer_rules.t3x.bin target_text2.txt ${FLEXTOOLS_PATH}\apertium-postchunk -t transfer_rules.t3x transfer_rules.t3x.bin target_text2.txt > target_text.txt 2>apertium_log3.txt target_text2.txt: transfer_rules.t2x.bin target_text1.txt ${FLEXTOOLS_PATH}\apertium-interchunk -t transfer_rules.t2x transfer_rules.t2x.bin target_text1.txt > target_text2.txt 2>apertium_log2.txt -target_text1.txt: bilingual.bin transfer_rules.t1x.bin source_text.txt - ${FLEXTOOLS_PATH}\apertium-transfer -t transfer_rules.t1x transfer_rules.t1x.bin bilingual.bin source_text.txt > target_text1.txt 2>apertium_log.txt +target_text1.txt: transfer_rules.t1x.bin target_text0.txt + ${FLEXTOOLS_PATH}\apertium-transfer -b -t transfer_rules.t1x transfer_rules.t1x.bin target_text0.txt > target_text1.txt 2>apertium_log.txt +target_text0.txt: bilingual.bin source_text.txt + ${FLEXTOOLS_PATH}\lt-prob -b -N1 -L1 bilingual.bin source_text.txt > target_text0.txt bilingual.bin: bilingual.dix ${FLEXTOOLS_PATH}\lt-comp lr bilingual.dix bilingual.bin transfer_rules.t1x.bin: transfer_rules.t1x @@ -17,7 +19,6 @@ clean: clean_all: rm -f *.bin target_*.txt source_text.txt tr.t*x log err_log bilingual.dix trace2: transfer_rules.t2x.bin target_text1.txt - cat target_text1.txt | ${FLEXTOOLS_PATH}\apertium-interchunk -t tr.t2x transfer_rules.t2x.bin > target_text2.txt -trace1: bilingual.bin transfer_rules.t1x.bin source_text.txt - cat source_text.txt | ${FLEXTOOLS_PATH}\apertium-transfer -t transfer_rules.t1x transfer_rules.t1x.bin bilingual.bin > target_text1.txt - + cat target_text1.txt | ${FLEXTOOLS_PATH}\apertium-interchunk -t tr.t2x transfer_rules.t2x.bin > target_text2.txt +trace1: transfer_rules.t1x.bin target_text0.txt + cat target_text0.txt | ${FLEXTOOLS_PATH}\apertium-transfer -b transfer_rules.t1x transfer_rules.t1x.bin > target_text1.txt diff --git a/ReleaseChecklist.txt b/ReleaseChecklist.txt index 465e750c..c8c947c6 100644 --- a/ReleaseChecklist.txt +++ b/ReleaseChecklist.txt @@ -1,9 +1,9 @@ Do these things when making a new release -Update module version #s to X.X if they are lower. E.g. bring everything up to 3.6 that was 3.5.x -Finish code changes and commit --Edit createInstallFolder2.0.bat and set the version # at the top. --Edit C:\Users\rlboo\GitHub\FLExTrans\FLExTrans-installer.nsi setting Product version to the version # --Change VIProductVersion in the .nsi file. +-Edit createInstallFolder2.0.bat and set FLEXTRANS_VERSION at the top to the new version #. +-Edit FLExTrans-installer.nsi setting PRODUCT_VERSION to the new version #. +-Also change VIProductVersion in the .nsi file to the new version #. -Change Copyright date if necessary in the .nsi file. -Edit Version.py in the FlexTools folder with the new version #s (Also for FLExTools) (this shows up in the title bar and About) -Build and test the install locally diff --git a/Version.py b/Version.py index f3a1f9a5..8f5248e3 100644 --- a/Version.py +++ b/Version.py @@ -2,7 +2,10 @@ # The version name and number to display in the title bar of the # FlexTools window. # -# Version 3.11 - 9/15/24 - Ron Lockwood +# Version 3.11.1 - 8/29/24 - Ron Lockwood +# Bumped FLExTrans to 3.11.1 +# +# Version 3.11 - 8/15/24 - Ron Lockwood # Bumped FLExTrans to 3.11 # # Version 3.10.4 - 8/2/24 - Ron Lockwood @@ -38,6 +41,6 @@ Name = "FLExTrans" -Version = "3.11" +Version = "3.11.1" Title = f"{FTName} {FTVersion} ({Name} {Version})"