mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-11-25 12:44:46 +01:00
Revert "Add x64 support."
This partially reverts commitcc9ef7a5eband commit254b1cb58d.
This commit is contained in:
XhmikosR
parent
ce0f423fce
commit
8ccb66de34
47
build.bat
47
build.bat
@ -42,17 +42,10 @@ IF "%~1" == "" (
|
||||
:START
|
||||
PUSHD "src"
|
||||
|
||||
CALL "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86
|
||||
TITLE %BUILDTYPE%ing SubtitleEdit - Release^|x86...
|
||||
CALL "%VS120COMNTOOLS%vsvars32.bat" x86
|
||||
TITLE %BUILDTYPE%ing SubtitleEdit - Release^|Any CPU...
|
||||
|
||||
"MSBuild.exe" SubtitleEdit.sln /t:%BUILDTYPE% /p:Configuration=Release /p:Platform="x86"^
|
||||
/maxcpucount /consoleloggerparameters:DisableMPLogging;Summary;Verbosity=minimal
|
||||
IF %ERRORLEVEL% NEQ 0 GOTO EndWithError
|
||||
|
||||
CALL "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x86_amd64
|
||||
TITLE %BUILDTYPE%ing SubtitleEdit - Release^|x64...
|
||||
|
||||
"MSBuild.exe" SubtitleEdit.sln /t:%BUILDTYPE% /p:Configuration=Release /p:Platform="x64"^
|
||||
"MSBuild.exe" SubtitleEdit.sln /t:%BUILDTYPE% /p:Configuration=Release /p:Platform="Any CPU"^
|
||||
/maxcpucount /consoleloggerparameters:DisableMPLogging;Summary;Verbosity=minimal
|
||||
IF %ERRORLEVEL% NEQ 0 GOTO EndWithError
|
||||
|
||||
@ -63,8 +56,7 @@ IF /I "%BUILDTYPE%" == "Clean" GOTO END
|
||||
|
||||
CALL :SubDetectSevenzipPath
|
||||
IF DEFINED SEVENZIP_PATH IF EXIST "%SEVENZIP_PATH%" (
|
||||
CALL :SubZipFile x86
|
||||
CALL :SubZipFile x64
|
||||
CALL :SubZipFile
|
||||
)
|
||||
|
||||
CALL :SubDetectInnoSetup
|
||||
@ -89,8 +81,8 @@ EXIT /B
|
||||
|
||||
|
||||
:SubZipFile
|
||||
TITLE Creating the %~1 ZIP file...
|
||||
PUSHD "src\bin\Release\%~1"
|
||||
TITLE Creating the ZIP file...
|
||||
PUSHD "src\bin\Release"
|
||||
IF EXIST "temp_zip" RD /S /Q "temp_zip"
|
||||
IF NOT EXIST "temp_zip" MD "temp_zip"
|
||||
IF NOT EXIST "temp_zip\Languages" MD "temp_zip\Languages"
|
||||
@ -98,24 +90,25 @@ IF NOT EXIST "temp_zip\Tesseract" MD "temp_zip\Tesseract"
|
||||
IF NOT EXIST "temp_zip\Tesseract\tessdata" MD "temp_zip\Tesseract\tessdata"
|
||||
IF NOT EXIST "temp_zip\Tesseract\tessdata\configs" MD "temp_zip\Tesseract\tessdata\configs"
|
||||
|
||||
COPY /Y /V "..\..\..\..\gpl.txt" "temp_zip\"
|
||||
COPY /Y /V "..\..\..\Changelog.txt" "temp_zip\"
|
||||
COPY /Y /V "Interop.QuartzTypeLib.dll" "temp_zip\"
|
||||
COPY /Y /V "Hunspell%~1.dll" "temp_zip\"
|
||||
COPY /Y /V "SubtitleEdit.exe" "temp_zip\"
|
||||
COPY /Y /V "Languages\*.xml" "temp_zip\Languages\"
|
||||
COPY /Y /V "..\..\..\..\Tesseract\msvcp90.dll" "temp_zip\Tesseract\"
|
||||
COPY /Y /V "..\..\..\..\Tesseract\msvcr90.dll" "temp_zip\Tesseract\"
|
||||
COPY /Y /V "..\..\..\..\Tesseract\tesseract.exe" "temp_zip\Tesseract\"
|
||||
COPY /Y /V "..\..\..\..\Tesseract\tessdata\configs\hocr" "temp_zip\Tesseract\tessdata\configs\"
|
||||
COPY /Y /V "..\..\..\..\Tesseract\tessdata\eng.traineddata" "temp_zip\Tesseract\tessdata\"
|
||||
COPY /Y /V "..\..\..\gpl.txt" "temp_zip\"
|
||||
COPY /Y /V "..\..\Changelog.txt" "temp_zip\"
|
||||
COPY /Y /V "Interop.QuartzTypeLib.dll" "temp_zip\"
|
||||
COPY /Y /V "Hunspellx86.dll" "temp_zip\"
|
||||
COPY /Y /V "Hunspellx64.dll" "temp_zip\"
|
||||
COPY /Y /V "SubtitleEdit.exe" "temp_zip\"
|
||||
COPY /Y /V "Languages\*.xml" "temp_zip\Languages\"
|
||||
COPY /Y /V "..\..\..\Tesseract\msvcp90.dll" "temp_zip\Tesseract\"
|
||||
COPY /Y /V "..\..\..\Tesseract\msvcr90.dll" "temp_zip\Tesseract\"
|
||||
COPY /Y /V "..\..\..\Tesseract\tesseract.exe" "temp_zip\Tesseract\"
|
||||
COPY /Y /V "..\..\..\Tesseract\tessdata\configs\hocr" "temp_zip\Tesseract\tessdata\configs\"
|
||||
COPY /Y /V "..\..\..\Tesseract\tessdata\eng.traineddata" "temp_zip\Tesseract\tessdata\"
|
||||
|
||||
PUSHD "temp_zip"
|
||||
START "" /B /WAIT "%SEVENZIP_PATH%" a -tzip -mx=9 "SE%VERSION%.%~1.zip" * >NUL
|
||||
START "" /B /WAIT "%SEVENZIP_PATH%" a -tzip -mx=9 "SE%VERSION%.zip" * >NUL
|
||||
IF %ERRORLEVEL% NEQ 0 GOTO EndWithError
|
||||
|
||||
|
||||
MOVE /Y "SE%VERSION%.%~1.zip" "..\..\..\..\.." >NUL
|
||||
MOVE /Y "SE%VERSION%.zip" "..\..\..\.." >NUL
|
||||
POPD
|
||||
IF EXIST "temp_zip" RD /S /Q "temp_zip"
|
||||
POPD
|
||||
|
||||
@ -48,8 +48,7 @@
|
||||
#define VerBuild
|
||||
#define VerRevision
|
||||
|
||||
#define bindir "..\src\bin\Release\x86"
|
||||
#define bindir_x64 "..\src\bin\Release\x64"
|
||||
#define bindir "..\src\bin\Release"
|
||||
|
||||
#ifnexist bindir + "\SubtitleEdit.exe"
|
||||
#error Compile Subtitle Edit first
|
||||
@ -107,8 +106,6 @@ ShowLanguageDialog=yes
|
||||
DisableDirPage=auto
|
||||
DisableProgramGroupPage=auto
|
||||
CloseApplications=true
|
||||
ArchitecturesAllowed=x86 x64
|
||||
ArchitecturesInstallIn64BitMode=x64
|
||||
|
||||
|
||||
[Languages]
|
||||
@ -199,8 +196,7 @@ Source: ..\Dictionaries\ru_RU_names_etc.xml; DestDir: {userappdata}\Subtit
|
||||
Source: ..\Dictionaries\ru_RU_user.xml; DestDir: {userappdata}\Subtitle Edit\Dictionaries; Flags: ignoreversion onlyifdoesntexist uninsneveruninstall; Components: main
|
||||
Source: ..\Dictionaries\rus_OCRFixReplaceList.xml; DestDir: {userappdata}\Subtitle Edit\Dictionaries; Flags: ignoreversion onlyifdoesntexist uninsneveruninstall; Components: main
|
||||
Source: ..\Dictionaries\swe_OCRFixReplaceList.xml; DestDir: {userappdata}\Subtitle Edit\Dictionaries; Flags: ignoreversion onlyifdoesntexist uninsneveruninstall; Components: main
|
||||
Source: {#bindir_x64}\Hunspellx64.dll; DestDir: {app}; Flags: ignoreversion; Components: main; Check: Is64BitInstallMode()
|
||||
Source: {#bindir}\Hunspellx86.dll; DestDir: {app}; Flags: ignoreversion; Components: main; Check: not Is64BitInstallMode()
|
||||
Source: {#bindir}\Hunspellx86.dll; DestDir: {app}; Flags: ignoreversion; Components: main
|
||||
Source: {#bindir}\Icons\Find.png; DestDir: {app}\Icons; Flags: ignoreversion; Components: main
|
||||
Source: {#bindir}\Icons\Help.png; DestDir: {app}\Icons; Flags: ignoreversion; Components: main
|
||||
Source: {#bindir}\Icons\New.png; DestDir: {app}\Icons; Flags: ignoreversion; Components: main
|
||||
@ -249,8 +245,7 @@ Source: {#bindir}\Languages\zh-CHS.xml; DestDir: {app}\Languages;
|
||||
Source: {#bindir}\Languages\zh-tw.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
|
||||
#endif
|
||||
|
||||
Source: {#bindir_x64}\SubtitleEdit.exe; DestDir: {app}; Flags: ignoreversion; Components: main; Check: Is64BitInstallMode()
|
||||
Source: {#bindir}\SubtitleEdit.exe; DestDir: {app}; Flags: ignoreversion; Components: main; Check: not Is64BitInstallMode()
|
||||
Source: {#bindir}\SubtitleEdit.exe; DestDir: {app}; Flags: ignoreversion; Components: main
|
||||
Source: ..\src\Changelog.txt; DestDir: {app}; Flags: ignoreversion; Components: main
|
||||
Source: ..\gpl.txt; DestDir: {app}; Flags: ignoreversion; Components: main
|
||||
Source: ..\Tesseract\msvcp90.dll; DestDir: {app}\Tesseract; Flags: ignoreversion; Components: main
|
||||
@ -348,15 +343,13 @@ Type: dirifempty; Name: {app}\Languages; Check: not IsComponentSe
|
||||
|
||||
|
||||
[Run]
|
||||
Filename: {win}\Microsoft.NET\Framework\v4.0.30319\ngen.exe; Parameters: "install ""{app}\SubtitleEdit.exe"""; StatusMsg: {cm:msg_OptimizingPerformance}; Flags: runhidden runascurrentuser skipifdoesntexist; Check: not Is64BitInstallMode()
|
||||
Filename: {win}\Microsoft.NET\Framework64\v4.0.30319\ngen.exe; Parameters: "install ""{app}\SubtitleEdit.exe"""; StatusMsg: {cm:msg_OptimizingPerformance}; Flags: runhidden runascurrentuser skipifdoesntexist; Check: Is64BitInstallMode()
|
||||
Filename: {win}\Microsoft.NET\Framework\v4.0.30319\ngen.exe; Parameters: "install ""{app}\SubtitleEdit.exe"""; StatusMsg: {cm:msg_OptimizingPerformance}; Flags: runhidden runascurrentuser skipifdoesntexist
|
||||
Filename: {app}\SubtitleEdit.exe; Description: {cm:LaunchProgram,Subtitle Edit}; WorkingDir: {app}; Flags: nowait postinstall skipifsilent unchecked
|
||||
Filename: http://www.nikse.dk/SubtitleEdit/; Description: {cm:run_VisitWebsite}; Flags: nowait postinstall skipifsilent unchecked shellexec
|
||||
|
||||
|
||||
[UninstallRun]
|
||||
Filename: {win}\Microsoft.NET\Framework\v4.0.30319\ngen.exe; Parameters: "uninstall ""{app}\SubtitleEdit.exe"""; Flags: runhidden runascurrentuser skipifdoesntexist; Check: not Is64BitInstallMode()
|
||||
Filename: {win}\Microsoft.NET\Framework64\v4.0.30319\ngen.exe; Parameters: "uninstall ""{app}\SubtitleEdit.exe"""; Flags: runhidden runascurrentuser skipifdoesntexist; Check: Is64BitInstallMode()
|
||||
Filename: {win}\Microsoft.NET\Framework\v4.0.30319\ngen.exe; Parameters: "uninstall ""{app}\SubtitleEdit.exe"""; Flags: runhidden runascurrentuser skipifdoesntexist
|
||||
|
||||
|
||||
[Code]
|
||||
@ -426,40 +419,6 @@ begin
|
||||
end;
|
||||
|
||||
|
||||
// Function to retrieve old version's uninstall string and uninstall it
|
||||
// Note that we only care for the 32-bit version on 64-bit Windows
|
||||
function UninstallOldVer(): Integer;
|
||||
var
|
||||
sUnInstallString: String;
|
||||
iResultCode: Integer;
|
||||
begin
|
||||
// Return Values:
|
||||
// 0 - no idea
|
||||
// 1 - can't find the registry key (probably no previous version installed)
|
||||
// 2 - uninstall string is empty
|
||||
// 3 - error executing the UnInstallString
|
||||
// 4 - successfully executed the UnInstallString
|
||||
|
||||
// default return value
|
||||
Result := 0;
|
||||
|
||||
sUnInstallString := '';
|
||||
|
||||
// get the uninstall string of the old app
|
||||
if RegQueryStringValue(HKLM32, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\SubtitleEdit_is1', 'UninstallString', sUnInstallString) then begin
|
||||
if sUnInstallString <> '' then begin
|
||||
sUnInstallString := RemoveQuotes(sUnInstallString);
|
||||
if Exec(sUnInstallString, '/SILENT /VERYSILENT /NORESTART /SUPPRESSMSGBOXES', '', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
|
||||
Result := 4
|
||||
else
|
||||
Result := 3;
|
||||
end else
|
||||
Result := 2;
|
||||
end else
|
||||
Result := 1;
|
||||
end;
|
||||
|
||||
|
||||
function ShouldSkipPage(PageID: Integer): Boolean;
|
||||
begin
|
||||
// Hide the license page
|
||||
@ -528,13 +487,6 @@ begin
|
||||
end
|
||||
else begin
|
||||
Result := True;
|
||||
|
||||
if IsWin64 then begin
|
||||
// We need to uninstall the old version before we create the installer's mutex
|
||||
// otherwise UninstallOldVer's `Exec` will fail for obvious reasons...
|
||||
UninstallOldVer();
|
||||
end;
|
||||
|
||||
CreateMutex(installer_mutex);
|
||||
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.21022</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{511A5B59-1C35-4719-8536-23B19AF9B21A}</ProjectGuid>
|
||||
@ -41,11 +41,11 @@
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\x86\</OutputPath>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>TRACE;DEBUG</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
@ -53,10 +53,10 @@
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\x86\</OutputPath>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
@ -65,32 +65,6 @@
|
||||
<UseVSHostingProcess>true</UseVSHostingProcess>
|
||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\Debug\x64\</OutputPath>
|
||||
<DefineConstants>TRACE;DEBUG</DefineConstants>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<CodeAnalysisLogFile>bin\Debug\SubtitleEdit.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
|
||||
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
|
||||
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
|
||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||
<OutputPath>bin\Release\x64\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<CodeAnalysisLogFile>bin\Release\SubtitleEdit.exe.CodeAnalysisLog.xml</CodeAnalysisLogFile>
|
||||
<CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
|
||||
<CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
|
||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Interop.QuartzTypeLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
@ -1905,8 +1879,10 @@
|
||||
<PreBuildEvent>"$(ProjectDir)..\update_rev.bat"</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>COPY /Y /V "$(ProjectDir)Dlls\Hunspell$(PlatformName).dll" "$(TargetDir)"
|
||||
COPY /Y /V "$(ProjectDir)Dlls\Interop.QuartzTypeLib.dll" "$(TargetDir)"</PostBuildEvent>
|
||||
<PostBuildEvent>COPY /Y /V "$(ProjectDir)Dlls\Hunspellx86.dll" "$(TargetDir)"
|
||||
COPY /Y /V "$(ProjectDir)Dlls\Hunspellx64.dll" "$(TargetDir)"
|
||||
COPY /Y /V "$(ProjectDir)Dlls\Interop.QuartzTypeLib.dll" "$(TargetDir)"
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
||||
@ -20,36 +20,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateAssemblyInfo", "Updat
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{511A5B59-1C35-4719-8536-23B19AF9B21A}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{511A5B59-1C35-4719-8536-23B19AF9B21A}.Debug|x64.Build.0 = Debug|x64
|
||||
{511A5B59-1C35-4719-8536-23B19AF9B21A}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{511A5B59-1C35-4719-8536-23B19AF9B21A}.Debug|x86.Build.0 = Debug|x86
|
||||
{511A5B59-1C35-4719-8536-23B19AF9B21A}.Release|x64.ActiveCfg = Release|x64
|
||||
{511A5B59-1C35-4719-8536-23B19AF9B21A}.Release|x64.Build.0 = Release|x64
|
||||
{511A5B59-1C35-4719-8536-23B19AF9B21A}.Release|x86.ActiveCfg = Release|x86
|
||||
{511A5B59-1C35-4719-8536-23B19AF9B21A}.Release|x86.Build.0 = Release|x86
|
||||
{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Debug|x64.Build.0 = Debug|x64
|
||||
{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Debug|x86.Build.0 = Debug|x86
|
||||
{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Release|x64.ActiveCfg = Release|x64
|
||||
{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Release|x64.Build.0 = Release|x64
|
||||
{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Release|x86.ActiveCfg = Release|x86
|
||||
{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Release|x86.Build.0 = Release|x86
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77}.Debug|x64.Build.0 = Debug|x64
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77}.Debug|x86.Build.0 = Debug|x86
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77}.Release|x64.ActiveCfg = Release|x64
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77}.Release|x64.Build.0 = Release|x64
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77}.Release|x86.ActiveCfg = Release|x86
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77}.Release|x86.Build.0 = Release|x86
|
||||
{511A5B59-1C35-4719-8536-23B19AF9B21A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{511A5B59-1C35-4719-8536-23B19AF9B21A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{511A5B59-1C35-4719-8536-23B19AF9B21A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{511A5B59-1C35-4719-8536-23B19AF9B21A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{7BE5B8E8-9469-4C7C-89D7-E8C884DEFC0E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{DBD4656C-5F40-4067-A70B-C4460DE20F77}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>
|
||||
</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
@ -15,7 +15,7 @@
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
@ -24,7 +24,7 @@
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
@ -33,22 +33,6 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\x64\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||
<OutputPath>bin\x64\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Interop.QuartzTypeLib">
|
||||
<HintPath>..\DLLs\Interop.QuartzTypeLib.dll</HintPath>
|
||||
|
||||
@ -13,45 +13,24 @@
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\Debug\x64\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||
<OutputPath>bin\Release\x64\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\Debug\x86\</OutputPath>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
|
||||
<OutputPath>bin\Release\x86\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
||||
@ -3,10 +3,10 @@ SETLOCAL
|
||||
|
||||
PUSHD %~dp0
|
||||
|
||||
IF EXIST "src\UpdateAssemblyInfo\bin\Release\x86\UpdateAssemblyInfo.exe" (
|
||||
"src\UpdateAssemblyInfo\bin\Release\x86\UpdateAssemblyInfo.exe" "src\Properties\AssemblyInfo.cs.template" "src\Properties\AssemblyInfo.cs"
|
||||
IF EXIST "src\UpdateAssemblyInfo\bin\Release\UpdateAssemblyInfo.exe" (
|
||||
"src\UpdateAssemblyInfo\bin\Release\UpdateAssemblyInfo.exe" "src\Properties\AssemblyInfo.cs.template" "src\Properties\AssemblyInfo.cs"
|
||||
) ELSE (
|
||||
"src\UpdateAssemblyInfo\bin\Debug\x86\UpdateAssemblyInfo.exe" "src\Properties\AssemblyInfo.cs.template" "src\Properties\AssemblyInfo.cs"
|
||||
"src\UpdateAssemblyInfo\bin\Debug\UpdateAssemblyInfo.exe" "src\Properties\AssemblyInfo.cs.template" "src\Properties\AssemblyInfo.cs"
|
||||
)
|
||||
IF %ERRORLEVEL% NEQ 0 GOTO SubError
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user