From 4634207f8edf20531d0851635fdc55926f74ab8b Mon Sep 17 00:00:00 2001 From: Peter Tomaselli Date: Tue, 14 Jan 2020 09:33:37 -0500 Subject: [PATCH] Swift 5.1 support * add a Makefile --- Makefile | 20 ++++ Prelude.xcodeproj/project.pbxproj | 178 +++++++++++++++--------------- 2 files changed, 112 insertions(+), 86 deletions(-) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..b573554 --- /dev/null +++ b/Makefile @@ -0,0 +1,20 @@ +.PHONY: default clean swiftbuild swifttest sync_linuxmain sync_xcodeproj test + +default: sync_linuxmain sync_xcodeproj swiftbuild + +clean: + swift package clean + +swiftbuild: + swift build + +swifttest: sync_linuxmain + swift test + +sync_linuxmain: + swift test --generate-linuxmain + +sync_xcodeproj: + swift package generate-xcodeproj + +test: swifttest diff --git a/Prelude.xcodeproj/project.pbxproj b/Prelude.xcodeproj/project.pbxproj index 397ee0e..5bd9e58 100644 --- a/Prelude.xcodeproj/project.pbxproj +++ b/Prelude.xcodeproj/project.pbxproj @@ -148,8 +148,8 @@ "OBJ_29" = { isa = "PBXGroup"; children = ( - "Prelude::PreludeTests::Product", - "Prelude::Prelude::Product" + "Prelude::Prelude::Product", + "Prelude::PreludeTests::Product" ); name = "Products"; path = ""; @@ -208,20 +208,25 @@ sourceTree = ""; }; "OBJ_34" = { + isa = "PBXFileReference"; + path = "Makefile"; + sourceTree = ""; + }; + "OBJ_35" = { isa = "PBXFileReference"; path = "README.md"; sourceTree = ""; }; - "OBJ_36" = { + "OBJ_37" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_37", - "OBJ_38" + "OBJ_38", + "OBJ_39" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_37" = { + "OBJ_38" = { isa = "XCBuildConfiguration"; buildSettings = { ENABLE_TESTABILITY = "YES"; @@ -262,7 +267,7 @@ }; name = "Debug"; }; - "OBJ_38" = { + "OBJ_39" = { isa = "XCBuildConfiguration"; buildSettings = { ENABLE_TESTABILITY = "YES"; @@ -303,20 +308,6 @@ }; name = "Release"; }; - "OBJ_39" = { - isa = "PBXSourcesBuildPhase"; - files = ( - "OBJ_40", - "OBJ_41", - "OBJ_42", - "OBJ_43", - "OBJ_44", - "OBJ_45", - "OBJ_46", - "OBJ_47", - "OBJ_48" - ); - }; "OBJ_4" = { isa = "XCBuildConfiguration"; buildSettings = { @@ -356,45 +347,54 @@ name = "Release"; }; "OBJ_40" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_10"; + isa = "PBXSourcesBuildPhase"; + files = ( + "OBJ_41", + "OBJ_42", + "OBJ_43", + "OBJ_44", + "OBJ_45", + "OBJ_46", + "OBJ_47", + "OBJ_48", + "OBJ_49" + ); }; "OBJ_41" = { isa = "PBXBuildFile"; - fileRef = "OBJ_11"; + fileRef = "OBJ_10"; }; "OBJ_42" = { isa = "PBXBuildFile"; - fileRef = "OBJ_12"; + fileRef = "OBJ_11"; }; "OBJ_43" = { isa = "PBXBuildFile"; - fileRef = "OBJ_13"; + fileRef = "OBJ_12"; }; "OBJ_44" = { isa = "PBXBuildFile"; - fileRef = "OBJ_14"; + fileRef = "OBJ_13"; }; "OBJ_45" = { isa = "PBXBuildFile"; - fileRef = "OBJ_15"; + fileRef = "OBJ_14"; }; "OBJ_46" = { isa = "PBXBuildFile"; - fileRef = "OBJ_16"; + fileRef = "OBJ_15"; }; "OBJ_47" = { isa = "PBXBuildFile"; - fileRef = "OBJ_17"; + fileRef = "OBJ_16"; }; "OBJ_48" = { isa = "PBXBuildFile"; - fileRef = "OBJ_18"; + fileRef = "OBJ_17"; }; "OBJ_49" = { - isa = "PBXFrameworksBuildPhase"; - files = ( - ); + isa = "PBXBuildFile"; + fileRef = "OBJ_18"; }; "OBJ_5" = { isa = "PBXGroup"; @@ -405,21 +405,27 @@ "OBJ_29", "OBJ_32", "OBJ_33", - "OBJ_34" + "OBJ_34", + "OBJ_35" ); path = ""; sourceTree = ""; }; - "OBJ_51" = { + "OBJ_50" = { + isa = "PBXFrameworksBuildPhase"; + files = ( + ); + }; + "OBJ_52" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_52", - "OBJ_53" + "OBJ_53", + "OBJ_54" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_52" = { + "OBJ_53" = { isa = "XCBuildConfiguration"; buildSettings = { LD = "/usr/bin/true"; @@ -439,7 +445,7 @@ }; name = "Debug"; }; - "OBJ_53" = { + "OBJ_54" = { isa = "XCBuildConfiguration"; buildSettings = { LD = "/usr/bin/true"; @@ -459,36 +465,30 @@ }; name = "Release"; }; - "OBJ_54" = { + "OBJ_55" = { isa = "PBXSourcesBuildPhase"; files = ( - "OBJ_55" + "OBJ_56" ); }; - "OBJ_55" = { + "OBJ_56" = { isa = "PBXBuildFile"; fileRef = "OBJ_6"; }; - "OBJ_57" = { + "OBJ_58" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_58", - "OBJ_59" + "OBJ_59", + "OBJ_60" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_58" = { - isa = "XCBuildConfiguration"; - buildSettings = { - }; - name = "Debug"; - }; "OBJ_59" = { isa = "XCBuildConfiguration"; buildSettings = { }; - name = "Release"; + name = "Debug"; }; "OBJ_6" = { isa = "PBXFileReference"; @@ -497,19 +497,25 @@ sourceTree = ""; }; "OBJ_60" = { + isa = "XCBuildConfiguration"; + buildSettings = { + }; + name = "Release"; + }; + "OBJ_61" = { isa = "PBXTargetDependency"; target = "Prelude::PreludeTests"; }; - "OBJ_62" = { + "OBJ_63" = { isa = "XCConfigurationList"; buildConfigurations = ( - "OBJ_63", - "OBJ_64" + "OBJ_64", + "OBJ_65" ); defaultConfigurationIsVisible = "0"; defaultConfigurationName = "Release"; }; - "OBJ_63" = { + "OBJ_64" = { isa = "XCBuildConfiguration"; buildSettings = { CLANG_ENABLE_MODULES = "YES"; @@ -548,7 +554,7 @@ }; name = "Debug"; }; - "OBJ_64" = { + "OBJ_65" = { isa = "XCBuildConfiguration"; buildSettings = { CLANG_ENABLE_MODULES = "YES"; @@ -587,34 +593,30 @@ }; name = "Release"; }; - "OBJ_65" = { + "OBJ_66" = { isa = "PBXSourcesBuildPhase"; files = ( - "OBJ_66", "OBJ_67", "OBJ_68", "OBJ_69", "OBJ_70", "OBJ_71", "OBJ_72", - "OBJ_73" + "OBJ_73", + "OBJ_74" ); }; - "OBJ_66" = { - isa = "PBXBuildFile"; - fileRef = "OBJ_21"; - }; "OBJ_67" = { isa = "PBXBuildFile"; - fileRef = "OBJ_22"; + fileRef = "OBJ_21"; }; "OBJ_68" = { isa = "PBXBuildFile"; - fileRef = "OBJ_23"; + fileRef = "OBJ_22"; }; "OBJ_69" = { isa = "PBXBuildFile"; - fileRef = "OBJ_24"; + fileRef = "OBJ_23"; }; "OBJ_7" = { isa = "PBXGroup"; @@ -627,31 +629,35 @@ }; "OBJ_70" = { isa = "PBXBuildFile"; - fileRef = "OBJ_25"; + fileRef = "OBJ_24"; }; "OBJ_71" = { isa = "PBXBuildFile"; - fileRef = "OBJ_26"; + fileRef = "OBJ_25"; }; "OBJ_72" = { isa = "PBXBuildFile"; - fileRef = "OBJ_27"; + fileRef = "OBJ_26"; }; "OBJ_73" = { isa = "PBXBuildFile"; - fileRef = "OBJ_28"; + fileRef = "OBJ_27"; }; "OBJ_74" = { + isa = "PBXBuildFile"; + fileRef = "OBJ_28"; + }; + "OBJ_75" = { isa = "PBXFrameworksBuildPhase"; files = ( - "OBJ_75" + "OBJ_76" ); }; - "OBJ_75" = { + "OBJ_76" = { isa = "PBXBuildFile"; fileRef = "Prelude::Prelude::Product"; }; - "OBJ_76" = { + "OBJ_77" = { isa = "PBXTargetDependency"; target = "Prelude::Prelude"; }; @@ -680,10 +686,10 @@ }; "Prelude::Prelude" = { isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_36"; + buildConfigurationList = "OBJ_37"; buildPhases = ( - "OBJ_39", - "OBJ_49" + "OBJ_40", + "OBJ_50" ); dependencies = ( ); @@ -699,24 +705,24 @@ }; "Prelude::PreludePackageTests::ProductTarget" = { isa = "PBXAggregateTarget"; - buildConfigurationList = "OBJ_57"; + buildConfigurationList = "OBJ_58"; buildPhases = ( ); dependencies = ( - "OBJ_60" + "OBJ_61" ); name = "PreludePackageTests"; productName = "PreludePackageTests"; }; "Prelude::PreludeTests" = { isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_62"; + buildConfigurationList = "OBJ_63"; buildPhases = ( - "OBJ_65", - "OBJ_74" + "OBJ_66", + "OBJ_75" ); dependencies = ( - "OBJ_76" + "OBJ_77" ); name = "PreludeTests"; productName = "PreludeTests"; @@ -730,9 +736,9 @@ }; "Prelude::SwiftPMPackageDescription" = { isa = "PBXNativeTarget"; - buildConfigurationList = "OBJ_51"; + buildConfigurationList = "OBJ_52"; buildPhases = ( - "OBJ_54" + "OBJ_55" ); dependencies = ( );