Skip to content

Commit 27fb577

Browse files
committed
Fix code signing and distribution
1 parent 81ab898 commit 27fb577

File tree

3 files changed

+42
-173
lines changed

3 files changed

+42
-173
lines changed

EnvPane.xcodeproj/project.pbxproj

Lines changed: 39 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@
462462
E2ADE0A208395023000B79B2 /* Project object */ = {
463463
isa = PBXProject;
464464
attributes = {
465+
BuildIndependentTargetsInParallel = YES;
465466
LastUpgradeCheck = 1420;
466467
TargetAttributes = {
467468
D14EB1951E231B6F000BAD4A = {
@@ -625,33 +626,30 @@
625626
47BFFDF108902CAE003DA0CC /* Development */ = {
626627
isa = XCBuildConfiguration;
627628
buildSettings = {
628-
CODE_SIGN_IDENTITY = "Developer ID Application: Hannes Schmidt (4LMPAN643V)";
629+
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
629630
DEAD_CODE_STRIPPING = YES;
631+
"DEVELOPMENT_TEAM[sdk=macosx*]" = "";
632+
ENABLE_HARDENED_RUNTIME = YES;
633+
PRODUCT_BUNDLE_IDENTIFIER = net.hannesschmidt.EnvPane;
630634
PRODUCT_NAME = EnvAgent;
635+
PROVISIONING_PROFILE_SPECIFIER = "";
631636
SKIP_INSTALL = YES;
632637
};
633638
name = Development;
634639
};
635640
47BFFDF208902CAE003DA0CC /* Deployment */ = {
636641
isa = XCBuildConfiguration;
637642
buildSettings = {
638-
CODE_SIGN_IDENTITY = "Developer ID Application: Hannes Schmidt (4LMPAN643V)";
639643
DEAD_CODE_STRIPPING = YES;
644+
"DEVELOPMENT_TEAM[sdk=macosx*]" = 4LMPAN643V;
645+
ENABLE_HARDENED_RUNTIME = YES;
646+
PRODUCT_BUNDLE_IDENTIFIER = net.hannesschmidt.EnvPane;
640647
PRODUCT_NAME = EnvAgent;
648+
PROVISIONING_PROFILE_SPECIFIER = "";
641649
SKIP_INSTALL = YES;
642650
};
643651
name = Deployment;
644652
};
645-
47BFFDF308902CAE003DA0CC /* Default */ = {
646-
isa = XCBuildConfiguration;
647-
buildSettings = {
648-
CODE_SIGN_IDENTITY = "Developer ID Application: Hannes Schmidt (4LMPAN643V)";
649-
DEAD_CODE_STRIPPING = YES;
650-
PRODUCT_NAME = EnvAgent;
651-
SKIP_INSTALL = YES;
652-
};
653-
name = Default;
654-
};
655653
47BFFDF908902CAE003DA0CC /* Development */ = {
656654
isa = XCBuildConfiguration;
657655
buildSettings = {
@@ -667,9 +665,7 @@
667665
CLANG_WARN_EMPTY_BODY = YES;
668666
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
669667
CLANG_WARN_INFINITE_RECURSION = YES;
670-
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
671668
CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
672-
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
673669
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
674670
CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
675671
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
@@ -681,20 +677,19 @@
681677
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
682678
CODE_SIGN_IDENTITY = "Developer ID Application: Hannes Schmidt (4LMPAN643V)";
683679
COPY_PHASE_STRIP = NO;
680+
CURRENT_PROJECT_VERSION = 0.7;
684681
DEAD_CODE_STRIPPING = YES;
685682
ENABLE_STRICT_OBJC_MSGSEND = YES;
686683
ENABLE_TESTABILITY = YES;
687684
GCC_NO_COMMON_BLOCKS = YES;
688685
GCC_OPTIMIZATION_LEVEL = 0;
689686
GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
690-
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = NO;
691687
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
692-
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
693688
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
694689
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
695690
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
696691
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
697-
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
692+
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
698693
GCC_WARN_ABOUT_RETURN_TYPE = YES;
699694
GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
700695
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
@@ -709,19 +704,25 @@
709704
GCC_WARN_UNUSED_LABEL = YES;
710705
GCC_WARN_UNUSED_PARAMETER = NO;
711706
GCC_WARN_UNUSED_VARIABLE = YES;
712-
LIBRARY_SEARCH_PATHS = (
713-
/usr/local/lib,
714-
/opt/homebrew/lib,
715-
);
707+
LIBRARY_SEARCH_PATHS = /opt/homebrew/lib;
716708
MACOSX_DEPLOYMENT_TARGET = 12.4;
709+
MARKETING_VERSION = 0.7;
717710
ONLY_ACTIVE_ARCH = YES;
718711
OTHER_LDFLAGS = "-all_load";
719-
PROVISIONING_PROFILE = "";
720712
USER_HEADER_SEARCH_PATHS = (
721713
"$(launchd_source_dir)/liblaunch",
714+
/opt/homebrew/include,
722715
/usr/local/include,
716+
);
717+
"USER_HEADER_SEARCH_PATHS[arch=arm64]" = (
718+
"$(launchd_source_dir)/liblaunch",
723719
/opt/homebrew/include,
724720
);
721+
"USER_HEADER_SEARCH_PATHS[arch=x86_64]" = (
722+
"$(launchd_source_dir)/liblaunch",
723+
/usr/local/include,
724+
);
725+
VERSIONING_SYSTEM = "apple-generic";
725726
WARNING_CFLAGS = (
726727
"-Wno-gnu",
727728
"-Wno-logical-op-parentheses",
@@ -745,9 +746,7 @@
745746
CLANG_WARN_EMPTY_BODY = YES;
746747
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
747748
CLANG_WARN_INFINITE_RECURSION = YES;
748-
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
749749
CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
750-
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
751750
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
752751
CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
753752
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
@@ -758,17 +757,16 @@
758757
CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
759758
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
760759
CODE_SIGN_IDENTITY = "Developer ID Application: Hannes Schmidt (4LMPAN643V)";
760+
CURRENT_PROJECT_VERSION = 0.7;
761761
DEAD_CODE_STRIPPING = YES;
762762
ENABLE_STRICT_OBJC_MSGSEND = YES;
763763
GCC_NO_COMMON_BLOCKS = YES;
764-
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = NO;
765764
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
766-
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
767765
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
768766
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
769767
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
770768
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
771-
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
769+
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
772770
GCC_WARN_ABOUT_RETURN_TYPE = YES;
773771
GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
774772
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
@@ -783,98 +781,33 @@
783781
GCC_WARN_UNUSED_LABEL = YES;
784782
GCC_WARN_UNUSED_PARAMETER = NO;
785783
GCC_WARN_UNUSED_VARIABLE = YES;
786-
LIBRARY_SEARCH_PATHS = (
787-
/usr/local/lib,
788-
/opt/homebrew/lib,
789-
);
784+
LIBRARY_SEARCH_PATHS = /opt/homebrew/lib;
785+
"LIBRARY_SEARCH_PATHS[arch=arm64]" = /opt/homebrew/lib;
786+
"LIBRARY_SEARCH_PATHS[arch=x86_64]" = /usr/local/lib;
790787
MACOSX_DEPLOYMENT_TARGET = 12.4;
788+
MARKETING_VERSION = 0.7;
791789
OTHER_LDFLAGS = "-all_load";
792-
PROVISIONING_PROFILE = "";
793790
USER_HEADER_SEARCH_PATHS = (
794791
"$(launchd_source_dir)/liblaunch",
795-
/usr/local/include,
796792
/opt/homebrew/include,
793+
/usr/local/include,
797794
);
798-
WARNING_CFLAGS = (
799-
"-Wno-gnu",
800-
"-Wno-logical-op-parentheses",
801-
);
802-
launchd_source_dir = "$(SRCROOT)/../launchd-442.26.2";
803-
};
804-
name = Deployment;
805-
};
806-
47BFFDFB08902CAE003DA0CC /* Default */ = {
807-
isa = XCBuildConfiguration;
808-
buildSettings = {
809-
ALWAYS_SEARCH_USER_PATHS = NO;
810-
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
811-
CLANG_ENABLE_OBJC_ARC = YES;
812-
CLANG_LINK_OBJC_RUNTIME = NO;
813-
CLANG_WARN_ASSIGN_ENUM = YES;
814-
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
815-
CLANG_WARN_COMMA = YES;
816-
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
817-
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
818-
CLANG_WARN_EMPTY_BODY = YES;
819-
CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES;
820-
CLANG_WARN_INFINITE_RECURSION = YES;
821-
CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = NO;
822-
CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
823-
CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = NO;
824-
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
825-
CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES;
826-
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
827-
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
828-
CLANG_WARN_STRICT_PROTOTYPES = YES;
829-
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
830-
CLANG_WARN_SUSPICIOUS_MOVE = YES;
831-
CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
832-
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
833-
CODE_SIGN_IDENTITY = "Developer ID Application: Hannes Schmidt (4LMPAN643V)";
834-
DEAD_CODE_STRIPPING = YES;
835-
ENABLE_STRICT_OBJC_MSGSEND = YES;
836-
GCC_NO_COMMON_BLOCKS = YES;
837-
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = NO;
838-
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
839-
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
840-
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
841-
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
842-
GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
843-
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
844-
GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
845-
GCC_WARN_ABOUT_RETURN_TYPE = YES;
846-
GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
847-
GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
848-
GCC_WARN_PEDANTIC = YES;
849-
GCC_WARN_SHADOW = YES;
850-
GCC_WARN_SIGN_COMPARE = YES;
851-
GCC_WARN_STRICT_SELECTOR_MATCH = YES;
852-
GCC_WARN_UNDECLARED_SELECTOR = YES;
853-
GCC_WARN_UNINITIALIZED_AUTOS = YES;
854-
GCC_WARN_UNKNOWN_PRAGMAS = YES;
855-
GCC_WARN_UNUSED_FUNCTION = YES;
856-
GCC_WARN_UNUSED_LABEL = YES;
857-
GCC_WARN_UNUSED_PARAMETER = NO;
858-
GCC_WARN_UNUSED_VARIABLE = YES;
859-
LIBRARY_SEARCH_PATHS = (
860-
/usr/local/lib,
861-
/opt/homebrew/lib,
795+
"USER_HEADER_SEARCH_PATHS[arch=arm64]" = (
796+
"$(launchd_source_dir)/liblaunch",
797+
/opt/homebrew/include,
862798
);
863-
MACOSX_DEPLOYMENT_TARGET = 12.4;
864-
OTHER_LDFLAGS = "-all_load";
865-
PROVISIONING_PROFILE = "";
866-
USER_HEADER_SEARCH_PATHS = (
799+
"USER_HEADER_SEARCH_PATHS[arch=x86_64]" = (
867800
"$(launchd_source_dir)/liblaunch",
868801
/usr/local/include,
869-
/opt/homebrew/include,
870802
);
803+
VERSIONING_SYSTEM = "apple-generic";
871804
WARNING_CFLAGS = (
872805
"-Wno-gnu",
873806
"-Wno-logical-op-parentheses",
874807
);
875808
launchd_source_dir = "$(SRCROOT)/../launchd-442.26.2";
876809
};
877-
name = Default;
810+
name = Deployment;
878811
};
879812
D14EB19E1E231B6F000BAD4A /* Development */ = {
880813
isa = XCBuildConfiguration;
@@ -915,36 +848,14 @@
915848
};
916849
name = Deployment;
917850
};
918-
D14EB1A01E231B6F000BAD4A /* Default */ = {
919-
isa = XCBuildConfiguration;
920-
buildSettings = {
921-
COMBINE_HIDPI_IMAGES = YES;
922-
COPY_PHASE_STRIP = NO;
923-
DEAD_CODE_STRIPPING = YES;
924-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
925-
INFOPLIST_FILE = Tests/Info.plist;
926-
LD_RUNPATH_SEARCH_PATHS = (
927-
"$(inherited)",
928-
"@executable_path/../Frameworks",
929-
"@loader_path/../Frameworks",
930-
);
931-
MTL_ENABLE_DEBUG_INFO = NO;
932-
PRODUCT_BUNDLE_IDENTIFIER = net.hannesschmidt.Tests;
933-
PRODUCT_NAME = "$(TARGET_NAME)";
934-
};
935-
name = Default;
936-
};
937851
D19BDB761671286100C6467B /* Development */ = {
938852
isa = XCBuildConfiguration;
939853
buildSettings = {
940-
CODE_SIGN_IDENTITY = "Developer ID Application: Hannes Schmidt (4LMPAN643V)";
941854
COMBINE_HIDPI_IMAGES = YES;
942855
DEAD_CODE_STRIPPING = YES;
943856
DEPLOYMENT_LOCATION = YES;
857+
DEVELOPMENT_ASSET_PATHS = "";
944858
DSTROOT = /;
945-
GCC_PRECOMPILE_PREFIX_HEADER = YES;
946-
GCC_PREFIX_HEADER = "EnvPane/EnvPane-Prefix.pch";
947-
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
948859
INFOPLIST_FILE = "EnvPane/EnvPane-Info.plist";
949860
INSTALL_PATH = "$(HOME)/Library/PreferencePanes";
950861
OTHER_LDFLAGS = (
@@ -960,12 +871,10 @@
960871
D19BDB771671286100C6467B /* Deployment */ = {
961872
isa = XCBuildConfiguration;
962873
buildSettings = {
963-
CODE_SIGN_IDENTITY = "Developer ID Application: Hannes Schmidt (4LMPAN643V)";
964874
COMBINE_HIDPI_IMAGES = YES;
965875
DEAD_CODE_STRIPPING = YES;
966-
GCC_PRECOMPILE_PREFIX_HEADER = YES;
967-
GCC_PREFIX_HEADER = "EnvPane/EnvPane-Prefix.pch";
968-
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
876+
DEVELOPMENT_ASSET_PATHS = "";
877+
"DEVELOPMENT_TEAM[sdk=macosx*]" = 4LMPAN643V;
969878
INFOPLIST_FILE = "EnvPane/EnvPane-Info.plist";
970879
INSTALL_PATH = /;
971880
OTHER_LDFLAGS = (
@@ -979,27 +888,6 @@
979888
};
980889
name = Deployment;
981890
};
982-
D19BDB781671286100C6467B /* Default */ = {
983-
isa = XCBuildConfiguration;
984-
buildSettings = {
985-
CODE_SIGN_IDENTITY = "Developer ID Application: Hannes Schmidt (4LMPAN643V)";
986-
COMBINE_HIDPI_IMAGES = YES;
987-
DEAD_CODE_STRIPPING = YES;
988-
GCC_PRECOMPILE_PREFIX_HEADER = YES;
989-
GCC_PREFIX_HEADER = "EnvPane/EnvPane-Prefix.pch";
990-
GCC_TREAT_WARNINGS_AS_ERRORS = NO;
991-
INFOPLIST_FILE = "EnvPane/EnvPane-Info.plist";
992-
INSTALL_PATH = /;
993-
OTHER_LDFLAGS = (
994-
"-lmarkdown",
995-
"$(inherited)",
996-
);
997-
PRODUCT_BUNDLE_IDENTIFIER = net.hannesschmidt.EnvPane;
998-
PRODUCT_NAME = EnvPane;
999-
WRAPPER_EXTENSION = prefPane;
1000-
};
1001-
name = Default;
1002-
};
1003891
D1C85DB0167FC18B007C2CE7 /* Development */ = {
1004892
isa = XCBuildConfiguration;
1005893
buildSettings = {
@@ -1024,18 +912,6 @@
1024912
};
1025913
name = Deployment;
1026914
};
1027-
D1C85DB2167FC18B007C2CE7 /* Default */ = {
1028-
isa = XCBuildConfiguration;
1029-
buildSettings = {
1030-
COMBINE_HIDPI_IMAGES = YES;
1031-
DEAD_CODE_STRIPPING = YES;
1032-
EXECUTABLE_PREFIX = lib;
1033-
PRODUCT_NAME = EnvLib;
1034-
SKIP_INSTALL = YES;
1035-
launchd_source_dir = "$(SRCROOT)/../launchd";
1036-
};
1037-
name = Default;
1038-
};
1039915
/* End XCBuildConfiguration section */
1040916

1041917
/* Begin XCConfigurationList section */
@@ -1044,7 +920,6 @@
1044920
buildConfigurations = (
1045921
47BFFDF108902CAE003DA0CC /* Development */,
1046922
47BFFDF208902CAE003DA0CC /* Deployment */,
1047-
47BFFDF308902CAE003DA0CC /* Default */,
1048923
);
1049924
defaultConfigurationIsVisible = 0;
1050925
defaultConfigurationName = Deployment;
@@ -1054,7 +929,6 @@
1054929
buildConfigurations = (
1055930
47BFFDF908902CAE003DA0CC /* Development */,
1056931
47BFFDFA08902CAE003DA0CC /* Deployment */,
1057-
47BFFDFB08902CAE003DA0CC /* Default */,
1058932
);
1059933
defaultConfigurationIsVisible = 0;
1060934
defaultConfigurationName = Deployment;
@@ -1064,7 +938,6 @@
1064938
buildConfigurations = (
1065939
D14EB19E1E231B6F000BAD4A /* Development */,
1066940
D14EB19F1E231B6F000BAD4A /* Deployment */,
1067-
D14EB1A01E231B6F000BAD4A /* Default */,
1068941
);
1069942
defaultConfigurationIsVisible = 0;
1070943
defaultConfigurationName = Deployment;
@@ -1074,7 +947,6 @@
1074947
buildConfigurations = (
1075948
D19BDB761671286100C6467B /* Development */,
1076949
D19BDB771671286100C6467B /* Deployment */,
1077-
D19BDB781671286100C6467B /* Default */,
1078950
);
1079951
defaultConfigurationIsVisible = 0;
1080952
defaultConfigurationName = Deployment;
@@ -1084,7 +956,6 @@
1084956
buildConfigurations = (
1085957
D1C85DB0167FC18B007C2CE7 /* Development */,
1086958
D1C85DB1167FC18B007C2CE7 /* Deployment */,
1087-
D1C85DB2167FC18B007C2CE7 /* Default */,
1088959
);
1089960
defaultConfigurationIsVisible = 0;
1090961
defaultConfigurationName = Deployment;

0 commit comments

Comments
 (0)