Skip to content

Commit 833b9f2

Browse files
groverlynngroverlynn
committed
update packages
1 parent 52dfa83 commit 833b9f2

File tree

7 files changed

+101
-33
lines changed

7 files changed

+101
-33
lines changed

‎.gitmodules

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[submodule "librime"]
22
path = librime
3-
url = https://github.com/rime/librime.git
3+
url = https://github.com/groverlynn/librime.git
4+
branch = choose
45
ignore = dirty
56
[submodule "plum"]
67
path = plum

‎INSTALL.md

+19-8
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ Choose one of the following options.
6161
``` sh
6262
export BUILD_UNIVERSAL=1
6363

64-
make -C librime xcode/deps/boost
64+
export BOOST_ROOT="$(pwd)/librime/deps/boost-1.84.0"
6565

66-
export BOOST_ROOT="$(pwd)/librime/deps/boost_1_78_0"
66+
export CMAKE_GENERATOR=Ninja
67+
68+
bash librime/install-boost.sh
6769
```
6870

6971
Let's set `BUILD_UNIVERSAL` to tell `make` that we are building Boost as
@@ -96,8 +98,14 @@ port install boost -no_static
9698

9799
* Make sure you have updated all the dependencies. If you cloned squirrel with the command in this guide, you've already done it. But if not, this command will update submodules.
98100

99-
```
101+
``` sh
100102
git submodule update --init --recursive
103+
104+
export BUILD_UNIVERSAL=1
105+
export CMAKE_GENERATOR=Ninja
106+
107+
make -C librime
108+
make deps
101109
```
102110

103111
* With all dependencies ready, build `Squirrel.app`:
@@ -109,11 +117,14 @@ make
109117
To build only for the native architecture, and/or specify the lowest supported macOS version, pass variable `ARCHS`/`MACOSX_DEPLOYMENT_TARGET` to `make`:
110118

111119
``` sh
112-
# for Universal macOS App, targetting Ventura
113-
make ARCHS='arm64 x86_64' MACOSX_DEPLOYMENT_TARGET='13.0'
120+
# for Universal macOS App
121+
make ARCHS='arm64 x86_64' MACOSX_DEPLOYMENT_TARGET='10.15'
122+
123+
# for Mac computers with Apple Silicon
124+
make ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='10.15'
114125

115-
# for ARM macOS App, targetting Ventura
116-
make ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='13.0'
126+
# for Intel-based Mac
127+
make ARCHS='x86_64' MACOSX_DEPLOYMENT_TARGET='10.15'
117128
```
118129

119130
## Install it on your Mac
@@ -123,7 +134,7 @@ make ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='13.0'
123134
Just add `package` after `make`
124135

125136
```
126-
make package ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='13.0'
137+
make package ARCHS='arm64' MACOSX_DEPLOYMENT_TARGET='10.15'
127138
```
128139

129140
Define or echo `DEV_ID` to automatically handle code signing and [notarization](https://developer.apple.com/documentation/security/notarizing_macos_software_before_distribution) (Apple Developer ID needed)

‎Makefile

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
all: release
44
install: install-release
55

6-
# Change to `xcode/dist-with-icu` if boost is linked to icu libraries.
7-
RIME_DIST_TARGET = xcode/dist
6+
# Change to `dist-with-icu` if boost is linked to icu libraries.
7+
RIME_DIST_TARGET = install
88

99
RIME_BIN_DIR = librime/dist/bin
1010
RIME_LIB_DIR = librime/dist/lib
@@ -39,7 +39,7 @@ $(RIME_LIBRARY):
3939
$(MAKE) librime
4040

4141
$(RIME_DEPS):
42-
$(MAKE) -C librime xcode/deps
42+
$(MAKE) -C librime deps
4343

4444
librime: $(RIME_DEPS)
4545
$(MAKE) -C librime $(RIME_DIST_TARGET)
@@ -67,7 +67,7 @@ plum-data:
6767
$(MAKE) copy-plum-data
6868

6969
opencc-data:
70-
$(MAKE) -C librime xcode/deps/opencc
70+
$(MAKE) -C librime deps/opencc
7171
$(MAKE) copy-opencc-data
7272

7373
copy-plum-data:
@@ -88,9 +88,9 @@ _=$() $()
8888
export CMAKE_OSX_ARCHITECTURES = $(subst $(_),;,$(ARCHS))
8989
endif
9090

91-
ifdef MACOSX_DEPLOYMENT_TARGET
91+
# https://cmake.org/cmake/help/latest/envvar/MACOSX_DEPLOYMENT_TARGET.html
92+
MACOSX_DEPLOYMENT_TARGET ?= 10.15
9293
BUILD_SETTINGS += MACOSX_DEPLOYMENT_TARGET="$(MACOSX_DEPLOYMENT_TARGET)"
93-
endif
9494

9595
release: $(DEPS_CHECK)
9696
bash package/add_data_files
@@ -170,5 +170,5 @@ clean:
170170

171171
clean-deps:
172172
$(MAKE) -C plum clean
173-
$(MAKE) -C librime xcode/clean
173+
$(MAKE) -C librime clean
174174
$(MAKE) clean-sparkle

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
安裝輸入法
2929
---
3030

31-
本品適用於 macOS 12.0+
31+
本品適用於 macOS 10.15+
3232

3333
初次安裝，如果在部份應用程序中打不出字，請註銷並重新登錄。
3434

‎Squirrel.xcodeproj/project.pbxproj

+70-14
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,16 @@
7777
7BDB21231C6EF1BE0025E351 /* SquirrelConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BDB21221C6EF1BE0025E351 /* SquirrelConfig.m */; };
7878
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
7979
8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
80-
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
8180
A45578F51146A75200592C6E /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = A45578F41146A75200592C6E /* MainMenu.xib */; };
8281
A47C48DF105E8CE8006D528B /* macos_keycode.m in Sources */ = {isa = PBXBuildFile; fileRef = A47C48DE105E8CE8006D528B /* macos_keycode.m */; };
83-
A4B8E1B30F645B870094E08B /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4B8E1B20F645B870094E08B /* Carbon.framework */; };
8482
A4FC48CB0F6530EF0069BE81 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A4FC48C90F6530EF0069BE81 /* Localizable.strings */; };
85-
D26434552706A15100857391 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D26434542706A15100857391 /* QuartzCore.framework */; };
86-
E93074B70A5C264700470842 /* InputMethodKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E93074B60A5C264700470842 /* InputMethodKit.framework */; };
83+
F41938F62B675B5200EAFFFF /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; };
84+
F41938F82B675B5700EAFFFF /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F41938F42B675B0500EAFFFF /* Cocoa.framework */; };
85+
F41938FA2B675B5B00EAFFFF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29B97325FDCFA39411CA2CEA /* Foundation.framework */; };
86+
F41939012B675BC500EAFFFF /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A4B8E1B20F645B870094E08B /* Carbon.framework */; };
87+
F41939032B675BC800EAFFFF /* InputMethodKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E93074B60A5C264700470842 /* InputMethodKit.framework */; };
88+
F41939052B675BCA00EAFFFF /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F41938FF2B675B7400EAFFFF /* IOKit.framework */; };
89+
F41939072B675BCC00EAFFFF /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F41938F52B675B1200EAFFFF /* QuartzCore.framework */; };
8790
/* End PBXBuildFile section */
8891

8992
/* Begin PBXCopyFilesBuildPhase section */
@@ -187,7 +190,6 @@
187190

188191
/* Begin PBXFileReference section */
189192
089C165DFE840E0CC02AAC07 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
190-
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
191193
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
192194
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
193195
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
@@ -276,19 +278,24 @@
276278
A47C48DE105E8CE8006D528B /* macos_keycode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = macos_keycode.m; sourceTree = "<group>"; };
277279
A4B8E1B20F645B870094E08B /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
278280
A4FC48CA0F6530EF0069BE81 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
279-
D26434542706A15100857391 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
280281
E93074B60A5C264700470842 /* InputMethodKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InputMethodKit.framework; path = /System/Library/Frameworks/InputMethodKit.framework; sourceTree = "<absolute>"; };
282+
F41938F42B675B0500EAFFFF /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
283+
F41938F52B675B1200EAFFFF /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
284+
F41938FF2B675B7400EAFFFF /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
281285
/* End PBXFileReference section */
282286

283287
/* Begin PBXFrameworksBuildPhase section */
284288
8D11072E0486CEB800E47090 /* Frameworks */ = {
285289
isa = PBXFrameworksBuildPhase;
286290
buildActionMask = 2147483647;
287291
files = (
288-
D26434552706A15100857391 /* QuartzCore.framework in Frameworks */,
289-
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
290-
E93074B70A5C264700470842 /* InputMethodKit.framework in Frameworks */,
291-
A4B8E1B30F645B870094E08B /* Carbon.framework in Frameworks */,
292+
F41939072B675BCC00EAFFFF /* QuartzCore.framework in Frameworks */,
293+
F41939012B675BC500EAFFFF /* Carbon.framework in Frameworks */,
294+
F41938FA2B675B5B00EAFFFF /* Foundation.framework in Frameworks */,
295+
F41939052B675BCA00EAFFFF /* IOKit.framework in Frameworks */,
296+
F41938F82B675B5700EAFFFF /* Cocoa.framework in Frameworks */,
297+
F41939032B675BC800EAFFFF /* InputMethodKit.framework in Frameworks */,
298+
F41938F62B675B5200EAFFFF /* AppKit.framework in Frameworks */,
292299
447765C925C30E97002415AF /* Sparkle.framework in Frameworks */,
293300
);
294301
runOnlyForDeploymentPostprocessing = 0;
@@ -321,18 +328,20 @@
321328
children = (
322329
44CD640915E2633D0021234E /* librime.1.dylib */,
323330
447765C725C30E6B002415AF /* Sparkle.framework */,
324-
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
325331
);
326332
name = "Linked Frameworks";
327333
sourceTree = "<group>";
328334
};
329335
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
330336
isa = PBXGroup;
331337
children = (
332-
A4B8E1B20F645B870094E08B /* Carbon.framework */,
333-
E93074B60A5C264700470842 /* InputMethodKit.framework */,
334338
29B97324FDCFA39411CA2CEA /* AppKit.framework */,
339+
A4B8E1B20F645B870094E08B /* Carbon.framework */,
340+
F41938F42B675B0500EAFFFF /* Cocoa.framework */,
335341
29B97325FDCFA39411CA2CEA /* Foundation.framework */,
342+
E93074B60A5C264700470842 /* InputMethodKit.framework */,
343+
F41938FF2B675B7400EAFFFF /* IOKit.framework */,
344+
F41938F52B675B1200EAFFFF /* QuartzCore.framework */,
336345
);
337346
name = "Other Frameworks";
338347
sourceTree = "<group>";
@@ -379,7 +388,6 @@
379388
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
380389
isa = PBXGroup;
381390
children = (
382-
D26434542706A15100857391 /* QuartzCore.framework */,
383391
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
384392
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
385393
);
@@ -602,9 +610,14 @@
602610
isa = XCBuildConfiguration;
603611
buildSettings = {
604612
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
613+
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
614+
CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
615+
CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
605616
CLANG_CXX_LIBRARY = "libc++";
606617
CLANG_ENABLE_OBJC_ARC = YES;
607618
CODE_SIGN_IDENTITY = "-";
619+
CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
620+
CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
608621
COMBINE_HIDPI_IMAGES = YES;
609622
COPY_PHASE_STRIP = NO;
610623
CURRENT_PROJECT_VERSION = 0.16.2u;
@@ -653,9 +666,14 @@
653666
isa = XCBuildConfiguration;
654667
buildSettings = {
655668
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
669+
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
670+
CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
671+
CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
656672
CLANG_CXX_LIBRARY = "libc++";
657673
CLANG_ENABLE_OBJC_ARC = YES;
658674
CODE_SIGN_IDENTITY = "-";
675+
CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
676+
CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
659677
COMBINE_HIDPI_IMAGES = YES;
660678
CURRENT_PROJECT_VERSION = 0.16.2u;
661679
DEAD_CODE_STRIPPING = YES;
@@ -704,13 +722,25 @@
704722
ALWAYS_SEARCH_USER_PATHS = NO;
705723
ASSETCATALOG_COMPILER_APPICON_NAME = RimeIcon;
706724
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
725+
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
726+
CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
727+
CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
728+
CLANG_ENABLE_OBJC_ARC = YES;
729+
CLANG_ENABLE_OBJC_ARC_EXCEPTIONS = YES;
730+
CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
731+
CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
732+
CLANG_WARN_ASSIGN_ENUM = YES;
707733
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
708734
CLANG_WARN_BOOL_CONVERSION = YES;
709735
CLANG_WARN_COMMA = YES;
710736
CLANG_WARN_CONSTANT_CONVERSION = YES;
711737
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
712738
CLANG_WARN_EMPTY_BODY = YES;
713739
CLANG_WARN_ENUM_CONVERSION = YES;
740+
CLANG_WARN_FLOAT_CONVERSION = YES;
741+
CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
742+
CLANG_WARN_IMPLICIT_FALLTHROUGH = YES;
743+
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
714744
CLANG_WARN_INFINITE_RECURSION = YES;
715745
CLANG_WARN_INT_CONVERSION = YES;
716746
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
@@ -719,19 +749,26 @@
719749
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
720750
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
721751
CLANG_WARN_STRICT_PROTOTYPES = YES;
752+
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
722753
CLANG_WARN_SUSPICIOUS_MOVE = YES;
723754
CLANG_WARN_UNREACHABLE_CODE = YES;
724755
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
725756
DEAD_CODE_STRIPPING = YES;
726757
ENABLE_STRICT_OBJC_MSGSEND = YES;
727758
ENABLE_TESTABILITY = YES;
728759
ENABLE_USER_SCRIPT_SANDBOXING = YES;
760+
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
729761
GCC_NO_COMMON_BLOCKS = YES;
730762
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
763+
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
731764
GCC_WARN_ABOUT_RETURN_TYPE = YES;
765+
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
766+
GCC_WARN_SIGN_COMPARE = YES;
732767
GCC_WARN_UNDECLARED_SELECTOR = YES;
733768
GCC_WARN_UNINITIALIZED_AUTOS = YES;
769+
GCC_WARN_UNKNOWN_PRAGMAS = YES;
734770
GCC_WARN_UNUSED_FUNCTION = YES;
771+
GCC_WARN_UNUSED_LABEL = YES;
735772
GCC_WARN_UNUSED_VARIABLE = YES;
736773
HEADER_SEARCH_PATHS = (
737774
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1)",
@@ -760,13 +797,25 @@
760797
ALWAYS_SEARCH_USER_PATHS = NO;
761798
ASSETCATALOG_COMPILER_APPICON_NAME = RimeIcon;
762799
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
800+
CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
801+
CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
802+
CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
803+
CLANG_ENABLE_OBJC_ARC = YES;
804+
CLANG_ENABLE_OBJC_ARC_EXCEPTIONS = YES;
805+
CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
806+
CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
807+
CLANG_WARN_ASSIGN_ENUM = YES;
763808
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
764809
CLANG_WARN_BOOL_CONVERSION = YES;
765810
CLANG_WARN_COMMA = YES;
766811
CLANG_WARN_CONSTANT_CONVERSION = YES;
767812
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
768813
CLANG_WARN_EMPTY_BODY = YES;
769814
CLANG_WARN_ENUM_CONVERSION = YES;
815+
CLANG_WARN_FLOAT_CONVERSION = YES;
816+
CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
817+
CLANG_WARN_IMPLICIT_FALLTHROUGH = YES;
818+
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
770819
CLANG_WARN_INFINITE_RECURSION = YES;
771820
CLANG_WARN_INT_CONVERSION = YES;
772821
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
@@ -775,19 +824,26 @@
775824
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
776825
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
777826
CLANG_WARN_STRICT_PROTOTYPES = YES;
827+
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
778828
CLANG_WARN_SUSPICIOUS_MOVE = YES;
779829
CLANG_WARN_UNREACHABLE_CODE = YES;
780830
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
781831
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/Release";
782832
DEAD_CODE_STRIPPING = YES;
783833
ENABLE_STRICT_OBJC_MSGSEND = YES;
784834
ENABLE_USER_SCRIPT_SANDBOXING = YES;
835+
GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
785836
GCC_NO_COMMON_BLOCKS = YES;
786837
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
838+
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
787839
GCC_WARN_ABOUT_RETURN_TYPE = YES;
840+
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
841+
GCC_WARN_SIGN_COMPARE = YES;
788842
GCC_WARN_UNDECLARED_SELECTOR = YES;
789843
GCC_WARN_UNINITIALIZED_AUTOS = YES;
844+
GCC_WARN_UNKNOWN_PRAGMAS = YES;
790845
GCC_WARN_UNUSED_FUNCTION = YES;
846+
GCC_WARN_UNUSED_LABEL = YES;
791847
GCC_WARN_UNUSED_VARIABLE = YES;
792848
HEADER_SEARCH_PATHS = (
793849
"$(HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1)",

‎action-install.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
rime_version=1.9.0-m
6-
rime_git_hash=8779bc8
6+
rime_git_hash=3ba735a
77

88
rime_archive="rime-${rime_git_hash}-macOS.tar.bz2"
99
rime_download_url="https://github.com/groverlynn/librime/releases/download/${rime_version}/${rime_archive}"

‎librime

0 commit comments

Comments
 (0)