Skip to content

Commit

Permalink
Claim version 5.1.17 for Mac viewer
Browse files Browse the repository at this point in the history
  • Loading branch information
@tocharl
tocharl committed Jan 30, 2024
1 parent a611c55 commit 3af65c1
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 22 deletions.
48 changes: 27 additions & 21 deletions beidmw.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@
65270A7A1FE97A2B004F326D /* genderconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65270A591FE97A29004F326D /* genderconv.cpp */; };
65270A7C1FE97A2B004F326D /* natnumconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65270A5B1FE97A2A004F326D /* natnumconv.cpp */; };
65270A821FE97A2B004F326D /* convert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65270A611FE97A2A004F326D /* convert.cpp */; };
65270A881FE97E7D004F326D /* libbeidpkcs11.5.1.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FA1A9F70F85F36E000D9EE1 /* libbeidpkcs11.5.1.6.dylib */; };
65270A881FE97E7D004F326D /* libbeidpkcs11.5.1.17.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FA1A9F70F85F36E000D9EE1 /* libbeidpkcs11.5.1.17.dylib */; };
65270A8A1FE97E97004F326D /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 65270A891FE97E97004F326D /* libcrypto.a */; };
65270A8C1FE97EBD004F326D /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 65270A8B1FE97EBD004F326D /* libxml2.a */; };
65314FBC2080E9E10079D0B0 /* workpermitconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 65314FB72080E9E10079D0B0 /* workpermitconv.cpp */; };
65314FBD2080E9E20079D0B0 /* workpermitconv.h in Headers */ = {isa = PBXBuildFile; fileRef = 65314FBB2080E9E10079D0B0 /* workpermitconv.h */; };
653490F01FEA75FE000F7787 /* libbeidpkcs11.5.1.6.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7FA1A9F70F85F36E000D9EE1 /* libbeidpkcs11.5.1.6.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
653490F01FEA75FE000F7787 /* libbeidpkcs11.5.1.17.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7FA1A9F70F85F36E000D9EE1 /* libbeidpkcs11.5.1.17.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
6536232519A7E92B00D46ECB /* decode_photo.c in Sources */ = {isa = PBXBuildFile; fileRef = 6536230D19A7E92B00D46ECB /* decode_photo.c */; };
6536232619A7E92B00D46ECB /* digest.c in Sources */ = {isa = PBXBuildFile; fileRef = 6536230E19A7E92B00D46ECB /* digest.c */; };
6536232719A7E92B00D46ECB /* double_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 6536230F19A7E92B00D46ECB /* double_init.c */; };
Expand All @@ -89,7 +89,7 @@
6536233A19A7E92B00D46ECB /* threads.c in Sources */ = {isa = PBXBuildFile; fileRef = 6536232319A7E92B00D46ECB /* threads.c */; };
6536233B19A7E92B00D46ECB /* tkinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 6536232419A7E92B00D46ECB /* tkinfo.c */; };
6536233D19A7E93A00D46ECB /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 6536233C19A7E93A00D46ECB /* main.c */; };
65388A341A94A7F3007EBD2D /* libbeidpkcs11.5.1.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FA1A9F70F85F36E000D9EE1 /* libbeidpkcs11.5.1.6.dylib */; };
65388A341A94A7F3007EBD2D /* libbeidpkcs11.5.1.17.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FA1A9F70F85F36E000D9EE1 /* libbeidpkcs11.5.1.17.dylib */; };
6578015620D1364A002B826A /* xmlfileversconv.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6578015320D135F4002B826A /* xmlfileversconv.cpp */; };
659FD5851FEA867600E4AF83 /* BeidView.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 652709FA1FE975A1004F326D /* BeidView.framework */; };
659FD5861FEA867600E4AF83 /* BeidView.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 652709FA1FE975A1004F326D /* BeidView.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
Expand Down Expand Up @@ -262,7 +262,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
653490F01FEA75FE000F7787 /* libbeidpkcs11.5.1.6.dylib in CopyFiles */,
653490F01FEA75FE000F7787 /* libbeidpkcs11.5.1.17.dylib in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -471,7 +471,7 @@
7F9011190F8502F8004A5FCC /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; };
7F90111C0F850342004A5FCC /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = /usr/lib/libssl.dylib; sourceTree = "<absolute>"; };
7F90112C0F850450004A5FCC /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
7FA1A9F70F85F36E000D9EE1 /* libbeidpkcs11.5.1.6.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libbeidpkcs11.5.1.6.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
7FA1A9F70F85F36E000D9EE1 /* libbeidpkcs11.5.1.17.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libbeidpkcs11.5.1.17.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
86BC84C01A037C19009E374E /* test_dialogs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = test_dialogs.xcodeproj; path = tests/dialogs/test_dialogs.xcodeproj; sourceTree = "<group>"; };
86C0E72721C2586E00602028 /* tlvbuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tlvbuffer.h; sourceTree = "<group>"; };
86C0E72821C2586E00602028 /* eiderrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eiderrors.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -588,7 +588,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
65270A881FE97E7D004F326D /* libbeidpkcs11.5.1.6.dylib in Frameworks */,
65270A881FE97E7D004F326D /* libbeidpkcs11.5.1.17.dylib in Frameworks */,
65270A8A1FE97E97004F326D /* libcrypto.a in Frameworks */,
65270A8C1FE97EBD004F326D /* libxml2.a in Frameworks */,
);
Expand All @@ -598,7 +598,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
65388A341A94A7F3007EBD2D /* libbeidpkcs11.5.1.6.dylib in Frameworks */,
65388A341A94A7F3007EBD2D /* libbeidpkcs11.5.1.17.dylib in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -617,7 +617,7 @@
034768DDFF38A45A11DB9C8B /* Products */ = {
isa = PBXGroup;
children = (
7FA1A9F70F85F36E000D9EE1 /* libbeidpkcs11.5.1.6.dylib */,
7FA1A9F70F85F36E000D9EE1 /* libbeidpkcs11.5.1.17.dylib */,
6536230219A7E8E600D46ECB /* testsuite */,
652709FA1FE975A1004F326D /* BeidView.framework */,
651DDF291FEA843C00C4961E /* eID Viewer.app */,
Expand Down Expand Up @@ -1209,7 +1209,7 @@
);
name = beidpkcs11;
productName = beidpkcs11;
productReference = 7FA1A9F70F85F36E000D9EE1 /* libbeidpkcs11.5.1.6.dylib */;
productReference = 7FA1A9F70F85F36E000D9EE1 /* libbeidpkcs11.5.1.17.dylib */;
productType = "com.apple.product-type.library.dynamic";
};
/* End PBXNativeTarget section */
Expand Down Expand Up @@ -1564,7 +1564,7 @@
CODE_SIGN_IDENTITY = "-";
CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 5.1.6;
CURRENT_PROJECT_VERSION = 5.1.17;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = EU27N85PBZ;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -1629,7 +1629,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
CURRENT_PROJECT_VERSION = 5.1.6;
CURRENT_PROJECT_VERSION = 5.1.17;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = EU27N85PBZ;
Expand Down Expand Up @@ -1701,7 +1701,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 5.1.6;
CURRENT_PROJECT_VERSION = 5.1.17;
DEVELOPMENT_TEAM = EU27N85PBZ;
ENABLE_HARDENED_RUNTIME = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -1733,8 +1733,8 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
MARKETING_VERSION = 5.1.6;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 5.1.17;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "be.fedict.eID-Viewer";
Expand Down Expand Up @@ -1777,7 +1777,7 @@
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 5.1.6;
CURRENT_PROJECT_VERSION = 5.1.17;
DEVELOPMENT_TEAM = EU27N85PBZ;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_NS_ASSERTIONS = NO;
Expand All @@ -1804,8 +1804,8 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
MARKETING_VERSION = 5.1.6;
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 5.1.17;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_CODE_SIGN_FLAGS = "--timestamp";
PRODUCT_BUNDLE_IDENTIFIER = "be.fedict.eID-Viewer";
Expand Down Expand Up @@ -1856,7 +1856,7 @@
"$(PROJECT_DIR)/plugins_tools/eid-viewer/OSX/support/ossl/openssl-combined",
"$(PROJECT_DIR)/plugins_tools/eid-viewer/OSX/support/xml/builddir",
);
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.13;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = be.fedict.BeidView;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -1908,7 +1908,7 @@
"$(PROJECT_DIR)/plugins_tools/eid-viewer/OSX/support/ossl/openssl-combined",
"$(PROJECT_DIR)/plugins_tools/eid-viewer/OSX/support/xml/builddir",
);
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.13;
OTHER_CODE_SIGN_FLAGS = "--timestamp";
PRODUCT_BUNDLE_IDENTIFIER = be.fedict.BeidView;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1935,6 +1935,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5.1.17;
DEVELOPMENT_TEAM = EU27N85PBZ;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
Expand All @@ -1954,7 +1955,7 @@
doc/sdk/include/v240,
plugins_tools/util,
);
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
};
Expand All @@ -1977,6 +1978,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 5.1.17;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = EU27N85PBZ;
ENABLE_NS_ASSERTIONS = NO;
Expand All @@ -1995,7 +1997,7 @@
doc/sdk/include/v240,
plugins_tools/util,
);
MACOSX_DEPLOYMENT_TARGET = 10.9;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
};
Expand All @@ -2009,6 +2011,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 5.1.17;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = EU27N85PBZ;
DYLIB_COMPATIBILITY_VERSION = "";
Expand Down Expand Up @@ -2039,6 +2042,7 @@
INSTALL_PATH = /usr/local/lib;
LINKER_DISPLAYS_MANGLED_NAMES = YES;
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.13;
OTHER_CFLAGS = "-fno-strict-aliasing";
PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
PRODUCT_NAME = "beidpkcs11.$(CURRENT_PROJECT_VERSION)";
Expand All @@ -2057,6 +2061,7 @@
CODE_SIGN_IDENTITY = "Mac Developer";
CODE_SIGN_STYLE = Automatic;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 5.1.17;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = EU27N85PBZ;
DYLIB_COMPATIBILITY_VERSION = "";
Expand All @@ -2082,6 +2087,7 @@
);
INSTALL_PATH = /usr/local/lib;
MACH_O_TYPE = mh_dylib;
MACOSX_DEPLOYMENT_TARGET = 10.13;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = "-fno-strict-aliasing";
OTHER_CODE_SIGN_FLAGS = "--timestamp";
Expand Down
2 changes: 1 addition & 1 deletion scripts/mac/set_eidmw_version.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

BASE_VERSION1=5
BASE_VERSION2=1
BASE_VERSION3=6
BASE_VERSION3=17

MWVER1=$BASE_VERSION1
MWVER2="$BASE_VERSION1.$BASE_VERSION2"
Expand Down

0 comments on commit 3af65c1

Please sign in to comment.