Skip to content

Commit 980d318

Browse files
objecthubobjecthub
committed
Refactor project structure to match layout required by the Swift Package Manager.
1 parent 1f5e8a0 commit 980d318

File tree

112 files changed

+21
-18
lines changed

Some content is hidden

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

112 files changed

+21
-18
lines changed

‎LispKit.xcodeproj/project.pbxproj‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
CC5696791CBD48E700F6803E /* Global.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC5696781CBD48E700F6803E /* Global.swift */; };
4040
CC5847FA1E4FC55700BE6497 /* SRFI132.scm in Resources */ = {isa = PBXBuildFile; fileRef = CC5847F91E4FC55700BE6497 /* SRFI132.scm */; };
4141
CC5848031E56920600BE6497 /* set.sld in Copy pre-installed LispKit libraries */ = {isa = PBXBuildFile; fileRef = CC5848021E5691B300BE6497 /* set.sld */; };
42-
CC5848101E56BE0600BE6497 /* derived.sld in Copy pre-installed LispKit library: SRFI 41 */ = {isa = PBXBuildFile; fileRef = CC58480D1E56BD4100BE6497 /* derived.sld */; };
43-
CC5848111E56BE0C00BE6497 /* primitive.sld in Copy pre-installed LispKit library: SRFI 41 */ = {isa = PBXBuildFile; fileRef = CC58480E1E56BD4100BE6497 /* primitive.sld */; };
4442
CC5848121E56BE2700BE6497 /* 1.sld in Copy pre-installed SRFI libraries */ = {isa = PBXBuildFile; fileRef = CC5848051E56BD0B00BE6497 /* 1.sld */; };
4543
CC5848131E56BE2700BE6497 /* 2.sld in Copy pre-installed SRFI libraries */ = {isa = PBXBuildFile; fileRef = CC5848061E56BD0B00BE6497 /* 2.sld */; };
4644
CC5848141E56BE2700BE6497 /* 8.sld in Copy pre-installed SRFI libraries */ = {isa = PBXBuildFile; fileRef = CC5848071E56BD0B00BE6497 /* 8.sld */; };
@@ -111,6 +109,8 @@
111109
CCC531A01D18595500FAED6E /* TextOutputTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCC5319F1D18595500FAED6E /* TextOutputTarget.swift */; };
112110
CCC62D921CA9ED6A00E2C43F /* TrackedObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCC62D911CA9ED6A00E2C43F /* TrackedObject.swift */; };
113111
CCCEB3FF1DF2DAA9009BF66B /* FileHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCCEB3FE1DF2DAA9009BF66B /* FileHandler.swift */; };
112+
CCD2BF6A1EBE550D004B2CB5 /* primitive.sld in Copy pre-installed LispKit library: SRFI 41 */ = {isa = PBXBuildFile; fileRef = CC58480E1E56BD4100BE6497 /* primitive.sld */; };
113+
CCD2BF6B1EBE5515004B2CB5 /* derived.sld in Copy pre-installed LispKit library: SRFI 41 */ = {isa = PBXBuildFile; fileRef = CC58480D1E56BD4100BE6497 /* derived.sld */; };
114114
CCD81AD21CE75823009EB087 /* Checkpointer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCD81AD11CE75823009EB087 /* Checkpointer.swift */; };
115115
CCDAD5521D4813E900A7EE4F /* HashTables.scm in Resources */ = {isa = PBXBuildFile; fileRef = CCDAD5511D4813E900A7EE4F /* HashTables.scm */; };
116116
CCDF99FC1D3D7A3100FD2A57 /* BoxLibrary.swift in Sources */ = {isa = PBXBuildFile; fileRef = CCDF99FB1D3D7A3100FD2A57 /* BoxLibrary.swift */; };
@@ -189,8 +189,8 @@
189189
dstPath = LispKit/Resources/Libraries/srfi/41;
190190
dstSubfolderSpec = 7;
191191
files = (
192-
CC5848111E56BE0C00BE6497 /* primitive.sld in Copy pre-installed LispKit library: SRFI 41 */,
193-
CC5848101E56BE0600BE6497 /* derived.sld in Copy pre-installed LispKit library: SRFI 41 */,
192+
CCD2BF6B1EBE5515004B2CB5 /* derived.sld in Copy pre-installed LispKit library: SRFI 41 */,
193+
CCD2BF6A1EBE550D004B2CB5 /* primitive.sld in Copy pre-installed LispKit library: SRFI 41 */,
194194
);
195195
name = "Copy pre-installed LispKit library: SRFI 41";
196196
runOnlyForDeploymentPostprocessing = 0;
@@ -395,7 +395,8 @@
395395
CC12273A1CBFE74500821EB7 /* Info.plist */,
396396
CC502A931CDABF1E00875D9F /* LispKitReplBridgingHeader.h */,
397397
);
398-
path = LispKitRepl;
398+
name = LispKitRepl;
399+
path = Sources/LispKitRepl;
399400
sourceTree = "<group>";
400401
};
401402
CC131C4A1CDE0C3D006C030C /* Code */ = {
@@ -457,7 +458,7 @@
457458
CC58480D1E56BD4100BE6497 /* derived.sld */,
458459
);
459460
name = 41;
460-
path = LispKit/Resources/Libraries/srfi/41;
461+
path = Sources/LispKit/Resources/Libraries/srfi/41;
461462
sourceTree = SOURCE_ROOT;
462463
};
463464
CC9050101D392706008CE60A /* Data */ = {
@@ -544,7 +545,8 @@
544545
CCAD52BD1C48403900DBD8EE /* LispKit.h */,
545546
CCAD52BF1C48403900DBD8EE /* Info.plist */,
546547
);
547-
path = LispKit;
548+
name = LispKit;
549+
path = Sources/LispKit;
548550
sourceTree = "<group>";
549551
};
550552
CCAD52C81C48403900DBD8EE /* LispKitTests */ = {
@@ -556,7 +558,8 @@
556558
CCAD52CB1C48403900DBD8EE /* Info.plist */,
557559
CC131C4A1CDE0C3D006C030C /* Code */,
558560
);
559-
path = LispKitTests;
561+
name = LispKitTests;
562+
path = Tests/LispKitTests;
560563
sourceTree = "<group>";
561564
};
562565
CCAD52D41C48467D00DBD8EE /* Resources */ = {
@@ -908,12 +911,12 @@
908911
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
909912
CLANG_ENABLE_MODULES = YES;
910913
COMBINE_HIDPI_IMAGES = YES;
911-
INFOPLIST_FILE = LispKitRepl/Info.plist;
914+
INFOPLIST_FILE = Sources/LispKitRepl/Info.plist;
912915
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../Frameworks";
913916
"OTHER_SWIFT_FLAGS[arch=*]" = "-D DEBUG";
914917
PRODUCT_BUNDLE_IDENTIFIER = net.objecthub.LispKitRepl;
915918
PRODUCT_NAME = "$(TARGET_NAME)";
916-
SWIFT_OBJC_BRIDGING_HEADER = LispKitRepl/LispKitReplBridgingHeader.h;
919+
SWIFT_OBJC_BRIDGING_HEADER = Sources/LispKitRepl/LispKitReplBridgingHeader.h;
917920
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
918921
SWIFT_VERSION = 3.0;
919922
};
@@ -925,11 +928,11 @@
925928
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
926929
CLANG_ENABLE_MODULES = YES;
927930
COMBINE_HIDPI_IMAGES = YES;
928-
INFOPLIST_FILE = LispKitRepl/Info.plist;
931+
INFOPLIST_FILE = Sources/LispKitRepl/Info.plist;
929932
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../Frameworks";
930933
PRODUCT_BUNDLE_IDENTIFIER = net.objecthub.LispKitRepl;
931934
PRODUCT_NAME = "$(TARGET_NAME)";
932-
SWIFT_OBJC_BRIDGING_HEADER = LispKitRepl/LispKitReplBridgingHeader.h;
935+
SWIFT_OBJC_BRIDGING_HEADER = Sources/LispKitRepl/LispKitReplBridgingHeader.h;
933936
SWIFT_VERSION = 3.0;
934937
};
935938
name = Release;
@@ -1038,7 +1041,7 @@
10381041
DYLIB_INSTALL_NAME_BASE = "@rpath";
10391042
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/Mac";
10401043
FRAMEWORK_VERSION = A;
1041-
INFOPLIST_FILE = LispKit/Info.plist;
1044+
INFOPLIST_FILE = "$(SRCROOT)/Sources/LispKit/Info.plist";
10421045
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
10431046
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
10441047
"OTHER_SWIFT_FLAGS[arch=*]" = "-D DEBUG";
@@ -1064,7 +1067,7 @@
10641067
DYLIB_INSTALL_NAME_BASE = "@rpath";
10651068
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/Mac";
10661069
FRAMEWORK_VERSION = A;
1067-
INFOPLIST_FILE = LispKit/Info.plist;
1070+
INFOPLIST_FILE = "$(SRCROOT)/Sources/LispKit/Info.plist";
10681071
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
10691072
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
10701073
PRODUCT_BUNDLE_IDENTIFIER = net.objecthub.LispKit;
@@ -1083,7 +1086,7 @@
10831086
"$(inherited)",
10841087
"$(PROJECT_DIR)/Carthage/Build/Mac",
10851088
);
1086-
INFOPLIST_FILE = LispKitTests/Info.plist;
1089+
INFOPLIST_FILE = Tests/LispKitTests/Info.plist;
10871090
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
10881091
PRODUCT_BUNDLE_IDENTIFIER = net.objecthub.LispKitTests;
10891092
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1099,7 +1102,7 @@
10991102
"$(inherited)",
11001103
"$(PROJECT_DIR)/Carthage/Build/Mac",
11011104
);
1102-
INFOPLIST_FILE = LispKitTests/Info.plist;
1105+
INFOPLIST_FILE = Tests/LispKitTests/Info.plist;
11031106
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
11041107
PRODUCT_BUNDLE_IDENTIFIER = net.objecthub.LispKitTests;
11051108
PRODUCT_NAME = "$(TARGET_NAME)";

‎README.md‎

Lines changed: 1 addition & 1 deletion

‎LispKit/Base/Boxes.swift‎ renamed to ‎Sources/LispKit/Base/Boxes.swift‎

File renamed without changes.

‎LispKit/Base/Global.swift‎ renamed to ‎Sources/LispKit/Base/Global.swift‎

File renamed without changes.

‎LispKit/Base/ManagedObject.swift‎ renamed to ‎Sources/LispKit/Base/ManagedObject.swift‎

File renamed without changes.

‎LispKit/Base/ManagedObjectPool.swift‎ renamed to ‎Sources/LispKit/Base/ManagedObjectPool.swift‎

File renamed without changes.

‎LispKit/Base/MultiMap.swift‎ renamed to ‎Sources/LispKit/Base/MultiMap.swift‎

File renamed without changes.

‎LispKit/Base/ObjectPool.swift‎ renamed to ‎Sources/LispKit/Base/ObjectPool.swift‎

File renamed without changes.

‎LispKit/Base/Random.swift‎ renamed to ‎Sources/LispKit/Base/Random.swift‎

File renamed without changes.

‎LispKit/Base/Reference.swift‎ renamed to ‎Sources/LispKit/Base/Reference.swift‎

File renamed without changes.

0 commit comments

Comments
 (0)