Skip to content

Commit 8e27a40

Browse files
vimfungvimfung
committed
1、调整文件组织结构
2、同步lua 5.1工程
1 parent 1d8907a commit 8e27a40

File tree

4 files changed

+32
-16
lines changed

4 files changed

+32
-16
lines changed

Source/iOS_OSX/LSCOperationQueue.h renamed to Source/iOS_OSX/Code/LSCOperationQueue.h

File renamed without changes.

Source/iOS_OSX/LSCOperationQueue.m renamed to Source/iOS_OSX/Code/LSCOperationQueue.m

File renamed without changes.

‎Source/iOS_OSX/LuaScriptCore.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@
5555

5656
/* Begin PBXBuildFile section */
5757
7C0031E21F072F9A0024E192 /* coroutine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 7C0031E11F072F9A0024E192 /* coroutine.lua */; };
58+
7C10B81420E62E4800B2CA7B /* LSCOperationQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C10B81220E62E4800B2CA7B /* LSCOperationQueue.h */; };
59+
7C10B81520E62E4800B2CA7B /* LSCOperationQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C10B81220E62E4800B2CA7B /* LSCOperationQueue.h */; };
60+
7C10B81620E62E4800B2CA7B /* LSCOperationQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C10B81320E62E4800B2CA7B /* LSCOperationQueue.m */; };
61+
7C10B81720E62E4800B2CA7B /* LSCOperationQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C10B81320E62E4800B2CA7B /* LSCOperationQueue.m */; };
62+
7C10B81820E62E4800B2CA7B /* LSCOperationQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C10B81320E62E4800B2CA7B /* LSCOperationQueue.m */; };
63+
7C10B81920E62E4800B2CA7B /* LSCOperationQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C10B81320E62E4800B2CA7B /* LSCOperationQueue.m */; };
5864
7C175AAA1D93B0870094E910 /* LSCTypeDefinied.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7C175AA41D93B0730094E910 /* LSCTypeDefinied.h */; };
5965
7C175AAE1D93B0C60094E910 /* LSCTypeDefinied.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7C175AA41D93B0730094E910 /* LSCTypeDefinied.h */; };
6066
7C177B881DEFDBEC008C9DF1 /* LSCFunction.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7C238E571DEECBBD009CB024 /* LSCFunction.h */; };
@@ -229,12 +235,6 @@
229235
7C25E3471FC809EB005E0322 /* LuaExportTypeAnnotation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C25E3451FC809EB005E0322 /* LuaExportTypeAnnotation.swift */; };
230236
7C260B641E822FD000C87877 /* NativePerson.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C260B631E822FD000C87877 /* NativePerson.m */; };
231237
7C260B681E8236B800C87877 /* Person.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C260B671E8236B800C87877 /* Person.swift */; };
232-
7C35B7D920E4C6DA00BB7DC7 /* LSCOperationQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C35B7D720E4C6DA00BB7DC7 /* LSCOperationQueue.h */; };
233-
7C35B7DA20E4C6DA00BB7DC7 /* LSCOperationQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C35B7D720E4C6DA00BB7DC7 /* LSCOperationQueue.h */; };
234-
7C35B7DB20E4C6DA00BB7DC7 /* LSCOperationQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C35B7D820E4C6DA00BB7DC7 /* LSCOperationQueue.m */; };
235-
7C35B7DC20E4C6DA00BB7DC7 /* LSCOperationQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C35B7D820E4C6DA00BB7DC7 /* LSCOperationQueue.m */; };
236-
7C35B7DD20E4C6DA00BB7DC7 /* LSCOperationQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C35B7D820E4C6DA00BB7DC7 /* LSCOperationQueue.m */; };
237-
7C35B7DE20E4C6DA00BB7DC7 /* LSCOperationQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C35B7D820E4C6DA00BB7DC7 /* LSCOperationQueue.m */; };
238238
7C58934A1E309CE000FF2E10 /* LuaTuple.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C5893491E309CE000FF2E10 /* LuaTuple.swift */; };
239239
7C58934B1E309CE000FF2E10 /* LuaTuple.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C5893491E309CE000FF2E10 /* LuaTuple.swift */; };
240240
7C623B791FE0D28F00FDFA5E /* LSCExportTypeDescriptor+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C623B781FE0D28F00FDFA5E /* LSCExportTypeDescriptor+Private.h */; };
@@ -519,6 +519,8 @@
519519

520520
/* Begin PBXFileReference section */
521521
7C0031E11F072F9A0024E192 /* coroutine.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = coroutine.lua; sourceTree = "<group>"; };
522+
7C10B81220E62E4800B2CA7B /* LSCOperationQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LSCOperationQueue.h; path = Code/LSCOperationQueue.h; sourceTree = "<group>"; };
523+
7C10B81320E62E4800B2CA7B /* LSCOperationQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LSCOperationQueue.m; path = Code/LSCOperationQueue.m; sourceTree = "<group>"; };
522524
7C175AA01D93B0730094E910 /* LSCContext_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LSCContext_Private.h; path = Code/LSCContext_Private.h; sourceTree = "<group>"; };
523525
7C175AA41D93B0730094E910 /* LSCTypeDefinied.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LSCTypeDefinied.h; path = Code/LSCTypeDefinied.h; sourceTree = "<group>"; };
524526
7C177BA01DEFDD8D008C9DF1 /* LuaScriptCore_OSX_Swift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LuaScriptCore_OSX_Swift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -545,8 +547,6 @@
545547
7C260B621E822FD000C87877 /* NativePerson.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativePerson.h; sourceTree = "<group>"; };
546548
7C260B631E822FD000C87877 /* NativePerson.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NativePerson.m; sourceTree = "<group>"; };
547549
7C260B671E8236B800C87877 /* Person.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Person.swift; sourceTree = "<group>"; };
548-
7C35B7D720E4C6DA00BB7DC7 /* LSCOperationQueue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LSCOperationQueue.h; sourceTree = "<group>"; };
549-
7C35B7D820E4C6DA00BB7DC7 /* LSCOperationQueue.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LSCOperationQueue.m; sourceTree = "<group>"; };
550550
7C5893491E309CE000FF2E10 /* LuaTuple.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LuaTuple.swift; sourceTree = "<group>"; };
551551
7C623B781FE0D28F00FDFA5E /* LSCExportTypeDescriptor+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "LSCExportTypeDescriptor+Private.h"; path = "Code/LSCExportTypeDescriptor+Private.h"; sourceTree = "<group>"; };
552552
7C623B831FE1096B00FDFA5E /* LSCTmpValue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LSCTmpValue.m; path = Code/LSCTmpValue.m; sourceTree = "<group>"; };
@@ -871,8 +871,8 @@
871871
7C8EA2AD1FCFBA5F000F58BF /* LSCExportPropertyDescriptor.m */,
872872
7C77CB1F200C96A4004190F2 /* LSCVirtualInstance.h */,
873873
7C77CB20200C96A4004190F2 /* LSCVirtualInstance.m */,
874-
7C35B7D720E4C6DA00BB7DC7 /* LSCOperationQueue.h */,
875-
7C35B7D820E4C6DA00BB7DC7 /* LSCOperationQueue.m */,
874+
7C10B81220E62E4800B2CA7B /* LSCOperationQueue.h */,
875+
7C10B81320E62E4800B2CA7B /* LSCOperationQueue.m */,
876876
);
877877
name = LuaScriptCore;
878878
sourceTree = "<group>";
@@ -997,7 +997,7 @@
997997
7C623B8A1FE1096B00FDFA5E /* LSCTmpValue.h in Headers */,
998998
7C177BEE1DEFDE50008C9DF1 /* lprefix.h in Headers */,
999999
7C8EA28F1FCFADB5000F58BF /* LSCEngineAdapter.h in Headers */,
1000-
7C35B7DA20E4C6DA00BB7DC7 /* LSCOperationQueue.h in Headers */,
1000+
7C10B81520E62E4800B2CA7B /* LSCOperationQueue.h in Headers */,
10011001
7C177BE51DEFDE50008C9DF1 /* lmem.h in Headers */,
10021002
7C177BCC1DEFDE50008C9DF1 /* lauxlib.h in Headers */,
10031003
7C177BD61DEFDE50008C9DF1 /* ldebug.h in Headers */,
@@ -1059,7 +1059,7 @@
10591059
7C623B891FE1096B00FDFA5E /* LSCTmpValue.h in Headers */,
10601060
7C238F431DEED3A1009CB024 /* LSCManagedObjectProtocol.h in Headers */,
10611061
7C8EA28E1FCFADB5000F58BF /* LSCEngineAdapter.h in Headers */,
1062-
7C35B7D920E4C6DA00BB7DC7 /* LSCOperationQueue.h in Headers */,
1062+
7C10B81420E62E4800B2CA7B /* LSCOperationQueue.h in Headers */,
10631063
7C238F401DEED3A1009CB024 /* LSCFunction_Private.h in Headers */,
10641064
7C238F0E1DEED39A009CB024 /* lgc.h in Headers */,
10651065
7C238F041DEED39A009CB024 /* lctype.h in Headers */,
@@ -1472,7 +1472,7 @@
14721472
7C177BB51DEFDE0F008C9DF1 /* LuaPointer.swift in Sources */,
14731473
7C177C001DEFDE50008C9DF1 /* lvm.c in Sources */,
14741474
7C177BEF1DEFDE50008C9DF1 /* lstate.c in Sources */,
1475-
7C35B7DE20E4C6DA00BB7DC7 /* LSCOperationQueue.m in Sources */,
1475+
7C10B81920E62E4800B2CA7B /* LSCOperationQueue.m in Sources */,
14761476
7C177BBD1DEFDE49008C9DF1 /* LSCValue.m in Sources */,
14771477
7C177BD51DEFDE50008C9DF1 /* ldebug.c in Sources */,
14781478
7C8EA2A11FCFBA45000F58BF /* LSCExportsTypeManager.m in Sources */,
@@ -1539,7 +1539,7 @@
15391539
7C238F001DEED39A009CB024 /* lcode.c in Sources */,
15401540
7C238F081DEED39A009CB024 /* ldo.c in Sources */,
15411541
7C238F1A1DEED39A009CB024 /* lopcodes.c in Sources */,
1542-
7C35B7DD20E4C6DA00BB7DC7 /* LSCOperationQueue.m in Sources */,
1542+
7C10B81820E62E4800B2CA7B /* LSCOperationQueue.m in Sources */,
15431543
7C177BB61DEFDE0F008C9DF1 /* LuaValue.swift in Sources */,
15441544
7C177BB21DEFDE0F008C9DF1 /* LuaFunction.swift in Sources */,
15451545
7C8EA2A01FCFBA45000F58BF /* LSCExportsTypeManager.m in Sources */,
@@ -1605,7 +1605,7 @@
16051605
7C6B153A1D6B2B5700489D9E /* lbitlib.c in Sources */,
16061606
7C8EA27C1FCFAD99000F58BF /* LSCManagedValue.m in Sources */,
16071607
7C6B15431D6B2B5700489D9E /* lgc.c in Sources */,
1608-
7C35B7DC20E4C6DA00BB7DC7 /* LSCOperationQueue.m in Sources */,
1608+
7C10B81720E62E4800B2CA7B /* LSCOperationQueue.m in Sources */,
16091609
7C6B15561D6B2B5700489D9E /* lvm.c in Sources */,
16101610
7C8EA2741FCFAD6F000F58BF /* LSCDataExchanger.m in Sources */,
16111611
7C6B15471D6B2B5700489D9E /* lmathlib.c in Sources */,
@@ -1661,7 +1661,7 @@
16611661
7C6B13DA1D6B047F00489D9E /* LSCValue.m in Sources */,
16621662
7C8EA27B1FCFAD99000F58BF /* LSCManagedValue.m in Sources */,
16631663
7C6B14211D6B049300489D9E /* ldebug.c in Sources */,
1664-
7C35B7DB20E4C6DA00BB7DC7 /* LSCOperationQueue.m in Sources */,
1664+
7C10B81620E62E4800B2CA7B /* LSCOperationQueue.m in Sources */,
16651665
7C6B14271D6B049300489D9E /* liolib.c in Sources */,
16661666
7C8EA2731FCFAD6F000F58BF /* LSCDataExchanger.m in Sources */,
16671667
7C6B142E1D6B049300489D9E /* loslib.c in Sources */,

‎Source/iOS_OSX/LuaScriptCore_5_1.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@
5555

5656
/* Begin PBXBuildFile section */
5757
7C0031E21F072F9A0024E192 /* coroutine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 7C0031E11F072F9A0024E192 /* coroutine.lua */; };
58+
7C10B80C20E62E2800B2CA7B /* LSCOperationQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C10B80A20E62E2800B2CA7B /* LSCOperationQueue.h */; };
59+
7C10B80D20E62E2800B2CA7B /* LSCOperationQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C10B80A20E62E2800B2CA7B /* LSCOperationQueue.h */; };
60+
7C10B80E20E62E2800B2CA7B /* LSCOperationQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C10B80B20E62E2800B2CA7B /* LSCOperationQueue.m */; };
61+
7C10B80F20E62E2800B2CA7B /* LSCOperationQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C10B80B20E62E2800B2CA7B /* LSCOperationQueue.m */; };
62+
7C10B81020E62E2800B2CA7B /* LSCOperationQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C10B80B20E62E2800B2CA7B /* LSCOperationQueue.m */; };
63+
7C10B81120E62E2800B2CA7B /* LSCOperationQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 7C10B80B20E62E2800B2CA7B /* LSCOperationQueue.m */; };
5864
7C175AAA1D93B0870094E910 /* LSCTypeDefinied.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7C175AA41D93B0730094E910 /* LSCTypeDefinied.h */; };
5965
7C175AAE1D93B0C60094E910 /* LSCTypeDefinied.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7C175AA41D93B0730094E910 /* LSCTypeDefinied.h */; };
6066
7C177B881DEFDBEC008C9DF1 /* LSCFunction.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7C238E571DEECBBD009CB024 /* LSCFunction.h */; };
@@ -483,6 +489,8 @@
483489

484490
/* Begin PBXFileReference section */
485491
7C0031E11F072F9A0024E192 /* coroutine.lua */ = {isa = PBXFileReference; lastKnownFileType = text; path = coroutine.lua; sourceTree = "<group>"; };
492+
7C10B80A20E62E2800B2CA7B /* LSCOperationQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LSCOperationQueue.h; path = Code/LSCOperationQueue.h; sourceTree = "<group>"; };
493+
7C10B80B20E62E2800B2CA7B /* LSCOperationQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LSCOperationQueue.m; path = Code/LSCOperationQueue.m; sourceTree = "<group>"; };
486494
7C175AA01D93B0730094E910 /* LSCContext_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LSCContext_Private.h; path = Code/LSCContext_Private.h; sourceTree = "<group>"; };
487495
7C175AA41D93B0730094E910 /* LSCTypeDefinied.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LSCTypeDefinied.h; path = Code/LSCTypeDefinied.h; sourceTree = "<group>"; };
488496
7C177BA01DEFDD8D008C9DF1 /* LuaScriptCore_OSX_Swift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LuaScriptCore_OSX_Swift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -822,6 +830,8 @@
822830
7C8EA31A1FCFD247000F58BF /* LSCExportPropertyDescriptor.m */,
823831
7C77CB27200C96E8004190F2 /* LSCVirtualInstance.h */,
824832
7C77CB28200C96E8004190F2 /* LSCVirtualInstance.m */,
833+
7C10B80A20E62E2800B2CA7B /* LSCOperationQueue.h */,
834+
7C10B80B20E62E2800B2CA7B /* LSCOperationQueue.m */,
825835
);
826836
name = LuaScriptCore;
827837
sourceTree = "<group>";
@@ -972,6 +982,7 @@
972982
7C8EA2EE1FCFD0E6000F58BF /* LSCEngineAdapter.h in Headers */,
973983
7C177BBB1DEFDE49008C9DF1 /* LSCValue_Private.h in Headers */,
974984
7CB560641F343F5F002982CE /* lstring.h in Headers */,
985+
7C10B80D20E62E2800B2CA7B /* LSCOperationQueue.h in Headers */,
975986
7C77CB2A200C96E8004190F2 /* LSCVirtualInstance.h in Headers */,
976987
7CB560241F343F5F002982CE /* lgc.h in Headers */,
977988
7CB55FFE1F343F5F002982CE /* lcode.h in Headers */,
@@ -1032,6 +1043,7 @@
10321043
7C8EA2ED1FCFD0E6000F58BF /* LSCEngineAdapter.h in Headers */,
10331044
7C238F401DEED3A1009CB024 /* LSCFunction_Private.h in Headers */,
10341045
7CB560631F343F5F002982CE /* lstring.h in Headers */,
1046+
7C10B80C20E62E2800B2CA7B /* LSCOperationQueue.h in Headers */,
10351047
7C77CB29200C96E8004190F2 /* LSCVirtualInstance.h in Headers */,
10361048
7CB560231F343F5F002982CE /* lgc.h in Headers */,
10371049
7CB55FFD1F343F5F002982CE /* lcode.h in Headers */,
@@ -1365,6 +1377,7 @@
13651377
files = (
13661378
7C177BC51DEFDE49008C9DF1 /* LSCFunction.m in Sources */,
13671379
7C8EA2CC1FCFD09E000F58BF /* LSCTuple.m in Sources */,
1380+
7C10B81120E62E2800B2CA7B /* LSCOperationQueue.m in Sources */,
13681381
7CB560061F343F5F002982CE /* ldebug.c in Sources */,
13691382
7C177BBA1DEFDE49008C9DF1 /* LSCContext.m in Sources */,
13701383
7CB560901F343F5F002982CE /* lzio.c in Sources */,
@@ -1429,6 +1442,7 @@
14291442
files = (
14301443
7C8EA2CB1FCFD09E000F58BF /* LSCTuple.m in Sources */,
14311444
7CB560051F343F5F002982CE /* ldebug.c in Sources */,
1445+
7C10B81020E62E2800B2CA7B /* LSCOperationQueue.m in Sources */,
14321446
7C58934A1E309CE000FF2E10 /* LuaTuple.swift in Sources */,
14331447
7CB5608F1F343F5F002982CE /* lzio.c in Sources */,
14341448
7CB560371F343F5F002982CE /* lmathlib.c in Sources */,
@@ -1562,6 +1576,7 @@
15621576
7CB5600A1F343F5F002982CE /* ldo.c in Sources */,
15631577
7CB560201F343F5F002982CE /* lgc.c in Sources */,
15641578
7C8EA3001FCFD103000F58BF /* LSCExportsTypeManager.m in Sources */,
1579+
7C10B80F20E62E2800B2CA7B /* LSCOperationQueue.m in Sources */,
15651580
7C6B15591D6B2B5700489D9E /* LSCValue.m in Sources */,
15661581
7C8EA30E1FCFD11E000F58BF /* LSCExportTypeDescriptor.m in Sources */,
15671582
7CB5604A1F343F5F002982CE /* lopcodes.c in Sources */,
@@ -1615,6 +1630,7 @@
16151630
7CB560091F343F5F002982CE /* ldo.c in Sources */,
16161631
7CB5601F1F343F5F002982CE /* lgc.c in Sources */,
16171632
7C8EA2FF1FCFD103000F58BF /* LSCExportsTypeManager.m in Sources */,
1633+
7C10B80E20E62E2800B2CA7B /* LSCOperationQueue.m in Sources */,
16181634
7C238E591DEECBBD009CB024 /* LSCFunction.m in Sources */,
16191635
7C8EA30D1FCFD11E000F58BF /* LSCExportTypeDescriptor.m in Sources */,
16201636
7CB560491F343F5F002982CE /* lopcodes.c in Sources */,

0 commit comments

Comments
 (0)