Skip to content

Commit 02542e6

Browse files
committed
chore(thirdparty): use opencc submodule
1 parent 009e24c commit 02542e6

File tree

363 files changed

+10
-219935
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

363 files changed

+10
-219935
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ data/*
66
thirdparty/include/*
77
thirdparty/lib/*
88
thirdparty/bin/*
9-
thirdparty/data/*
9+
thirdparty/share/*
1010
thirdparty/src/*/*
1111
env.bat
1212
node_modules/

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@
1313
[submodule "thirdparty/src/marisa-trie"]
1414
path = thirdparty/src/marisa-trie
1515
url = https://github.com/s-yata/marisa-trie.git
16+
[submodule "thirdparty/src/opencc"]
17+
path = thirdparty/src/opencc
18+
url = https://github.com/BYVoid/OpenCC.git

build.bat

+1-20
Original file line numberDiff line numberDiff line change
@@ -184,26 +184,7 @@ if %build_thirdparty% == 1 (
184184
-DBUILD_SHARED_LIBS=OFF^
185185
-DBUILD_TESTING=OFF
186186
if %ERRORLEVEL% NEQ 0 goto ERROR
187-
cmake --build build --config Release --target libopencc
188-
if %ERRORLEVEL% NEQ 0 goto ERROR
189-
cmake --build build --config Release --target opencc
190-
if %ERRORLEVEL% NEQ 0 goto ERROR
191-
cmake --build build --config Release --target opencc_dict
192-
if %ERRORLEVEL% NEQ 0 goto ERROR
193-
cmake --build build --config Release --target Dictionaries
194-
if %ERRORLEVEL% NEQ 0 goto ERROR
195-
echo built. copying artifacts.
196-
if not exist %THIRDPARTY%\include\opencc mkdir %THIRDPARTY%\include\opencc
197-
copy /Y src\*.h* %THIRDPARTY%\include\opencc\
198-
if %ERRORLEVEL% NEQ 0 goto ERROR
199-
copy /Y build\src\Release\opencc.lib %THIRDPARTY%\lib
200-
if %ERRORLEVEL% NEQ 0 goto ERROR
201-
copy /Y build\src\tools\Release\opencc.exe %THIRDPARTY%\bin
202-
copy /Y build\src\tools\Release\opencc_dict.exe %THIRDPARTY%\bin
203-
if %ERRORLEVEL% NEQ 0 goto ERROR
204-
if not exist %THIRDPARTY%\data\opencc mkdir %THIRDPARTY%\data\opencc
205-
copy /Y data\config\*.json %THIRDPARTY%\data\opencc
206-
copy /Y build\data\*.ocd %THIRDPARTY%\data\opencc
187+
cmake --build build --config Release --target INSTALL
207188
if %ERRORLEVEL% NEQ 0 goto ERROR
208189
)
209190

thirdparty.mk

+4-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SRC_DIR = $(THIRD_PARTY_DIR)/src
55
INCLUDE_DIR = $(THIRD_PARTY_DIR)/include
66
LIB_DIR = $(THIRD_PARTY_DIR)/lib
77
BIN_DIR = $(THIRD_PARTY_DIR)/bin
8-
DATA_DIR = $(THIRD_PARTY_DIR)/data
8+
SHARE_DIR = $(THIRD_PARTY_DIR)/share
99

1010
THIRD_PARTY_LIBS = glog leveldb marisa opencc yaml-cpp gtest
1111

@@ -50,16 +50,10 @@ marisa:
5050
opencc:
5151
cd $(SRC_DIR)/opencc; \
5252
cmake . -Bbuild \
53-
-DCMAKE_BUILD_TYPE=Release \
54-
-DCMAKE_INSTALL_PREFIX=/usr \
5553
-DBUILD_SHARED_LIBS:BOOL=OFF \
56-
&& cmake --build build
57-
mkdir -p $(INCLUDE_DIR)/opencc
58-
cp $(SRC_DIR)/opencc/src/*.h* $(INCLUDE_DIR)/opencc/
59-
cp $(SRC_DIR)/opencc/build/src/libopencc.a $(LIB_DIR)/
60-
mkdir -p $(DATA_DIR)/opencc
61-
cp $(SRC_DIR)/opencc/data/config/*.json $(DATA_DIR)/opencc/
62-
cp $(SRC_DIR)/opencc/build/data/*.ocd $(DATA_DIR)/opencc/
54+
-DCMAKE_BUILD_TYPE:STRING="Release" \
55+
-DCMAKE_INSTALL_PREFIX:PATH="$(THIRD_PARTY_DIR)" \
56+
&& cmake --build build --target install
6357

6458
yaml-cpp:
6559
cd $(SRC_DIR)/yaml-cpp; \
File renamed without changes.

thirdparty/src/opencc

Submodule opencc added at 159efb7

thirdparty/src/opencc/.clang-format

-4
This file was deleted.

thirdparty/src/opencc/.gitignore

-13
This file was deleted.

thirdparty/src/opencc/.idea/codeStyleSettings.xml

-63
This file was deleted.

thirdparty/src/opencc/.npmignore

-19
This file was deleted.

thirdparty/src/opencc/.travis.yml

-13
This file was deleted.

thirdparty/src/opencc/AUTHORS

-12
This file was deleted.

thirdparty/src/opencc/CMakeLists.txt

-166
This file was deleted.

0 commit comments

Comments
 (0)