diff --git a/.gitmodules b/.gitmodules index 26f252ea..268c7e78 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "fmt"] - path = fmt - url = https://github.com/fmtlib/fmt [submodule "libuv"] path = libuv url = https://github.com/libuv/libuv diff --git a/README.md b/README.md index fdef0dac..ec24784e 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ both can be installed with `sdkmanager` command line tool. ## Libraries * boost: [moritz-wundke/Boost-for-Android](https://github.com/moritz-wundke/Boost-for-Android) -* fmt: [fmtlib/fmt](https://github.com/fmtlib/fmt) * libevent: [libevent/libevent](https://github.com/libevent/libevent/tree/release-2.1.12-stable) * libintl-lite: [j-jorge/libintl-lite](https://github.com/j-jorge/libintl-lite) * libime data: [fcitx/libime](https://github.com/fcitx/libime) diff --git a/fmt b/fmt deleted file mode 160000 index 12391371..00000000 --- a/fmt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 123913715afeb8a437e6388b4473fcc4753e1c9a diff --git a/prebuilder.cabal b/prebuilder.cabal index e3619195..d59137a7 100644 --- a/prebuilder.cabal +++ b/prebuilder.cabal @@ -25,7 +25,6 @@ executable prebuilder Rules.AnthyData Rules.Boost Rules.Fcitx5 - Rules.Fmt Rules.GLog Rules.LevelDB Rules.LibChewing diff --git a/src/Main.hs b/src/Main.hs index 6c8e9c4c..676c192c 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -16,7 +16,6 @@ import Development.Shake.Config import Rules.AnthyData import Rules.Boost import Rules.Fcitx5 -import Rules.Fmt import Rules.GLog import Rules.LevelDB import Rules.LibChewing @@ -54,7 +53,6 @@ main = do libIMERule chineseAddonsRule libIMEJyutpingRule - fmtRule libuvRule libintlLiteRule luaRule @@ -78,7 +76,6 @@ main = do let artifacts = [ "spell-dict", "libime", - "fmt", "chinese-addons-data", "libime-jyutping", "libuv", @@ -104,8 +101,7 @@ main = do getToolchainVersions >>= writeFile' (outputDir "toolchain-versions.json") . TL.unpack . TLB.toLazyText . A.encodePrettyToTextBuilder "fcitx5" ~> do need - [ "fmt", - "libuv", + [ "libuv", "libintl-lite" ] "app" ~> do diff --git a/src/Rules/Fmt.hs b/src/Rules/Fmt.hs deleted file mode 100644 index 11f1c2cc..00000000 --- a/src/Rules/Fmt.hs +++ /dev/null @@ -1,24 +0,0 @@ -{-# LANGUAGE DeriveAnyClass #-} -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE DerivingStrategies #-} -{-# LANGUAGE TypeFamilies #-} - -module Rules.Fmt (fmtRule) where - -import Base -import CMakeBuilder - -data Fmt = Fmt - deriving stock (Eq, Show, Typeable, Generic) - deriving anyclass (Hashable, Binary, NFData) - -type instance RuleResult Fmt = () - -fmtRule :: Rules () -fmtRule = do - buildFmt <- - useCMake - (cmakeBuilder "fmt") - { cmakeFlags = const ["-DFMT_TEST=OFF", "-DFMT_DOC=OFF"] - } - "fmt" ~> buildWithAndroidEnv buildFmt Fmt