зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 6 changesets (bug 1514806) for causing windows 2012 opt repack bustages.
Backed out changeset 63debb1d02d3 (bug 1514806) Backed out changeset 803d20ba3f80 (bug 1514806) Backed out changeset 3b95c5d8466d (bug 1514806) Backed out changeset eb09e108a439 (bug 1514806) Backed out changeset 6a738993de29 (bug 1514806) Backed out changeset 303b19a8b923 (bug 1514806) --HG-- rename : other-licenses/7zstub/firefox/7zSD.win32.manifest => other-licenses/7zstub/firefox/7zSD.manifest rename : other-licenses/7zstub/firefox/7zSD.Win32.sfx => other-licenses/7zstub/firefox/7zSD.sfx
This commit is contained in:
Cosmin Sabou
Родитель
0b0be9c1f9
Коммит
1558607307
|
|
@ -5,11 +5,7 @@
|
|||
include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
|
||||
|
||||
CONFIG_DIR = instgen
|
||||
ifeq ($(CPU_ARCH), aarch64)
|
||||
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.ARM64.sfx
|
||||
else
|
||||
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.Win32.sfx
|
||||
endif
|
||||
SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
|
||||
|
||||
INSTALLER_FILES = \
|
||||
app.tag \
|
||||
|
|
|
|||
|
|
@ -37,11 +37,7 @@ MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
|
|||
MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
|
||||
endif
|
||||
|
||||
ifeq ($(CPU_ARCH), aarch64)
|
||||
MOZ_SFX_PACKAGE=$(topsrcdir)/other-licenses/7zstub/firefox/7zSD.ARM64.sfx
|
||||
else
|
||||
MOZ_SFX_PACKAGE=$(topsrcdir)/other-licenses/7zstub/firefox/7zSD.Win32.sfx
|
||||
endif
|
||||
MOZ_SFX_PACKAGE=$(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx
|
||||
|
||||
# Required for l10n.mk - defines a list of app sub dirs that should
|
||||
# be included in langpack xpis.
|
||||
|
|
|
|||
|
|
@ -9,55 +9,54 @@ modifications have been made to this copy of the source code. Those
|
|||
modifications are contained in mozilla_customizations.diff, which should be
|
||||
found in the same directory as this file.
|
||||
|
||||
The firefox/ directory contains several things:
|
||||
* SFXSetup.sln and SFXSetup.vcxproj
|
||||
These are Visual Studio 2017 conversions of the Visual C++ 6 workspace and
|
||||
project files from the src/CPP/7zip/Bundles/SFXSetup/ directory, with
|
||||
some changes and additions to support AArch64 and to include our resources.
|
||||
* 7zSD.arm64.manifest and 7zSD.win32.manifest
|
||||
We need to add a manifest file to the binary for several reasons, and one
|
||||
isn't supplied with the source package (Visual C++ 6 doesn't support them),
|
||||
so we've written our own.
|
||||
* setup.ico
|
||||
The icon group used for the installer package.
|
||||
* resource.rc
|
||||
The resource script containing the above manifest and icon references, as
|
||||
well as other resources we need. This is derived from the supplied SFXSetup
|
||||
resource.rc, but heavily customized.
|
||||
* 7zSD.ARM64.sfx
|
||||
AArch64 binary built using all the above files. Checking this into the tree in
|
||||
compiled binary form means that packaging the installer does not require
|
||||
having a compiler toolchain configured (which is the case for artifact
|
||||
builds). To compile your own version of this file, open SFXSetup.sln and build
|
||||
the ReleaseD configuration.
|
||||
* 7zSD.Win32.sfx
|
||||
32-bit x86 binary built using some of the above files, but through a different
|
||||
build procedure that uses Visual C++ 6 in order to maintain compatibility with
|
||||
legacy Windows platforms (Firefox doesn't run on these platforms, but at least
|
||||
we can display a helpful error message). The exact procedure that generated
|
||||
this file was:
|
||||
1) Install Microsoft Visual C++ 6 Professional or Enterprise edition (the
|
||||
Standard edition does not include the optimizing compiler, so it should
|
||||
not be used). You'll likely want a virtual machine running Windows XP,
|
||||
because running VC6 under more modern Windows versions is tricky.
|
||||
2) Install an appropriate Windows SDK version. The Windows XP Service Pack 2
|
||||
SDK is known to work well, but that particular version appears to only be
|
||||
available from archive.org:
|
||||
https://web.archive.org/web/20080209175723/http://www.microsoft.com:80/msdownload/platformsdk/sdkupdate/XPSP2FULLInstall.htm
|
||||
3) Run the tool included with the SDK that configures Visual C++ to use it.
|
||||
4) If using a fresh copy of the LZMA SDK sources, apply the patch in
|
||||
mozilla_customizations.diff. The copy in the Firefox source tree already
|
||||
has these changes applied.
|
||||
5) Open the workspace file at src\CPP\7zip\Bundles\SFXSetup\SFXSetup.dsw and
|
||||
build it using the "SFXSetup - Win32 ReleaseD" configuration. The output
|
||||
executable should be at the path ReleaseD\7zSD.sfx relative to SFXSetup.dsw.
|
||||
6) Use Resource Hacker (available from http://angusj.com/resourcehacker/) to
|
||||
replace the existing icon on 7zSD.sfx and to add the manifest as a new
|
||||
resource. Also edit the version info resource to replace CompanyName and
|
||||
LegalCopyright with "Mozilla" (or appropriate vendor name) and
|
||||
FileDescription and ProductName with "Firefox" (or appropriate product name).
|
||||
Be sure to recompile the resources using the green "play" button in the
|
||||
toolbar (or by pressing F5) before saving the file.
|
||||
In the future this file may be replaced with one built in the same manner as
|
||||
the AArch64 version using a modern toolchain, if the loss of platform support
|
||||
is deemed acceptable.
|
||||
The firefox/ directory contains 7zSD.sfx, a 32-bit Windows executable built
|
||||
from the Visual C++ 6 project found in the src/CPP/7zip/Bundles/SFXSetup/
|
||||
directory. The "ReleaseD" configuration was used. Including a compiled binary
|
||||
in the source tree is certainly not preferred, but is necessary in this case
|
||||
because the code does not build cleanly under more recent compilers. Using an
|
||||
older toolchain also allows us to keep this executable running on older Windows
|
||||
versions which are no longer supported by the build system used for the main
|
||||
application; that means we can show an error message specifically informing
|
||||
users that their OS is too old, instead of the generic "not a valid Win32
|
||||
application" error that Windows would generate if we used the newer toolchain
|
||||
and that isn't very helpful to most users. Using a precompiled binary also
|
||||
allows the installer build procedure to work without a compiler toolchain
|
||||
being configured (e.g., for artifact builds).
|
||||
|
||||
The firefox/ directory also contains an icon and a manifest which were edited
|
||||
into 7zSD.sfx's resources after build time. The icon had to be added this way
|
||||
as opposed to just replacing the included 7-zip icon because the resource
|
||||
compiler included with VC6 does not support the 128x128 PNG image included in
|
||||
our icon file. Similarly, the manifest had to be edited in because the older
|
||||
resource compiler does not support manifests (and the 7-zip build files do not
|
||||
try to use any).
|
||||
|
||||
The version info in the compiled binary was also edited after build time. There
|
||||
isn't a technical reason why the version info changes couldn't be included at
|
||||
build time, but since the goal is just to avoid confusing users about the origin
|
||||
of the Firefox installer, not to appear to be making the claim that we wrote the
|
||||
LZMA SDK, a more targeted change is appropriate.
|
||||
|
||||
Step-by-step instructions for generating 7zSD.sfx:
|
||||
1) Install Microsoft Visual C++ 6 Professional or Enterprise edition (the
|
||||
Standard edition does not include the optimizing compiler, so it should
|
||||
not be used). You'll likely want a virtual machine running Windows XP,
|
||||
because running VC6 under more modern Windows versions is tricky.
|
||||
2) Install an appropriate Windows SDK version. The Windows XP Service Pack 2 SDK
|
||||
is known to work well, but that particular version appears to only be
|
||||
available from archive.org:
|
||||
https://web.archive.org/web/20080209175723/http://www.microsoft.com:80/msdownload/platformsdk/sdkupdate/XPSP2FULLInstall.htm
|
||||
3) Run the tool included with the SDK that configures Visual C++ to use it.
|
||||
4) If using a fresh copy of the LZMA SDK sources, apply the patch in
|
||||
mozilla_customizations.diff. The copy in the Firefox source tree already
|
||||
has these changes applied.
|
||||
5) Open the workspace file at src\CPP\7zip\Bundles\SFXSetup\SFXSetup.dsw and
|
||||
build it using the "SFXSetup - Win32 ReleaseD" configuration. The output
|
||||
executable should be at the path ReleaseD\7zSD.sfx relative to SFXSetup.dsw.
|
||||
6) Use Resource Hacker (available from http://angusj.com/resourcehacker/) to
|
||||
replace the existing icon on 7zSD.sfx and to add the manifest as a new
|
||||
resource. Also edit the version info resource to replace CompanyName and
|
||||
LegalCopyright with "Mozilla" (or appropriate vendor name) and
|
||||
FileDescription and ProductName with "Firefox" (or appropriate product name).
|
||||
Be sure to recompile the resources using the green "play" button in the
|
||||
toolbar (or by pressing F5) before saving the file.
|
||||
|
|
|
|||
Двоичные данные
other-licenses/7zstub/firefox/7zSD.ARM64.sfx
Двоичные данные
other-licenses/7zstub/firefox/7zSD.ARM64.sfx
Двоичный файл не отображается.
|
|
@ -1,29 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||
<assemblyIdentity version="1.0.0.0" processorArchitecture="ARM64" name="7zS.sfx.exe" type="win32"/>
|
||||
<description>7-Zip Self-extracting Archive v18.05</description>
|
||||
<dependency>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="ARM64" publicKeyToken="6595b64144ccf1df" language="*"/>
|
||||
</dependentAssembly>
|
||||
</dependency>
|
||||
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
|
||||
<security>
|
||||
<requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false"/>
|
||||
</requestedPrivileges>
|
||||
</security>
|
||||
</trustInfo>
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
|
||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
|
||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
|
||||
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
|
||||
</application>
|
||||
</compatibility>
|
||||
<application xmlns="urn:schemas-microsoft-com:asm.v3"><windowsSettings>
|
||||
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
|
||||
</windowsSettings>
|
||||
</application>
|
||||
</assembly>
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.28307.168
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFXSetup", "SFXSetup.vcxproj", "{B348342A-1787-4311-B120-EDAE3018868F}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|ARM64 = Debug|ARM64
|
||||
Debug|x86 = Debug|x86
|
||||
ReleaseD|ARM64 = ReleaseD|ARM64
|
||||
ReleaseD|x86 = ReleaseD|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{B348342A-1787-4311-B120-EDAE3018868F}.Debug|ARM64.ActiveCfg = ReleaseD|ARM64
|
||||
{B348342A-1787-4311-B120-EDAE3018868F}.Debug|ARM64.Build.0 = ReleaseD|ARM64
|
||||
{B348342A-1787-4311-B120-EDAE3018868F}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{B348342A-1787-4311-B120-EDAE3018868F}.Debug|x86.Build.0 = Debug|Win32
|
||||
{B348342A-1787-4311-B120-EDAE3018868F}.ReleaseD|ARM64.ActiveCfg = ReleaseD|ARM64
|
||||
{B348342A-1787-4311-B120-EDAE3018868F}.ReleaseD|ARM64.Build.0 = ReleaseD|ARM64
|
||||
{B348342A-1787-4311-B120-EDAE3018868F}.ReleaseD|x86.ActiveCfg = ReleaseD|Win32
|
||||
{B348342A-1787-4311-B120-EDAE3018868F}.ReleaseD|x86.Build.0 = ReleaseD|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {A02A956C-0F11-454A-A695-43570C60D700}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
@ -1,593 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|ARM64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>ARM64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="ReleaseD|ARM64">
|
||||
<Configuration>ReleaseD</Configuration>
|
||||
<Platform>ARM64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="ReleaseD|Win32">
|
||||
<Configuration>ReleaseD</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<SccProjectName />
|
||||
<SccLocalPath />
|
||||
<ProjectGuid>{B348342A-1787-4311-B120-EDAE3018868F}</ProjectGuid>
|
||||
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<PlatformToolset>v141</PlatformToolset>
|
||||
<UseOfMfc>false</UseOfMfc>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
||||
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<TargetName>7zSD.$(Platform)</TargetName>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
<TargetExt>.sfx</TargetExt>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
||||
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>7zSD.$(Platform)</TargetName>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
<TargetExt>.sfx</TargetExt>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
||||
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<TargetName>7zD.$(Platform)</TargetName>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
<TargetExt>.sfx</TargetExt>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
|
||||
<IntDir>$(SolutionDir)$(Platform)\$(Configuration)\</IntDir>
|
||||
<TargetName>7zD.$(Platform)</TargetName>
|
||||
<GenerateManifest>false</GenerateManifest>
|
||||
<TargetExt>.sfx</TargetExt>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
<ClCompile>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
|
||||
<StringPooling>true</StringPooling>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;EXTRACT_ONLY;NO_REGISTRY;_SFX;_NO_CRYPTO;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
||||
<PrecompiledHeaderOutputFile>$(IntDir)</PrecompiledHeaderOutputFile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
|
||||
<ObjectFileName>$(IntDir)</ObjectFileName>
|
||||
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
|
||||
<CallingConvention>StdCall</CallingConvention>
|
||||
<DebugInformationFormat>None</DebugInformationFormat>
|
||||
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
</ClCompile>
|
||||
<Midl>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<TypeLibraryName>.\ReleaseD\SFXSetup.tlb</TypeLibraryName>
|
||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
||||
<TargetEnvironment>Win32</TargetEnvironment>
|
||||
</Midl>
|
||||
<ResourceCompile>
|
||||
<Culture>0x0409</Culture>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ResourceCompile>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<OutputFile>
|
||||
</OutputFile>
|
||||
</Bscmake>
|
||||
<Link>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<DelayLoadDLLs>user32.dll;shell32.dll;oleaut32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<AdditionalDependencies>odbc32.lib;odbccp32.lib;delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ProfileGuidedDatabase />
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
<ClCompile>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
|
||||
<StringPooling>true</StringPooling>
|
||||
<Optimization>MinSpace</Optimization>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;EXTRACT_ONLY;NO_REGISTRY;_SFX;_NO_CRYPTO;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
||||
<PrecompiledHeaderOutputFile>$(IntDir)</PrecompiledHeaderOutputFile>
|
||||
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
|
||||
<ObjectFileName>$(IntDir)</ObjectFileName>
|
||||
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
|
||||
<CallingConvention>StdCall</CallingConvention>
|
||||
<DebugInformationFormat>None</DebugInformationFormat>
|
||||
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<Midl>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<TypeLibraryName>.\ReleaseD\SFXSetup.tlb</TypeLibraryName>
|
||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
||||
</Midl>
|
||||
<ResourceCompile>
|
||||
<Culture>0x0409</Culture>
|
||||
<PreprocessorDefinitions>_ARM64_;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ResourceCompile>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<OutputFile>
|
||||
</OutputFile>
|
||||
</Bscmake>
|
||||
<Link>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<DelayLoadDLLs>user32.dll;shell32.dll;oleaut32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<AdditionalDependencies>odbc32.lib;odbccp32.lib;delayimp.lib;shell32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
||||
<ProfileGuidedDatabase />
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;EXTRACT_ONLY;NO_REGISTRY;_SFX;_NO_CRYPTO;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
||||
<PrecompiledHeaderOutputFile>$(IntDir)</PrecompiledHeaderOutputFile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
|
||||
<ObjectFileName>$(IntDir)</ObjectFileName>
|
||||
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
|
||||
<CallingConvention>StdCall</CallingConvention>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
</ClCompile>
|
||||
<Midl>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<TypeLibraryName>.\Debug\SFXSetup.tlb</TypeLibraryName>
|
||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
||||
<TargetEnvironment>Win32</TargetEnvironment>
|
||||
</Midl>
|
||||
<ResourceCompile>
|
||||
<Culture>0x0409</Culture>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ResourceCompile>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<OutputFile>
|
||||
</OutputFile>
|
||||
</Bscmake>
|
||||
<Link>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<DelayLoadDLLs>user32.dll;shell32.dll;oleaut32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<AdditionalDependencies>odbc32.lib;odbccp32.lib;delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ProfileGuidedDatabase />
|
||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
<ClCompile>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;EXTRACT_ONLY;NO_REGISTRY;_SFX;_NO_CRYPTO;UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
|
||||
<PrecompiledHeaderOutputFile>$(IntDir)</PrecompiledHeaderOutputFile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
|
||||
<ObjectFileName>$(IntDir)</ObjectFileName>
|
||||
<ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
|
||||
<CallingConvention>StdCall</CallingConvention>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
</ClCompile>
|
||||
<Midl>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<TypeLibraryName>.\Debug\SFXSetup.tlb</TypeLibraryName>
|
||||
<MkTypLibCompatible>true</MkTypLibCompatible>
|
||||
</Midl>
|
||||
<ResourceCompile>
|
||||
<Culture>0x0409</Culture>
|
||||
<PreprocessorDefinitions>_ARM64_;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ResourceCompile>
|
||||
<Bscmake>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<OutputFile>
|
||||
</OutputFile>
|
||||
</Bscmake>
|
||||
<Link>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<DelayLoadDLLs>user32.dll;shell32.dll;oleaut32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
|
||||
<AdditionalDependencies>odbc32.lib;odbccp32.lib;delayimp.lib;shell32.lib;oleaut32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<ProfileGuidedDatabase />
|
||||
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
|
||||
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="resource.rc" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\src\C\7zCrc.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\7zCrcOpt.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\Alloc.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\Bcj2.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\Bra.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\Bra86.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\BraIA64.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\CpuArch.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\Delta.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\DllSecur.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\Lzma2Dec.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\Lzma2DecMt.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\LzmaDec.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\MtDec.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\C\Threads.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\src\CPP\Common\CommandLineParser.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Common\CRC.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Common\IntToString.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Common\MyString.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Common\MyVector.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Common\NewHandler.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Common\StringConvert.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Common\TextConfig.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Common\UTFConvert.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Common\Wildcard.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Windows\Control\Dialog.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Windows\DLL.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Windows\ErrorMsg.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Windows\FileDir.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Windows\FileFind.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Windows\FileIO.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Windows\FileName.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Windows\PropVariant.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Windows\ResourceString.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Windows\Synchronization.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Windows\System.cpp" />
|
||||
<ClCompile Include="..\src\CPP\Windows\Window.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Archive\7z\7zDecode.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Archive\7z\7zExtract.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Archive\7z\7zHandler.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Archive\7z\7zIn.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Archive\7z\7zRegister.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Archive\Common\CoderMixer2.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Archive\Common\ItemNameUtils.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Archive\Common\OutStreamWithCRC.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\CreateCoder.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\CWrappers.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\FileStreams.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\FilterCoder.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\InBuffer.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\LimitedStreams.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\OutBuffer.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\ProgressUtils.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\PropId.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\StreamBinder.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\StreamObjects.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\StreamUtils.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Common\VirtThread.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\Bcj2Coder.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\Bcj2Register.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\BcjCoder.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\BcjRegister.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\BranchMisc.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\BranchRegister.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\CopyCoder.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\CopyRegister.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\DeltaFilter.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\Lzma2Decoder.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\Lzma2Register.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\LzmaDecoder.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Compress\LzmaRegister.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\UI\Common\ArchiveOpenCallback.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\UI\Common\DefaultName.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\UI\Common\LoadCodecs.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\UI\Common\OpenArchive.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\UI\Explorer\MyMessages.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\UI\FileManager\FormatUtils.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\UI\FileManager\ProgressDialog.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Bundles\SFXSetup\ExtractCallbackSfx.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Bundles\SFXSetup\ExtractEngine.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Bundles\SFXSetup\SfxSetup.cpp" />
|
||||
<ClCompile Include="..\src\CPP\7zip\Bundles\SFXSetup\StdAfx.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='ReleaseD|Win32'">StdAfx.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='ReleaseD|ARM64'">StdAfx.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">StdAfx.h</PrecompiledHeaderFile>
|
||||
<PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">StdAfx.h</PrecompiledHeaderFile>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\src\C\7zCrc.h" />
|
||||
<ClInclude Include="..\src\C\Alloc.h" />
|
||||
<ClInclude Include="..\src\C\Bcj2.h" />
|
||||
<ClInclude Include="..\src\C\Bra.h" />
|
||||
<ClInclude Include="..\src\C\CpuArch.h" />
|
||||
<ClInclude Include="..\src\C\Delta.h" />
|
||||
<ClInclude Include="..\src\C\DllSecur.h" />
|
||||
<ClInclude Include="..\src\C\Lzma2Dec.h" />
|
||||
<ClInclude Include="..\src\C\Lzma2DecMt.h" />
|
||||
<ClInclude Include="..\src\C\LzmaDec.h" />
|
||||
<ClInclude Include="..\src\C\MtDec.h" />
|
||||
<ClInclude Include="..\src\C\Threads.h" />
|
||||
<ClInclude Include="..\src\CPP\Common\CommandLineParser.h" />
|
||||
<ClInclude Include="..\src\CPP\Common\IntToString.h" />
|
||||
<ClInclude Include="..\src\CPP\Common\MyString.h" />
|
||||
<ClInclude Include="..\src\CPP\Common\MyVector.h" />
|
||||
<ClInclude Include="..\src\CPP\Common\NewHandler.h" />
|
||||
<ClInclude Include="..\src\CPP\Common\StringConvert.h" />
|
||||
<ClInclude Include="..\src\CPP\Common\TextConfig.h" />
|
||||
<ClInclude Include="..\src\CPP\Common\UTFConvert.h" />
|
||||
<ClInclude Include="..\src\CPP\Common\Wildcard.h" />
|
||||
<ClInclude Include="..\src\CPP\Windows\Control\Dialog.h" />
|
||||
<ClInclude Include="..\src\CPP\Windows\DLL.h" />
|
||||
<ClInclude Include="..\src\CPP\Windows\ErrorMsg.h" />
|
||||
<ClInclude Include="..\src\CPP\Windows\FileDir.h" />
|
||||
<ClInclude Include="..\src\CPP\Windows\FileFind.h" />
|
||||
<ClInclude Include="..\src\CPP\Windows\FileIO.h" />
|
||||
<ClInclude Include="..\src\CPP\Windows\FileName.h" />
|
||||
<ClInclude Include="..\src\CPP\Windows\PropVariant.h" />
|
||||
<ClInclude Include="..\src\CPP\Windows\ResourceString.h" />
|
||||
<ClInclude Include="..\src\CPP\Windows\Synchronization.h" />
|
||||
<ClInclude Include="..\src\CPP\Windows\System.h" />
|
||||
<ClInclude Include="..\src\CPP\Windows\Window.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Archive\7z\7zDecode.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Archive\7z\7zHandler.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Archive\7z\7zHeader.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Archive\7z\7zIn.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Archive\7z\7zItem.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Archive\Common\CoderMixer2.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Archive\Common\ItemNameUtils.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Archive\Common\OutStreamWithCRC.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Common\CreateCoder.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Common\CWrappers.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Common\FileStreams.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Common\FilterCoder.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Common\InBuffer.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Common\LimitedStreams.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Common\OutBuffer.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Common\ProgressUtils.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Common\StreamBinder.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Common\StreamObjects.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Common\StreamUtils.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Common\VirtThread.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Compress\BranchMisc.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Compress\Lzma2Decoder.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\UI\Common\ArchiveOpenCallback.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\UI\Common\DefaultName.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\UI\Common\ExtractMode.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\UI\Common\LoadCodecs.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\UI\Common\OpenArchive.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\UI\Explorer\MyMessages.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\UI\FileManager\FormatUtils.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\UI\FileManager\LangUtils.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\UI\FileManager\ProgressDialog.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Bundles\SFXSetup\ExtractCallbackSfx.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Bundles\SFXSetup\ExtractEngine.h" />
|
||||
<ClInclude Include="..\src\CPP\7zip\Bundles\SFXSetup\StdAfx.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
#include <windows.h>
|
||||
#include "../src/CPP/7zip/Bundles/SFXSetup/resource.h"
|
||||
#include "../src/C/7zVersion.rc"
|
||||
|
||||
LANGUAGE 9, 1
|
||||
1 VERSIONINFO
|
||||
FILEVERSION MY_VER
|
||||
PRODUCTVERSION MY_VER
|
||||
FILEFLAGSMASK MY_VS_FFI_FILEFLAGSMASK
|
||||
FILEFLAGS DBG_FL
|
||||
FILEOS MY_VOS_NT_WINDOWS32
|
||||
FILETYPE MY_VFT_APP
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904b0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "Mozilla"
|
||||
VALUE "FileDescription", "Firefox"
|
||||
VALUE "FileVersion", MY_VERSION
|
||||
VALUE "InternalName", "7zSD.sfx"
|
||||
VALUE "LegalCopyright", "Mozilla"
|
||||
VALUE "OriginalFilename", "7zSD.sfx"
|
||||
VALUE "ProductName", "Firefox"
|
||||
VALUE "ProductVersion", MY_VERSION
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
|
||||
#ifdef _ARM64_
|
||||
1 RT_MANIFEST "7zSD.arm64.manifest"
|
||||
#else
|
||||
1 RT_MANIFEST "7zSD.win32.manifest"
|
||||
#endif
|
||||
|
||||
IDI_ICON ICON "setup.ico"
|
||||
|
||||
STRINGTABLE
|
||||
BEGIN
|
||||
IDS_EXTRACTION_ERROR_TITLE "Extraction Failed"
|
||||
IDS_EXTRACTION_ERROR_MESSAGE "File is corrupt"
|
||||
IDS_CANNOT_CREATE_FOLDER "Cannot create folder '{0}'"
|
||||
IDS_PROGRESS_EXTRACTING "Extracting"
|
||||
IDS_MIN_OS_TITLE "Setup Error"
|
||||
IDS_MIN_OS_TEXT "Microsoft Windows 7 or newer is required."
|
||||
END
|
||||
|
||||
#include "../src/CPP/7zip/UI/FileManager/ProgressDialog.rc"
|
||||
|
|
@ -13,17 +13,12 @@ import mozpack.path as mozpath
|
|||
import buildconfig
|
||||
from mozbuild.base import BuildEnvironmentNotFoundException
|
||||
|
||||
def archive_exe(pkg_dir, tagfile, sfx_package, package, use_upx):
|
||||
def archive_exe(pkg_dir, tagfile, sfx_package, package):
|
||||
tmpdir = tempfile.mkdtemp(prefix='tmp')
|
||||
try:
|
||||
if pkg_dir:
|
||||
shutil.move(pkg_dir, 'core')
|
||||
|
||||
if use_upx:
|
||||
final_sfx = mozpath.join(tmpdir, '7zSD.sfx')
|
||||
subprocess.check_call(['upx', '--best', '-o', final_sfx, sfx_package])
|
||||
else:
|
||||
final_sfx = sfx_package
|
||||
subprocess.check_call(['upx', '--best', '-o', mozpath.join(tmpdir, '7zSD.sfx'), sfx_package])
|
||||
|
||||
try:
|
||||
sevenz = buildconfig.config.substs['7Z']
|
||||
|
|
@ -33,7 +28,7 @@ def archive_exe(pkg_dir, tagfile, sfx_package, package, use_upx):
|
|||
subprocess.check_call([sevenz, 'a', '-r', '-t7z', mozpath.join(tmpdir, 'app.7z'), '-mx', '-m0=BCJ2', '-m1=LZMA:d25', '-m2=LZMA:d19', '-m3=LZMA:d19', '-mb0:1', '-mb0s1:2', '-mb0s2:3'])
|
||||
|
||||
with open(package, 'wb') as o:
|
||||
for i in [final_sfx, tagfile, mozpath.join(tmpdir, 'app.7z')]:
|
||||
for i in [mozpath.join(tmpdir, '7zSD.sfx'), tagfile, mozpath.join(tmpdir, 'app.7z')]:
|
||||
shutil.copyfileobj(open(i, 'rb'), o)
|
||||
os.chmod(package, 0o0755)
|
||||
finally:
|
||||
|
|
@ -43,11 +38,11 @@ def archive_exe(pkg_dir, tagfile, sfx_package, package, use_upx):
|
|||
|
||||
def main(args):
|
||||
if len(args) != 4:
|
||||
print('Usage: exe_7z_archive.py <pkg_dir> <tagfile> <sfx_package> <package> <use_upx>',
|
||||
print('Usage: exe_7z_archive.py <pkg_dir> <tagfile> <sfx_package> <package>',
|
||||
file=sys.stderr)
|
||||
return 1
|
||||
else:
|
||||
archive_exe(args[0], args[1], args[2], args[3], args[4])
|
||||
archive_exe(args[0], args[1], args[2], args[3])
|
||||
return 0
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
|||
|
|
@ -3054,9 +3054,7 @@ class Repackage(MachCommandBase):
|
|||
help='Name of the package being rebuilt')
|
||||
@CommandArgument('--sfx-stub', type=str, required=True,
|
||||
help='Path to the self-extraction stub.')
|
||||
@CommandArgument('--use-upx', required=False, action='store_true',
|
||||
help='Run UPX on the self-extraction stub.')
|
||||
def repackage_installer(self, tag, setupexe, package, output, package_name, sfx_stub, use_upx):
|
||||
def repackage_installer(self, tag, setupexe, package, output, package_name, sfx_stub):
|
||||
from mozbuild.repackaging.installer import repackage_installer
|
||||
repackage_installer(
|
||||
topsrcdir=self.topsrcdir,
|
||||
|
|
@ -3066,7 +3064,6 @@ class Repackage(MachCommandBase):
|
|||
output=output,
|
||||
package_name=package_name,
|
||||
sfx_stub=sfx_stub,
|
||||
use_upx=use_upx,
|
||||
)
|
||||
|
||||
@SubCommand('repackage', 'msi',
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ from mozbuild.action.exe_7z_archive import archive_exe
|
|||
from mozbuild.util import ensureParentDir
|
||||
|
||||
|
||||
def repackage_installer(topsrcdir, tag, setupexe, package, output, package_name, sfx_stub, use_upx):
|
||||
def repackage_installer(topsrcdir, tag, setupexe, package, output, package_name, sfx_stub):
|
||||
if package and not zipfile.is_zipfile(package):
|
||||
raise Exception("Package file %s is not a valid .zip file." % package)
|
||||
if package is not None and package_name is None:
|
||||
|
|
@ -42,7 +42,7 @@ def repackage_installer(topsrcdir, tag, setupexe, package, output, package_name,
|
|||
|
||||
sfx_package = mozpath.join(topsrcdir, sfx_stub)
|
||||
|
||||
archive_exe(package_name, tag, sfx_package, output, use_upx)
|
||||
archive_exe(package_name, tag, sfx_package, output)
|
||||
|
||||
finally:
|
||||
os.chdir(old_cwd)
|
||||
|
|
|
|||
|
|
@ -12,12 +12,6 @@ ABS_CONFIG_DIR := $(abspath $(CONFIG_DIR))
|
|||
|
||||
SFX_MODULE ?= $(error SFX_MODULE is not defined)
|
||||
|
||||
ifeq ($(CPU_ARCH), aarch64)
|
||||
USE_UPX :=
|
||||
else
|
||||
USE_UPX := --use-upx
|
||||
endif
|
||||
|
||||
TOOLKIT_NSIS_FILES = \
|
||||
common.nsh \
|
||||
locale.nlf \
|
||||
|
|
@ -70,8 +64,7 @@ installer:: $(CONFIG_DIR)/setup.exe $(ZIP_IN)
|
|||
--package '$(ZIP_IN)' \
|
||||
--tag $(topsrcdir)/$(MOZ_BUILD_APP)/installer/windows/app.tag \
|
||||
--setupexe $(CONFIG_DIR)/setup.exe \
|
||||
--sfx-stub $(SFX_MODULE) \
|
||||
$(USE_UPX)
|
||||
--sfx-stub $(SFX_MODULE)
|
||||
ifdef MOZ_EXTERNAL_SIGNING_FORMAT
|
||||
$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f)) "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
|
||||
endif
|
||||
|
|
@ -80,8 +73,7 @@ ifdef MOZ_STUB_INSTALLER
|
|||
-o '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe' \
|
||||
--tag $(topsrcdir)/browser/installer/windows/stub.tag \
|
||||
--setupexe $(CONFIG_DIR)/setup-stub.exe \
|
||||
--sfx-stub $(SFX_MODULE) \
|
||||
$(USE_UPX)
|
||||
--sfx-stub $(SFX_MODULE)
|
||||
endif
|
||||
else
|
||||
installer::
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче