Merge pull request #1759 from xiaoyifang/staged

last test build before new release
xiaoyifang · Sep 10, 2024 · cbccc8f · cbccc8f
2 parents 22b1c04 + 39836dc
commit cbccc8f
Show file tree

Hide file tree

Showing 43 changed files with 4,362 additions and 620 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -239,7 +239,9 @@ else ()
 endif ()
 
 qt_add_translations(${GOLDENDICT} TS_FILES ${TRANS_FILES}
-        QM_FILES_OUTPUT_VARIABLE qm_files)
+        QM_FILES_OUTPUT_VARIABLE qm_files
+        LUPDATE_OPTIONS "-no-ui-lines -locations none -no-obsolete")
+
 add_dependencies(${GOLDENDICT} "release_translations")
 
 #### installation or assemble redistribution
@@ -269,7 +271,19 @@ if (APPLE)
 
     install(TARGETS ${GOLDENDICT} BUNDLE DESTINATION "${Assembling_Dir}")
     install(FILES ${qm_files} DESTINATION "${Redistributable_APP}/Contents/MacOS/locale")
-    install(DIRECTORY "${CMAKE_SOURCE_DIR}/opencc" DESTINATION "${Redistributable_APP}/Contents/MacOS")
+
+    if (IS_READABLE "/opt/homebrew/share/opencc/")
+        set(OPENCC_DATA_PATH "/opt/homebrew/share/opencc/" CACHE PATH "opencc's data path")
+    elseif (IS_READABLE "/usr/local/share/opencc/")
+        set(OPENCC_DATA_PATH "/usr/local/share/opencc/" CACHE PATH "opencc's data path")
+    else ()
+        message(FATAL_ERROR "Cannot find opencc's data folder!")
+    endif ()
+
+    file(REAL_PATH "${OPENCC_DATA_PATH}" OPENCC_DATA_PATH_FOR_REAL)
+
+    message(STATUS "OPENCC data is found -> ${OPENCC_DATA_PATH_FOR_REAL}")
+    install(DIRECTORY "${OPENCC_DATA_PATH_FOR_REAL}" DESTINATION "${Redistributable_APP}/Contents/MacOS")
 
     install(SCRIPT ${deploy_script})
 

diff --git a/locale/hu_HU.ts b/locale/hu_HU.ts
diff --git a/opencc/HKVariants.ocd2 b/opencc/HKVariants.ocd2
diff --git a/opencc/HKVariantsPhrases.ocd2 b/opencc/HKVariantsPhrases.ocd2
diff --git a/opencc/HKVariantsRev.ocd2 b/opencc/HKVariantsRev.ocd2
diff --git a/opencc/HKVariantsRevPhrases.ocd2 b/opencc/HKVariantsRevPhrases.ocd2
diff --git a/opencc/JPShinjitaiCharacters.ocd2 b/opencc/JPShinjitaiCharacters.ocd2
diff --git a/opencc/JPShinjitaiPhrases.ocd2 b/opencc/JPShinjitaiPhrases.ocd2
diff --git a/opencc/JPVariants.ocd2 b/opencc/JPVariants.ocd2
diff --git a/opencc/JPVariantsRev.ocd2 b/opencc/JPVariantsRev.ocd2
diff --git a/opencc/STCharacters.ocd2 b/opencc/STCharacters.ocd2
diff --git a/opencc/STPhrases.ocd2 b/opencc/STPhrases.ocd2
diff --git a/opencc/TSCharacters.ocd2 b/opencc/TSCharacters.ocd2
diff --git a/opencc/TSPhrases.ocd2 b/opencc/TSPhrases.ocd2
diff --git a/opencc/TWPhrases.ocd2 b/opencc/TWPhrases.ocd2
diff --git a/opencc/TWPhrasesRev.ocd2 b/opencc/TWPhrasesRev.ocd2
diff --git a/opencc/TWVariants.ocd2 b/opencc/TWVariants.ocd2
diff --git a/opencc/TWVariantsRev.ocd2 b/opencc/TWVariantsRev.ocd2
diff --git a/opencc/TWVariantsRevPhrases.ocd2 b/opencc/TWVariantsRevPhrases.ocd2
diff --git a/opencc/copyright b/opencc/copyright
diff --git a/opencc/hk2s.json b/opencc/hk2s.json
diff --git a/opencc/hk2t.json b/opencc/hk2t.json
diff --git a/opencc/jp2t.json b/opencc/jp2t.json
diff --git a/opencc/s2hk.json b/opencc/s2hk.json
diff --git a/opencc/s2t.json b/opencc/s2t.json
diff --git a/opencc/s2tw.json b/opencc/s2tw.json
diff --git a/opencc/s2twp.json b/opencc/s2twp.json
diff --git a/opencc/t2hk.json b/opencc/t2hk.json
diff --git a/opencc/t2jp.json b/opencc/t2jp.json
diff --git a/opencc/t2s.json b/opencc/t2s.json
diff --git a/opencc/t2tw.json b/opencc/t2tw.json
diff --git a/opencc/tw2s.json b/opencc/tw2s.json