Merge branch 'build_opencc_data' into develop

rime · May 18, 2015 · 62fba4f · 62fba4f
2 parents 2930ff9 + 532c92d
commit 62fba4f
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 63 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ ReleaseHant/
 /output/*.ime
 /output/*.txt
 /output/data/essay.txt
+/output/data/opencc/
 /output/data/*.yaml
 /output/expansion/*.yaml
 /output/archives

diff --git a/build.bat b/build.bat
@@ -1,3 +1,5 @@
+setlocal
+
 if exist env.bat call env.bat
 
 set work=%cd%
@@ -40,6 +42,9 @@ if %build_boost% == 1 (
 
 if %build_rime% == 1 (
   cd %work%\librime
+  if not exist librime\thirdparty\lib\opencc.lib (
+    call build.bat thirdparty
+  )
   call build.bat
   cd %work%
   rem copy /Y librime\thirdparty\lib\*.lib lib\
@@ -96,6 +101,7 @@ copy %work%\brise\symbols.yaml output\data\
 copy %work%\brise\preset\*.yaml output\data\
 copy %work%\brise\supplement\*.yaml output\data\
 copy %work%\brise\extra\*.yaml output\expansion\
+call :build_opencc_data
 exit /b
 
 :build_essay
@@ -107,6 +113,15 @@ call make_essay.bat
 cd %work%
 exit /b
 
+:build_opencc_data
+if not exist %work%\librime\thirdparty\data\opencc\TSCharacters.ocd (
+  cd %work%\librime
+  call build.bat thirdparty
+)
+cd %work%
+if not exist output\data\opencc mkdir output\data\opencc
+copy %work%\librime\thirdparty\data\opencc\*.* output\data\opencc\
+
 :error
 echo error building weasel...
 

diff --git a/librime b/librime
diff --git a/output/data/opencc/to_tw_variants.txt b/output/data/opencc/to_tw_variants.txt
diff --git a/output/data/opencc/trad_to_simp_characters.ocd b/output/data/opencc/trad_to_simp_characters.ocd
diff --git a/output/data/opencc/trad_to_simp_phrases.ocd b/output/data/opencc/trad_to_simp_phrases.ocd
diff --git a/output/data/opencc/zht2zhs.ini b/output/data/opencc/zht2zhs.ini
diff --git a/output/data/opencc/zht2zhtw_v.ini b/output/data/opencc/zht2zhtw_v.ini