Skip to content

Commit de5bc3b

Browse files
rockarocka
authored
Install prebuilt assets with cmake (#658)
The build process no longer relies on symlink
1 parent b10bff3 commit de5bc3b

Some content is hidden

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

56 files changed

+154
-153
lines changed

‎.github/workflows/pull_request.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ jobs:
2626
fetch-depth: 0
2727
submodules: recursive
2828

29-
- name: Regenerate symlinks pointing to submodule (Windows)
30-
if: ${{ matrix.os == 'windows-2022' }}
31-
run: |
32-
Remove-Item -Recurse app/src/main/assets/usr/share, plugin/hangul/src/main/assets/usr/share/libhangul, plugin/chewing/src/main/assets/usr/share/libchewing, plugin/jyutping/src/main/assets/usr/share/libime
33-
git checkout -- .
34-
3529
- name: Setup Java
3630
uses: actions/setup-java@v4
3731
with:

‎.gitignore

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
# Module :app
22
# Installed data
3-
/app/src/main/assets/usr/share/fcitx5/addon
4-
/app/src/main/assets/usr/share/fcitx5/chttrans
5-
/app/src/main/assets/usr/share/fcitx5/data
6-
/app/src/main/assets/usr/share/fcitx5/default
7-
/app/src/main/assets/usr/share/fcitx5/inputmethod
8-
/app/src/main/assets/usr/share/fcitx5/lua
9-
/app/src/main/assets/usr/share/fcitx5/punctuation
10-
/app/src/main/assets/usr/share/fcitx5/unicode
11-
/app/src/main/assets/usr/share/locale
3+
/app/src/main/assets/usr/
124
# Generated asset descriptor
135
/app/src/main/assets/descriptor.json
146

157
# Plugins
168
# Installed data
17-
/plugin/*/src/main/assets/usr/share/fcitx5
18-
/plugin/*/src/main/assets/usr/share/locale
9+
/plugin/*/src/main/assets/usr/
1910
# Generated asset descriptor
2011
/plugin/*/src/main/assets/descriptor.json
2112

‎README.md

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Discuss on Telegram: [@fcitx5_android_group](https://t.me/fcitx5_android_group)
6969

7070
### Dependencies
7171

72-
- Android SDK Platform & Build-Tools 34.
72+
- Android SDK Platform & Build-Tools 35.
7373
- Android NDK (Side by side) 25 & CMake 3.22.1, they can be installed using SDK Manager in Android Studio or `sdkmanager` command line.
7474
- [KDE/extra-cmake-modules](https://github.com/KDE/extra-cmake-modules)
7575
- GNU Gettext >= 0.20 (for `msgfmt` binary; or install `appstream` if you really have to use gettext <= 0.19.)
@@ -96,29 +96,6 @@ git clone git@github.com:fcitx5-android/fcitx5-android.git
9696
git submodule update --init --recursive
9797
```
9898

99-
<details>
100-
<summary>On Windows, you may need to regenerate symlinks to submodules.</summary>
101-
102-
Run in PowerShell:
103-
104-
```powershell
105-
Remove-Item -Recurse app/src/main/assets/usr/share, plugin/hangul/src/main/assets/usr/share/libhangul, plugin/chewing/src/main/assets/usr/share/libchewing, plugin/jyutping/src/main/assets/usr/share/libime
106-
```
107-
108-
Or Command Prompt:
109-
110-
```bat
111-
RD /S /Q app\src\main\assets\usr\share plugin\hangul\src\main\assets\usr\share\libhangul plugin\chewing\src\main\assets\usr\share\libchewing plugin\jyutping\src\main\assets\usr\share\libime
112-
```
113-
114-
Then let `git` regenerate symlinks:
115-
116-
```shell
117-
git checkout -- .
118-
```
119-
120-
</details>
121-
12299
Install `extra-cmake-modules` and `gettext` with your system package manager:
123100

124101
```shell

‎app/build.gradle.kts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,8 @@ kotlin {
6767
}
6868
}
6969

70-
aboutLibraries {
71-
configPath = "app/licenses"
72-
}
73-
7470
fcitxComponent {
75-
installLibraries = listOf(
71+
includeLibs = listOf(
7672
"fcitx5",
7773
"fcitx5-lua",
7874
"libime",
@@ -82,6 +78,7 @@ fcitxComponent {
8278
excludeFiles = listOf("cangjie", "erbi", "qxm", "wanfeng").map {
8379
"usr/share/fcitx5/inputmethod/$it.conf"
8480
}
81+
installPrebuiltAssets = true
8582
}
8683

8784
ksp {

‎app/src/main/assets/usr/share/fcitx5/pinyin/chaizi.dict

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎app/src/main/assets/usr/share/fcitx5/pinyin/symbols

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎app/src/main/assets/usr/share/fcitx5/pinyinhelper

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎app/src/main/assets/usr/share/fcitx5/spell

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎app/src/main/assets/usr/share/fcitx5/table

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎app/src/main/assets/usr/share/libime

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy