From f6d471eaccd7587c410775ad046cc70c0133c55c Mon Sep 17 00:00:00 2001 From: Gary Verhaegen Date: Wed, 13 Apr 2022 16:18:07 +0200 Subject: [PATCH] remove Windows installer (#13586) The installer is now created in the assembly repo. Keeping the code around here is just confusing. Note that this should not impact our ability to publish patch releases on pre-2.0 versions, as all of the files involved are non-yml. CHANGELOG_BEGIN CHANGELOG_END --- ci/copy-windows-release-artifacts.sh | 27 ---------- release/windows-installer/BUILD.bazel | 50 ------------------ release/windows-installer/daml-logo.ico | Bin 32038 -> 0 bytes .../windows-installer/src/WindowsInstaller.hs | 50 ------------------ 4 files changed, 127 deletions(-) delete mode 100644 release/windows-installer/BUILD.bazel delete mode 100644 release/windows-installer/daml-logo.ico delete mode 100644 release/windows-installer/src/WindowsInstaller.hs diff --git a/ci/copy-windows-release-artifacts.sh b/ci/copy-windows-release-artifacts.sh index efec2befac0..4b7706a5e00 100755 --- a/ci/copy-windows-release-artifacts.sh +++ b/ci/copy-windows-release-artifacts.sh @@ -11,33 +11,6 @@ mkdir -p $OUTPUT_DIR/github mkdir -p $OUTPUT_DIR/artifactory mkdir -p $OUTPUT_DIR/split-release -if ! [ "$SPLIT_RELEASE" = "true" ]; then - INSTALLER="$OUTPUT_DIR/github/daml-sdk-$RELEASE_TAG-windows.exe" - EE_INSTALLER="$OUTPUT_DIR/artifactory/daml-sdk-$RELEASE_TAG-windows-ee.exe" - mv "bazel-bin/release/windows-installer/daml-sdk-installer-ce.exe" "$INSTALLER" - mv "bazel-bin/release/windows-installer/daml-sdk-installer-ee.exe" "$EE_INSTALLER" - chmod +wx "$INSTALLER" - chmod +wx "$EE_INSTALLER" - - if ! [ -f /C/Users/u/.dotnet/tools/azuresigntool.exe ]; then - "/C/Program Files/dotnet/dotnet.exe" tool install --global AzureSignTool --version 3.0.0 - fi - - /C/Users/u/.dotnet/tools/azuresigntool.exe sign \ - --azure-key-vault-url "$AZURE_KEY_VAULT_URL" \ - --azure-key-vault-client-id "$AZURE_CLIENT_ID" \ - --azure-key-vault-tenant-id "$AZURE_TENANT_ID" \ - --azure-key-vault-client-secret "$AZURE_CLIENT_SECRET" \ - --azure-key-vault-certificate "$AZURE_KEY_VAULT_CERTIFICATE" \ - --description "Daml SDK installer" \ - --description-url "https://daml.com" \ - --timestamp-rfc3161 "http://timestamp.digicert.com" \ - --file-digest sha384 \ - --verbose \ - "$INSTALLER" \ - "$EE_INSTALLER" -fi - TARBALL=daml-sdk-$RELEASE_TAG-windows.tar.gz EE_TARBALL=daml-sdk-$RELEASE_TAG-windows-ee.tar.gz cp bazel-bin/release/sdk-release-tarball-ce.tar.gz "$OUTPUT_DIR/github/$TARBALL" diff --git a/release/windows-installer/BUILD.bazel b/release/windows-installer/BUILD.bazel deleted file mode 100644 index fb4cc555c39..00000000000 --- a/release/windows-installer/BUILD.bazel +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (c) 2022 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -load("//bazel_tools:haskell.bzl", "da_haskell_binary") -load("@os_info//:os_info.bzl", "is_linux", "is_windows") - -da_haskell_binary( - name = "windows-installer-gen", - srcs = glob(["src/**/*.hs"]), - hackage_deps = [ - "base", - "filepath", - "nsis", - ], - src_strip_prefix = "src", - visibility = ["//visibility:public"], - deps = ["//:sdk-version-hs-lib"], -) - -[ - genrule( - name = "windows-installer-{}".format(edition), - # daml-logo.ico was created with the following command: - # convert \ - # docs/theme/da_theme_skeleton/static/images/favicon/apple-touch-icon.png \ - # -define icon:auto-resize=64,48,32,16 release/windows-installer/daml-logo.ico - srcs = [ - "//release:sdk-release-tarball-{}.tar.gz".format(edition), - ":daml-logo.ico", - ], - outs = ["daml-sdk-installer-{}.exe".format(edition)], - cmd = """ - set -eou pipefail - RELEASE_DIR=$$(mktemp -d) - trap "rm -rf $$RELEASE_DIR" EXIT - tar xf $(location //release:sdk-release-tarball-{edition}.tar.gz) --strip-components=1 -C $$RELEASE_DIR - $(location :windows-installer-gen) ./installer.nsi $$RELEASE_DIR $(location :daml-logo.ico) - $(location @makensis_dev_env//:makensis) ./installer.nsi - cp ./daml-sdk-installer.exe $(location daml-sdk-installer-{edition}.exe) - """.format(edition = edition), - tools = [ - ":windows-installer-gen", - "@makensis_dev_env//:makensis", - ], - ) - for edition in [ - "ce", - "ee", - ] -] if is_windows else None diff --git a/release/windows-installer/daml-logo.ico b/release/windows-installer/daml-logo.ico deleted file mode 100644 index 4580e97ce51a21e3de3058b8ad125bc7f99c1f50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32038 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 FilePath -> Action SectionId -installer sdkDir logo = do - name "Daml SDK" - outFile "daml-sdk-installer.exe" - installIcon (fromString logo) - requestExecutionLevel User - unsafeInjectGlobal "!insertmacro MUI_PAGE_WELCOME" - page InstFiles - page $ Finish finishOptions - { finLinkText = "Open the Daml Quickstart guide" - , finLink = "https://docs.daml.com/getting-started/quickstart.html" - } - section "" [] $ do - -- We use PLUGINSDIR as an easy way to get a temporary directory - -- that nsis will cleanup automatically. - unsafeInject "InitPluginsDir" - iff_ (fileExists "$APPDATA/daml") $ do - answer <- messageBox [MB_YESNO] "Daml SDK is already installed. Do you want to remove the installed SDKs before installing this one?" - iff (answer %== "YES") - (rmdir [Recursive] "$APPDATA/daml") - (abort "Existing installation detected.") - let dir = "$PLUGINSDIR" "daml-sdk-" <> sdkVersion - setOutPath (fromString dir) - file [Recursive] (fromString (sdkDir <> "\\*.*")) - -- install --install-assistant=yes will copy the SDK to the final location. - plugin "nsExec" "ExecToLog" - [ fromString $ unwords - [ "\"" <> dir "daml" "daml.exe\"" - , "install" - , "\"" <> dir <> "\"" - , "--install-assistant=yes" - ] :: Exp String - ]