Skip to content

Commit

Permalink
Update minimum supported macOS version
Browse files Browse the repository at this point in the history
WE2-823

Signed-off-by: Raul Metsma <[email protected]>
  • Loading branch information
metsma authored and mrts committed Sep 29, 2023
1 parent 4a2d4e0 commit 82a1fdd
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 104 deletions.
3 changes: 1 addition & 2 deletions install/English.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"SU_TITLE" = "Web eID Software";
"SU_ERROR" = "Error";
"SU_1013" = "macOS version needs to be 10.13 or newer.";
"SU_11" = "macOS version needs to be 11.0 or newer.";
"SU_BASE" = "Base components";
"SU_FIREFOX" = "Firefox authentication and signing support";
"SU_CHROME" = "Chrome authentication and signing support";
"SU_CHROME_POLICY" = "Chrome extension will be activated automatically";
3 changes: 1 addition & 2 deletions install/cs.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"SU_TITLE" = "Web eID Software";
"SU_ERROR" = "Chyba";
"SU_1013" = "verze macOS musí být 10.13 nebo novější.";
"SU_11" = "verze macOS musí být 11.0 nebo novější.";
"SU_BASE" = "Základní komponenty";
"SU_FIREFOX" = "Podpora ověřování a podepisování Firefoxu";
"SU_CHROME" = "Podpora ověřování a podepisování Chrome";
"SU_CHROME_POLICY" = "Rozšíření pro Chrome bude aktivováno automaticky";
24 changes: 3 additions & 21 deletions install/distribution.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I
<allowed-os-versions>
<os-version min="10.10"/>
</allowed-os-versions>
<options customize="allow" require-scripts="false" rootVolumeOnly="true" hostArchitectures="x86_64"/>
<options customize="allow" require-scripts="false" rootVolumeOnly="true" hostArchitectures="arm64,x86_64"/>
<!--domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true"/-->
<background file="background.png" alignment="center" mime-type="image/png" scaling="tofit" />
<welcome file="Welcome.html" mime-type="text/html"/>
Expand All @@ -17,9 +17,9 @@ https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/I
<script>
<![CDATA[
function pm_install_check() {
if(system.compareVersions(system.version.ProductVersion, '10.13.0') < 0) {
if(system.compareVersions(system.version.ProductVersion, '10.16.0') < 0) {
my.result.title = system.localizedString('SU_ERROR');
my.result.message = system.localizedString('SU_1013');
my.result.message = system.localizedString('SU_11');
my.result.type = 'Fatal';
return false;
}
Expand All @@ -35,22 +35,12 @@ function pm_chrome_selected() {
return my.target.receiptForIdentifier("eu.web-eid.web-eid") == null ||
my.target.receiptForIdentifier("eu.web-eid.web-eid-chrome") != null;
}
function pm_chrome_policy_visible() {
return system.compareVersions(system.version.ProductVersion, '10.16') < 0;
}
function pm_chrome_policy_selected() {
return pm_chrome_policy_visible() && pm_chrome_selected() &&
my.target.receiptForIdentifier("eu.web-eid.web-eid-chrome-policy") != null;
}
]]>
</script>
<choices-outline>
<line choice="default"/>
<line choice="firefox"/>
<line choice="chrome"/>
<line choice="chrome_policy"/>
</choices-outline>
<choice id="default" title="SU_BASE" start_enabled="false" visible="false">
<pkg-ref id="eu.web-eid.web-eid">web-eid-native.pkg</pkg-ref>
Expand All @@ -61,12 +51,4 @@ function pm_chrome_policy_selected() {
<choice id="chrome" title="SU_CHROME" description="SU_CHROME" start_selected="pm_chrome_selected()">
<pkg-ref id="eu.web-eid.web-eid-chrome">web-eid-chrome.pkg</pkg-ref>
</choice>
<choice id="chrome_policy" title="SU_CHROME_POLICY" description="SU_CHROME_POLICY"
start_selected="pm_chrome_policy_selected()"
start_enabled="pm_chrome_selected()"
start_visible="pm_chrome_policy_visible()"
enabled="choices.chrome.selected"
selected="choices.chrome.selected ? choices.chrome_policy.selected : false">
<pkg-ref id="eu.web-eid.web-eid-chrome-policy">web-eid-chrome-policy.pkg</pkg-ref>
</choice>
</installer-gui-script>
3 changes: 1 addition & 2 deletions install/et.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"SU_TITLE" = "Web eID tarkvara";
"SU_ERROR" = "Viga";
"SU_1013" = "macOS'i versioon peab olema 10.13 või uuem.";
"SU_11" = "macOS'i versioon peab olema 11.0 või uuem.";
"SU_BASE" = "Baaskomponendid";
"SU_FIREFOX" = "Firefoxi autentimise ja allkirjastamise tugi";
"SU_CHROME" = "Chrome'i autentimise ja allkirjastamise tugi";
"SU_CHROME_POLICY" = "Chrome laiendus aktiveeritakse automaatselt";
57 changes: 0 additions & 57 deletions install/macos-chrome-policy.plist

This file was deleted.

3 changes: 0 additions & 3 deletions install/macos-postinstall-chrome-policy

This file was deleted.

3 changes: 1 addition & 2 deletions install/ru.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"SU_TITLE" = "Web eID Software";
"SU_ERROR" = "Error";
"SU_1013" = "macOS version needs to be 10.13 or newer.";
"SU_11" = "macOS version needs to be 11.0 or newer.";
"SU_BASE" = "Base components";
"SU_FIREFOX" = "Поддержка аутентиф. и подпис. в Firefox";
"SU_CHROME" = "Поддержка аутентиф. и подпис. в Chrome";
"SU_CHROME_POLICY" = "Плагин для Chrome активируется автоматически";
3 changes: 1 addition & 2 deletions install/sk.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"SU_TITLE" = "Web eID Software";
"SU_ERROR" = "Chyba";
"SU_1013" = "verzia macOS musí byť 10.13 alebo novšia.";
"SU_11" = "verzia macOS musí byť 11.0 alebo novšia.";
"SU_BASE" = "Základné komponenty";
"SU_FIREFOX" = "Podpora overovania a podpisovania Firefoxu";
"SU_CHROME" = "Podpora overovania a podpisovania Chrome";
"SU_CHROME_POLICY" = "Rozšírenie pre Chrome bude aktivované automaticky";
14 changes: 1 addition & 13 deletions src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,22 +118,10 @@ elseif(APPLE)
--version "${PROJECT_VERSION}" $<TARGET_NAME:web-eid>-chrome_${PROJECT_VERSION}.pkg
COMMAND_EXPAND_LISTS
)
add_custom_target(installer-chrome-policy
COMMAND rm -rf root_chrome_policy root_chrome_policy_scripts
COMMAND mkdir -p root_chrome_policy root_chrome_policy_scripts
COMMAND cp ${CMAKE_SOURCE_DIR}/install/macos-chrome-policy.plist root_chrome_policy_scripts/chrome-policy.plist
COMMAND cp ${CMAKE_SOURCE_DIR}/install/macos-postinstall-chrome-policy root_chrome_policy_scripts/postinstall
COMMAND /bin/sh -c "\"$<$<BOOL:${SIGNCERT}>:security;cms;-S;-N;Developer ID Application: ${SIGNCERT};-i;${CMAKE_SOURCE_DIR}/install/macos-chrome-policy.plist;-o;root_chrome_policy_scripts/chrome-policy.plist>\""
COMMAND pkgbuild --root root_chrome_policy --scripts root_chrome_policy_scripts --identifier "eu.web-eid.$<TARGET_NAME:web-eid>-chrome-policy"
"$<$<BOOL:${SIGNCERT}>:--sign;${SIGNCERT}>"
--version "${PROJECT_VERSION}" $<TARGET_NAME:web-eid>-chrome-policy_${PROJECT_VERSION}.pkg
COMMAND_EXPAND_LISTS
)
add_custom_target(installer DEPENDS installer-chrome installer-chrome-policy installer-firefox
add_custom_target(installer DEPENDS installer-chrome installer-firefox
COMMAND mkdir -p packages
COMMAND cp web-eid-native_*.pkg packages/web-eid-native.pkg
COMMAND cp web-eid-chrome_*.pkg packages/web-eid-chrome.pkg
COMMAND cp web-eid-chrome-policy_*.pkg packages/web-eid-chrome-policy.pkg
COMMAND cp web-eid-firefox_*.pkg packages/web-eid-firefox.pkg
COMMAND productbuild --distribution ${CMAKE_SOURCE_DIR}/install/distribution.xml
"$<$<BOOL:${SIGNCERT}>:--sign;Developer ID Installer: ${SIGNCERT}>" --resources ${CMAKE_SOURCE_DIR}/install/
Expand Down

0 comments on commit 82a1fdd

Please sign in to comment.