Skip to content

Commit 636fec0

Browse files
groverlynngroverlynn
committed
include plugins & organize linked frameworks
1 parent 5db8c15 commit 636fec0

2 files changed

Lines changed: 49 additions & 26 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ librime: $(RIME_DEPS)
4444

4545
copy-rime-binaries:
4646
cp -L $(RIME_LIB_DIR)/$(RIME_LIBRARY_FILE_NAME) lib/
47+
cp -R $(RIME_LIB_DIR)/rime-plugins lib/
4748
cp $(RIME_BIN_DIR)/rime_deployer bin/
4849
cp $(RIME_BIN_DIR)/rime_dict_manager bin/
4950
$(INSTALL_NAME_TOOL) $(INSTALL_NAME_TOOL_ARGS) bin/rime_deployer

‎Squirrel.xcodeproj/project.pbxproj‎

Lines changed: 48 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,18 @@
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 */; };
87-
F45E005F2B8CA81C00179B75 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F45E005E2B8CA81C00179B75 /* UserNotifications.framework */; };
83+
F440EC552B9C73A200059E3A /* rime-plugins in Copy 3rd-party Frameworks */ = {isa = PBXBuildFile; fileRef = F440EC542B9C73A200059E3A /* rime-plugins */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
84+
F440EC662B9C79A400059E3A /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F440EC5F2B9C799400059E3A /* AppKit.framework */; };
85+
F440EC682B9C79A400059E3A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F440EC622B9C799400059E3A /* Cocoa.framework */; };
86+
F440EC692B9C79A400059E3A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F440EC602B9C799400059E3A /* Foundation.framework */; };
87+
F49829A52B9C8A830093E3A9 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F440EC652B9C799400059E3A /* Carbon.framework */; };
88+
F49829A62B9C8A880093E3A9 /* InputMethodKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F440EC612B9C799400059E3A /* InputMethodKit.framework */; };
89+
F49829A72B9C8A8F0093E3A9 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F440EC632B9C799400059E3A /* QuartzCore.framework */; };
90+
F49829A82B9C8A920093E3A9 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F440EC642B9C799400059E3A /* UserNotifications.framework */; };
91+
F49829B02B9D80700093E3A9 /* rime-plugins in Resources */ = {isa = PBXBuildFile; fileRef = F49829AF2B9D80700093E3A9 /* rime-plugins */; };
8892
/* End PBXBuildFile section */
8993

9094
/* Begin PBXCopyFilesBuildPhase section */
@@ -180,6 +184,7 @@
180184
files = (
181185
44CD640C15E2646B0021234E /* librime.1.dylib in Copy 3rd-party Frameworks */,
182186
447765CA25C30E97002415AF /* Sparkle.framework in Copy 3rd-party Frameworks */,
187+
F440EC552B9C73A200059E3A /* rime-plugins in Copy 3rd-party Frameworks */,
183188
);
184189
name = "Copy 3rd-party Frameworks";
185190
runOnlyForDeploymentPostprocessing = 0;
@@ -188,10 +193,7 @@
188193

189194
/* Begin PBXFileReference section */
190195
089C165DFE840E0CC02AAC07 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
191-
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
192196
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
193-
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
194-
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
195197
32CA4F630368D1EE00C91783 /* Squirrel_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Squirrel_Prefix.pch; sourceTree = "<group>"; };
196198
441E636322B7E90C006DCCDD /* cangjie5.schema.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = cangjie5.schema.yaml; path = data/plum/cangjie5.schema.yaml; sourceTree = "<group>"; };
197199
441E636422B7E90C006DCCDD /* terra_pinyin.dict.yaml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = terra_pinyin.dict.yaml; path = data/plum/terra_pinyin.dict.yaml; sourceTree = "<group>"; };
@@ -275,24 +277,31 @@
275277
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
276278
A44571AB0DBF42C200F793F9 /* macos_keycode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = macos_keycode.h; sourceTree = "<group>"; usesTabs = 0; };
277279
A47C48DE105E8CE8006D528B /* macos_keycode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = macos_keycode.m; sourceTree = "<group>"; };
278-
A4B8E1B20F645B870094E08B /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
279280
A4FC48CA0F6530EF0069BE81 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
280-
D26434542706A15100857391 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
281-
E93074B60A5C264700470842 /* InputMethodKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InputMethodKit.framework; path = /System/Library/Frameworks/InputMethodKit.framework; sourceTree = "<absolute>"; };
282-
F45E005E2B8CA81C00179B75 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
281+
F440EC542B9C73A200059E3A /* rime-plugins */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "rime-plugins"; path = "lib/rime-plugins"; sourceTree = "<group>"; };
282+
F440EC5F2B9C799400059E3A /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
283+
F440EC602B9C799400059E3A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
284+
F440EC612B9C799400059E3A /* InputMethodKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InputMethodKit.framework; path = System/Library/Frameworks/InputMethodKit.framework; sourceTree = SDKROOT; };
285+
F440EC622B9C799400059E3A /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
286+
F440EC632B9C799400059E3A /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
287+
F440EC642B9C799400059E3A /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
288+
F440EC652B9C799400059E3A /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
289+
F49829AF2B9D80700093E3A9 /* rime-plugins */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "rime-plugins"; path = "lib/rime-plugins"; sourceTree = "<group>"; };
283290
/* End PBXFileReference section */
284291

285292
/* Begin PBXFrameworksBuildPhase section */
286293
8D11072E0486CEB800E47090 /* Frameworks */ = {
287294
isa = PBXFrameworksBuildPhase;
288295
buildActionMask = 2147483647;
289296
files = (
290-
D26434552706A15100857391 /* QuartzCore.framework in Frameworks */,
291-
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
292-
F45E005F2B8CA81C00179B75 /* UserNotifications.framework in Frameworks */,
293-
E93074B70A5C264700470842 /* InputMethodKit.framework in Frameworks */,
294-
A4B8E1B30F645B870094E08B /* Carbon.framework in Frameworks */,
297+
F440EC662B9C79A400059E3A /* AppKit.framework in Frameworks */,
298+
F49829A52B9C8A830093E3A9 /* Carbon.framework in Frameworks */,
299+
F440EC682B9C79A400059E3A /* Cocoa.framework in Frameworks */,
300+
F440EC692B9C79A400059E3A /* Foundation.framework in Frameworks */,
301+
F49829A62B9C8A880093E3A9 /* InputMethodKit.framework in Frameworks */,
302+
F49829A72B9C8A8F0093E3A9 /* QuartzCore.framework in Frameworks */,
295303
447765C925C30E97002415AF /* Sparkle.framework in Frameworks */,
304+
F49829A82B9C8A920093E3A9 /* UserNotifications.framework in Frameworks */,
296305
);
297306
runOnlyForDeploymentPostprocessing = 0;
298307
};
@@ -322,20 +331,23 @@
322331
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
323332
isa = PBXGroup;
324333
children = (
325-
44CD640915E2633D0021234E /* librime.1.dylib */,
326-
447765C725C30E6B002415AF /* Sparkle.framework */,
327-
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
334+
F440EC5F2B9C799400059E3A /* AppKit.framework */,
335+
F440EC652B9C799400059E3A /* Carbon.framework */,
336+
F440EC622B9C799400059E3A /* Cocoa.framework */,
337+
F440EC602B9C799400059E3A /* Foundation.framework */,
338+
F440EC612B9C799400059E3A /* InputMethodKit.framework */,
339+
F440EC632B9C799400059E3A /* QuartzCore.framework */,
340+
F440EC642B9C799400059E3A /* UserNotifications.framework */,
328341
);
329342
name = "Linked Frameworks";
330343
sourceTree = "<group>";
331344
};
332345
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
333346
isa = PBXGroup;
334347
children = (
335-
A4B8E1B20F645B870094E08B /* Carbon.framework */,
336-
E93074B60A5C264700470842 /* InputMethodKit.framework */,
337-
29B97324FDCFA39411CA2CEA /* AppKit.framework */,
338-
29B97325FDCFA39411CA2CEA /* Foundation.framework */,
348+
44CD640915E2633D0021234E /* librime.1.dylib */,
349+
447765C725C30E6B002415AF /* Sparkle.framework */,
350+
F49829AF2B9D80700093E3A9 /* rime-plugins */,
339351
);
340352
name = "Other Frameworks";
341353
sourceTree = "<group>";
@@ -357,6 +369,7 @@
357369
29B97317FDCFA39411CA2CEA /* Resources */,
358370
29B97323FDCFA39411CA2CEA /* Frameworks */,
359371
19C28FACFE9D520D11CA2CBB /* Products */,
372+
F49829A42B9C8A010093E3A9 /* Recovered References */,
360373
);
361374
indentWidth = 2;
362375
name = Squirrel;
@@ -382,8 +395,6 @@
382395
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
383396
isa = PBXGroup;
384397
children = (
385-
F45E005E2B8CA81C00179B75 /* UserNotifications.framework */,
386-
D26434542706A15100857391 /* QuartzCore.framework */,
387398
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
388399
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
389400
);
@@ -476,6 +487,14 @@
476487
name = plum;
477488
sourceTree = "<group>";
478489
};
490+
F49829A42B9C8A010093E3A9 /* Recovered References */ = {
491+
isa = PBXGroup;
492+
children = (
493+
F440EC542B9C73A200059E3A /* rime-plugins */,
494+
);
495+
name = "Recovered References";
496+
sourceTree = "<group>";
497+
};
479498
/* End PBXGroup section */
480499

481500
/* Begin PBXNativeTarget section */
@@ -541,6 +560,7 @@
541560
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
542561
A45578F51146A75200592C6E /* MainMenu.xib in Resources */,
543562
446C01D71F767BD400A6C23E /* Assets.xcassets in Resources */,
563+
F49829B02B9D80700093E3A9 /* rime-plugins in Resources */,
544564
A4FC48CB0F6530EF0069BE81 /* Localizable.strings in Resources */,
545565
44986A95184B421700B3278D /* LICENSE.txt in Resources */,
546566
44986A96184B421700B3278D /* README.md in Resources */,
@@ -635,6 +655,7 @@
635655
LIBRARY_SEARCH_PATHS = (
636656
"$(inherited)",
637657
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
658+
"$(PROJECT_DIR)/lib/rime-plugins",
638659
);
639660
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
640661
OTHER_CODE_SIGN_FLAGS = "--deep";
@@ -683,6 +704,7 @@
683704
LIBRARY_SEARCH_PATHS = (
684705
"$(inherited)",
685706
"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
707+
"$(PROJECT_DIR)/lib/rime-plugins",
686708
);
687709
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
688710
OTHER_CODE_SIGN_FLAGS = "--deep";

0 commit comments

Comments
 (0)