diff options
Diffstat (limited to 'src/etc')
| -rwxr-xr-x | src/etc/generate-deriving-span-tests.py | 2 | ||||
| -rw-r--r-- | src/etc/installer/exe/rust.iss | 6 | ||||
| -rw-r--r-- | src/etc/installer/msi/rust.wxs | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/etc/generate-deriving-span-tests.py b/src/etc/generate-deriving-span-tests.py index 1c525101c76..66a3c8e5554 100755 --- a/src/etc/generate-deriving-span-tests.py +++ b/src/etc/generate-deriving-span-tests.py @@ -14,6 +14,8 @@ TEST_DIR = os.path.abspath( os.path.join(os.path.dirname(__file__), '../test/ui/derives/')) TEMPLATE = """\ +// ignore-x86 +// ^ due to stderr output differences // This file was auto-generated using 'src/etc/generate-deriving-span-tests.py' {error_deriving} diff --git a/src/etc/installer/exe/rust.iss b/src/etc/installer/exe/rust.iss index c22d60b6c5d..70648beac38 100644 --- a/src/etc/installer/exe/rust.iss +++ b/src/etc/installer/exe/rust.iss @@ -25,9 +25,9 @@ SourceDir=.\ OutputBaseFilename={#CFG_PACKAGE_NAME}-{#CFG_BUILD} DefaultDirName={sd}\Rust -Compression=lzma2/ultra -InternalCompressLevel=ultra -SolidCompression=true +Compression=lzma2/normal +InternalCompressLevel=normal +SolidCompression=no ChangesEnvironment=true ChangesAssociations=no diff --git a/src/etc/installer/msi/rust.wxs b/src/etc/installer/msi/rust.wxs index a471ccc6f5b..a2e378f7b1d 100644 --- a/src/etc/installer/msi/rust.wxs +++ b/src/etc/installer/msi/rust.wxs @@ -152,7 +152,7 @@ </Upgrade> <!-- Specifies a single cab file to be embedded in the installer's .msi. --> - <MediaTemplate EmbedCab="yes" CompressionLevel="high" /> + <MediaTemplate EmbedCab="yes" CompressionLevel="mszip" /> <!-- Send a WM_SETTINGCHANGE message to tell processes like explorer to update their environments so any new command prompts get the updated %PATH% --> |
