From de8d2d22f64502cd8461380b66b06b22b1a1b827 Mon Sep 17 00:00:00 2001 From: Martin Kemp Date: Tue, 26 Aug 2014 23:52:49 +0100 Subject: [PATCH] Fix the build --- .gitignore | 1 + Cmder.exe | Bin 32256 -> 31744 bytes launcher/CmderLauncher.sln | 6 --- launcher/CmderLauncher.vcxproj | 71 --------------------------------- launcher/src/CmderLauncher.cpp | 8 ++-- scripts/build.ps1 | 14 +++++-- scripts/pack.ps1 | 1 + scripts/utils.ps1 | 16 +++----- 8 files changed, 23 insertions(+), 94 deletions(-) diff --git a/.gitignore b/.gitignore index 8719d1c..e07f9d2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ vendor/* config/.history Thumbs.db *.exe +build/ \ No newline at end of file diff --git a/Cmder.exe b/Cmder.exe index 4bb4df18c642232c9206fb22e24ee6950f154b8a..cf73c3bfafbe312f45dd8c3bd152850d6b7aa5a8 100644 GIT binary patch delta 6465 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 O3}+0I;aFNuAM?Nchw0V; delta 6643 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 diff --git a/launcher/CmderLauncher.sln b/launcher/CmderLauncher.sln index 87a82bd..e130cc2 100644 --- a/launcher/CmderLauncher.sln +++ b/launcher/CmderLauncher.sln @@ -8,19 +8,13 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - DebugXP|Win32 = DebugXP|Win32 Release|Win32 = Release|Win32 - ReleaseXP|Win32 = ReleaseXP|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|Win32.ActiveCfg = Debug|Win32 {4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|Win32.Build.0 = Debug|Win32 - {4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.DebugXP|Win32.ActiveCfg = DebugXP|Win32 - {4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.DebugXP|Win32.Build.0 = DebugXP|Win32 {4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|Win32.ActiveCfg = Release|Win32 {4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|Win32.Build.0 = Release|Win32 - {4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32 - {4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/launcher/CmderLauncher.vcxproj b/launcher/CmderLauncher.vcxproj index 1c860bc..f4ab5c3 100644 --- a/launcher/CmderLauncher.vcxproj +++ b/launcher/CmderLauncher.vcxproj @@ -1,18 +1,10 @@  - - DebugXP - Win32 - Debug Win32 - - ReleaseXP - Win32 - Release Win32 @@ -30,12 +22,6 @@ v120 Unicode - - Application - true - v120_xp - Unicode - Application false @@ -43,45 +29,24 @@ true Unicode - - Application - false - v120_xp - true - Unicode - - - - - - - true Cmder - - true - Cmder - false Cmder - - false - Cmder - @@ -96,20 +61,6 @@ true - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;XP;%(PreprocessorDefinitions) - true - - - Windows - true - - Level3 @@ -132,28 +83,6 @@ copy $(TargetPath) $(SolutionDir)..\$(TargetFileName) - - - Level3 - - - MinSpace - true - false - WIN32;NDEBUG;_WINDOWS;XP;%(PreprocessorDefinitions) - true - Size - - - Windows - true - true - true - - - copy $(TargetPath) $(SolutionDir)..\$(TargetFileName) - - diff --git a/launcher/src/CmderLauncher.cpp b/launcher/src/CmderLauncher.cpp index b1055da..fcdeb60 100644 --- a/launcher/src/CmderLauncher.cpp +++ b/launcher/src/CmderLauncher.cpp @@ -12,6 +12,8 @@ #define USE_TASKBAR_API (_WIN32_WINNT >= _WIN32_WINNT_WIN7) +#define XP (_WIN32_WINNT < _WIN32_WINNT_VISTA) + #define MB_TITLE L"Cmder Launcher" #define SHELL_MENU_REGISTRY_PATH_BACKGROUND L"Directory\\Background\\shell\\Cmder" #define SHELL_MENU_REGISTRY_PATH_LISTITEM L"Directory\\shell\\Cmder" @@ -205,12 +207,10 @@ void UnregisterShellMenu(std::wstring opt, wchar_t* keyBaseName) FAIL_ON_ERROR( RegCreateKeyEx(root, keyBaseName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL)); -#ifdef XP +#if XP FAIL_ON_ERROR(SHDeleteKey(cmderKey, NULL)); - FAIL_ON_ERROR(SHDeleteKey(root, SHELL_MENU_REGISTRY_PATH)); #else - FAIL_ON_ERROR(RegDeleteTree(cmderKey, NULL));); - FAIL_ON_ERROR(RegDeleteKey(root, SHELL_MENU_REGISTRY_PATH)); + FAIL_ON_ERROR(RegDeleteTree(cmderKey, NULL)); #endif RegCloseKey(cmderKey); RegCloseKey(root); diff --git a/scripts/build.ps1 b/scripts/build.ps1 index b0e636f..f4a908e 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -37,8 +37,11 @@ Param( # Path to the vendor configuration source file [string]$sourcesPath = "..\vendor\sources.json", - # Vendor folder locaton - [string]$saveTo = "..\vendor\" + # Vendor folder location + [string]$saveTo = "..\vendor\", + + # Launcher folder location + [string]$launcher = "..\launcher" ) . "$PSScriptRoot\utils.ps1" @@ -68,4 +71,9 @@ foreach ($s in $sources) { } Pop-Location -Write-Verbose "All good and done!" \ No newline at end of file + +Push-Location -Path $launcher +msbuild CmderLauncher.vcxproj /p:configuration=Release +Pop-Location + +Write-Verbose "All good and done!" diff --git a/scripts/pack.ps1 b/scripts/pack.ps1 index 9d3a32b..78e8af7 100644 --- a/scripts/pack.ps1 +++ b/scripts/pack.ps1 @@ -37,6 +37,7 @@ Param( . "$PSScriptRoot\utils.ps1" $ErrorActionPreference = "Stop" +Ensure-Executable "7z" $targets = @{ "cmder.zip" = $null; diff --git a/scripts/utils.ps1 b/scripts/utils.ps1 index 4b5165b..2835ac9 100644 --- a/scripts/utils.ps1 +++ b/scripts/utils.ps1 @@ -1,17 +1,13 @@ -function Ensure-Exists ($path) { - if (-not (Test-Path $path)) { - Write-Error "Missing required $path! Ensure it is installed" - exit 1 - } - return $true > $null -} - function Ensure-Executable ($command) { try { Get-Command $command -ErrorAction Stop > $null } catch { - if( ($command -eq "7z") -and (Ensure-Exists "$env:programfiles\7-zip\7z.exe") ){ + If( ($command -eq "7z") -and (Test-Path "$env:programfiles\7-zip\7z.exe") ){ set-alias -Name "7z" -Value "$env:programfiles\7-zip\7z.exe" -Scope script - } else { + } + ElseIf( ($command -eq "7z") -and (Test-Path "$env:programw6432\7-zip\7z.exe") ) { + set-alias -Name "7z" -Value "$env:programw6432\7-zip\7z.exe" -Scope script + } + Else { Write-Error "Missing $command! Ensure it is installed and on in the PATH" exit 1 }