From 56e62287004b3f4579c966ed654d92e1dfc51f5e Mon Sep 17 00:00:00 2001 From: Chen Gong Date: Fri, 6 Apr 2018 08:38:45 +0800 Subject: [PATCH] feat(submodules): switch to /plum/ --- .gitignore | 2 +- .gitmodules | 7 +++--- Makefile | 34 +++++++++++++++--------------- README.md | 2 +- Squirrel.xcodeproj/project.pbxproj | 24 ++++++++++----------- brise | 1 - plum | 1 + 7 files changed, 35 insertions(+), 36 deletions(-) delete mode 160000 brise create mode 160000 plum diff --git a/.gitignore b/.gitignore index 2be23fd6b..295185f58 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,8 @@ build/ build.log bin/* lib/* -data/brise/ data/opencc/ +data/plum/ package/Squirrel.pkg package/archives/* package/sign/*.pem diff --git a/.gitmodules b/.gitmodules index 4813fbd6f..253b9170d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,6 @@ path = librime url = https://github.com/rime/librime.git ignore = dirty -[submodule "brise"] - path = brise - url = https://github.com/rime/brise.git - ignore = dirty +[submodule "plum"] + path = plum + url = https://github.com/rime/plum.git diff --git a/Makefile b/Makefile index 18c61ea02..8e39e0d8a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all install librime data update-brise update-opencc-data deps release debug \ +.PHONY: all install librime data update-plum-data update-opencc-data deps release debug \ package archive test-archive permission-check install-debug install-release \ clean clean-deps @@ -10,22 +10,22 @@ LIBRIME_DEPS = librime/thirdparty/lib/libmarisa.a \ librime/thirdparty/lib/libleveldb.a \ librime/thirdparty/lib/libopencc.a \ librime/thirdparty/lib/libyaml-cpp.a -BRISE = bin/rime-install \ - data/brise/default.yaml \ - data/brise/symbols.yaml \ - data/brise/essay.txt +PLUM_DATA = bin/rime-install \ + data/plum/default.yaml \ + data/plum/symbols.yaml \ + data/plum/essay.txt OPENCC_DATA = data/opencc/TSCharacters.ocd \ data/opencc/TSPhrases.ocd \ data/opencc/t2s.json -DEPS = $(LIBRIME) $(BRISE) $(OPENCC_DATA) +DEPS = $(LIBRIME) $(PLUM_DATA) $(OPENCC_DATA) LIBRIME_OUTPUT = librime/xbuild/lib/Release/librime.1.dylib RIME_BIN_BUILD_DIR = librime/xbuild/bin/Release RIME_BIN_DEPLOYER = rime_deployer RIME_BIN_DICT_MANAGER = rime_dict_manager OPENCC_DATA_OUTPUT = librime/thirdparty/data/opencc/*.* -DATA_FILES = brise/output/*.* -RIME_PACKAGE_INSTALLER = brise/rime-install +PLUM_DATA_OUTPUT = plum/output/*.* +RIME_PACKAGE_INSTALLER = plum/rime-install INSTALL_NAME_TOOL = $(shell xcrun -find install_name_tool) INSTALL_NAME_TOOL_ARGS = -add_rpath @loader_path/../Frameworks @@ -36,8 +36,8 @@ $(LIBRIME): $(LIBRIME_DEPS): $(MAKE) -C librime -f Makefile.xcode thirdparty -$(BRISE): - $(MAKE) update-brise +$(PLUM_DATA): + $(MAKE) update-plum-data $(OPENCC_DATA): $(MAKE) update-opencc-data @@ -50,12 +50,12 @@ librime: $(LIBRIME_DEPS) $(INSTALL_NAME_TOOL) $(INSTALL_NAME_TOOL_ARGS) bin/$(RIME_BIN_DEPLOYER) $(INSTALL_NAME_TOOL) $(INSTALL_NAME_TOOL_ARGS) bin/$(RIME_BIN_DICT_MANAGER) -data: update-brise update-opencc-data +data: update-plum-data update-opencc-data -update-brise: - $(MAKE) -C brise minimal - mkdir -p data/brise - cp $(DATA_FILES) data/brise/ +update-plum-data: + $(MAKE) -C plum minimal + mkdir -p data/plum + cp $(PLUM_DATA_OUTPUT) data/plum/ cp $(RIME_PACKAGE_INSTALLER) bin/ update-opencc-data: @@ -101,9 +101,9 @@ clean: rm build.log > /dev/null 2>&1 || true rm bin/* > /dev/null 2>&1 || true rm lib/* > /dev/null 2>&1 || true - rm data/brise/* > /dev/null 2>&1 || true + rm data/plum/* > /dev/null 2>&1 || true rm data/opencc/*.ocd > /dev/null 2>&1 || true clean-deps: - $(MAKE) -C brise clean + $(MAKE) -C plum clean $(MAKE) -C librime -f Makefile.xcode clean diff --git a/README.md b/README.md index 6a22778e7..4de26a82f 100644 --- a/README.md +++ b/README.md @@ -114,13 +114,13 @@ 本品引用了以下開源軟件： * Boost C++ Libraries (Boost Software License) - * brise / 東風破 (GNU General Public License 3.0) * darts-clone (New BSD License) * google-glog (New BSD License) * Google Test (New BSD License) * LevelDB (New BSD License) * librime (New BSD License) * OpenCC / 開放中文轉換 (Apache License 2.0) + * plum / 東風破 (GNU Lesser General Public License 3.0) * Sparkle (MIT License) * UTF8-CPP (Boost Software License) * yaml-cpp (MIT License) diff --git a/Squirrel.xcodeproj/project.pbxproj b/Squirrel.xcodeproj/project.pbxproj index b09e453d6..bb1201325 100644 --- a/Squirrel.xcodeproj/project.pbxproj +++ b/Squirrel.xcodeproj/project.pbxproj @@ -186,15 +186,15 @@ 44F84AD614E94C490005D70B /* SquirrelPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SquirrelPanel.m; sourceTree = ""; }; 44FA4D891685997300116C1F /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; 44FA4D8E16859B2900116C1F /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = ""; }; - 7B5488211D2DAAD10056A1BE /* default.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = default.yaml; path = data/brise/default.yaml; sourceTree = ""; }; - 7B5488291D2DAAD10056A1BE /* essay.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = essay.txt; path = data/brise/essay.txt; sourceTree = ""; }; - 7B54882E1D2DAAD10056A1BE /* luna_pinyin_fluency.schema.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = luna_pinyin_fluency.schema.yaml; path = data/brise/luna_pinyin_fluency.schema.yaml; sourceTree = ""; }; - 7B54882F1D2DAAD10056A1BE /* luna_pinyin_simp.schema.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = luna_pinyin_simp.schema.yaml; path = data/brise/luna_pinyin_simp.schema.yaml; sourceTree = ""; }; - 7B5488301D2DAAD10056A1BE /* luna_pinyin_tw.schema.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = luna_pinyin_tw.schema.yaml; path = data/brise/luna_pinyin_tw.schema.yaml; sourceTree = ""; }; - 7B5488311D2DAAD10056A1BE /* luna_pinyin.dict.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = luna_pinyin.dict.yaml; path = data/brise/luna_pinyin.dict.yaml; sourceTree = ""; }; - 7B5488321D2DAAD10056A1BE /* luna_pinyin.schema.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = luna_pinyin.schema.yaml; path = data/brise/luna_pinyin.schema.yaml; sourceTree = ""; }; - 7B5488331D2DAAD10056A1BE /* luna_quanpin.schema.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = luna_quanpin.schema.yaml; path = data/brise/luna_quanpin.schema.yaml; sourceTree = ""; }; - 7B54883B1D2DAAD10056A1BE /* symbols.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = symbols.yaml; path = data/brise/symbols.yaml; sourceTree = ""; }; + 7B5488211D2DAAD10056A1BE /* default.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = default.yaml; path = data/plum/default.yaml; sourceTree = ""; }; + 7B5488291D2DAAD10056A1BE /* essay.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = essay.txt; path = data/plum/essay.txt; sourceTree = ""; }; + 7B54882E1D2DAAD10056A1BE /* luna_pinyin_fluency.schema.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = luna_pinyin_fluency.schema.yaml; path = data/plum/luna_pinyin_fluency.schema.yaml; sourceTree = ""; }; + 7B54882F1D2DAAD10056A1BE /* luna_pinyin_simp.schema.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = luna_pinyin_simp.schema.yaml; path = data/plum/luna_pinyin_simp.schema.yaml; sourceTree = ""; }; + 7B5488301D2DAAD10056A1BE /* luna_pinyin_tw.schema.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = luna_pinyin_tw.schema.yaml; path = data/plum/luna_pinyin_tw.schema.yaml; sourceTree = ""; }; + 7B5488311D2DAAD10056A1BE /* luna_pinyin.dict.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = luna_pinyin.dict.yaml; path = data/plum/luna_pinyin.dict.yaml; sourceTree = ""; }; + 7B5488321D2DAAD10056A1BE /* luna_pinyin.schema.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = luna_pinyin.schema.yaml; path = data/plum/luna_pinyin.schema.yaml; sourceTree = ""; }; + 7B5488331D2DAAD10056A1BE /* luna_quanpin.schema.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = luna_quanpin.schema.yaml; path = data/plum/luna_quanpin.schema.yaml; sourceTree = ""; }; + 7B54883B1D2DAAD10056A1BE /* symbols.yaml */ = {isa = PBXFileReference; lastKnownFileType = text; name = symbols.yaml; path = data/plum/symbols.yaml; sourceTree = ""; }; 7B5488761D2DAAF50056A1BE /* hk2s.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = hk2s.json; sourceTree = ""; }; 7B5488771D2DAAF50056A1BE /* HKVariants.ocd */ = {isa = PBXFileReference; lastKnownFileType = file; path = HKVariants.ocd; sourceTree = ""; }; 7B5488781D2DAAF50056A1BE /* HKVariantsPhrases.ocd */ = {isa = PBXFileReference; lastKnownFileType = file; path = HKVariantsPhrases.ocd; sourceTree = ""; }; @@ -383,7 +383,7 @@ isa = PBXGroup; children = ( 442B5B871570C37200370DEA /* squirrel.yaml */, - 7B5488A71D2DAC9D0056A1BE /* brise */, + 7B5488A71D2DAC9D0056A1BE /* plum */, 4407F39D14EC071E001329FE /* opencc */, ); name = SharedSupport; @@ -399,7 +399,7 @@ path = utf8; sourceTree = ""; }; - 7B5488A71D2DAC9D0056A1BE /* brise */ = { + 7B5488A71D2DAC9D0056A1BE /* plum */ = { isa = PBXGroup; children = ( 7B5488211D2DAAD10056A1BE /* default.yaml */, @@ -412,7 +412,7 @@ 7B5488331D2DAAD10056A1BE /* luna_quanpin.schema.yaml */, 7B54883B1D2DAAD10056A1BE /* symbols.yaml */, ); - name = brise; + name = plum; sourceTree = ""; }; /* End PBXGroup section */ diff --git a/brise b/brise deleted file mode 160000 index 9da581d39..000000000 --- a/brise +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9da581d39f7342590e0ec03eb76ee7fb59d37cc1 diff --git a/plum b/plum new file mode 160000 index 000000000..47a7b7c66 --- /dev/null +++ b/plum @@ -0,0 +1 @@ +Subproject commit 47a7b7c6654b85c6b7792e8e8cdff4c414628562