Skip to content

Commit 8c6847e

Browse files
MartiUKMartiUK
committed
Merge branch 'development'
2 parents 72c045d + f66f598 commit 8c6847e

File tree

9 files changed

+24
-95
lines changed

9 files changed

+24
-95
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ vendor/*
99
config/.history
1010
Thumbs.db
1111
*.exe
12+
build/

‎Cmder.exe

-512 Bytes
Binary file not shown.

‎Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Cmder
22

3-
Latest release is **[v1.1.3](https://github.com/bliker/cmder/releases/tag/v1.1.3)**
3+
Latest release is **[v1.1.4](https://github.com/bliker/cmder/releases/tag/v1.1.4)**
44

55
Cmder is a **software package** created out of pure frustration over absence of usable console emulator on Windows. It is based on [ConEmu](https://code.google.com/p/conemu-maximus5/) with *major* config overhaul. Monokai color scheme, amazing [clink](https://github.com/mridgers/clink) and custom prompt layout.
66

‎launcher/CmderLauncher.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,13 @@ EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Win32 = Debug|Win32
11-
DebugXP|Win32 = DebugXP|Win32
1211
Release|Win32 = Release|Win32
13-
ReleaseXP|Win32 = ReleaseXP|Win32
1412
EndGlobalSection
1513
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1614
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|Win32.ActiveCfg = Debug|Win32
1715
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Debug|Win32.Build.0 = Debug|Win32
18-
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.DebugXP|Win32.ActiveCfg = DebugXP|Win32
19-
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.DebugXP|Win32.Build.0 = DebugXP|Win32
2016
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|Win32.ActiveCfg = Release|Win32
2117
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.Release|Win32.Build.0 = Release|Win32
22-
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.ReleaseXP|Win32.ActiveCfg = ReleaseXP|Win32
23-
{4A8485A5-B7DD-4C44-B7F6-3E2765DD0CD3}.ReleaseXP|Win32.Build.0 = ReleaseXP|Win32
2418
EndGlobalSection
2519
GlobalSection(SolutionProperties) = preSolution
2620
HideSolutionNode = FALSE

‎launcher/CmderLauncher.vcxproj

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="DebugXP|Win32">
5-
<Configuration>DebugXP</Configuration>
6-
<Platform>Win32</Platform>
7-
</ProjectConfiguration>
84
<ProjectConfiguration Include="Debug|Win32">
95
<Configuration>Debug</Configuration>
106
<Platform>Win32</Platform>
117
</ProjectConfiguration>
12-
<ProjectConfiguration Include="ReleaseXP|Win32">
13-
<Configuration>ReleaseXP</Configuration>
14-
<Platform>Win32</Platform>
15-
</ProjectConfiguration>
168
<ProjectConfiguration Include="Release|Win32">
179
<Configuration>Release</Configuration>
1810
<Platform>Win32</Platform>
@@ -30,58 +22,31 @@
3022
<PlatformToolset>v120</PlatformToolset>
3123
<CharacterSet>Unicode</CharacterSet>
3224
</PropertyGroup>
33-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="Configuration">
34-
<ConfigurationType>Application</ConfigurationType>
35-
<UseDebugLibraries>true</UseDebugLibraries>
36-
<PlatformToolset>v120_xp</PlatformToolset>
37-
<CharacterSet>Unicode</CharacterSet>
38-
</PropertyGroup>
3925
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4026
<ConfigurationType>Application</ConfigurationType>
4127
<UseDebugLibraries>false</UseDebugLibraries>
4228
<PlatformToolset>v120</PlatformToolset>
4329
<WholeProgramOptimization>true</WholeProgramOptimization>
4430
<CharacterSet>Unicode</CharacterSet>
4531
</PropertyGroup>
46-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="Configuration">
47-
<ConfigurationType>Application</ConfigurationType>
48-
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v120_xp</PlatformToolset>
50-
<WholeProgramOptimization>true</WholeProgramOptimization>
51-
<CharacterSet>Unicode</CharacterSet>
52-
</PropertyGroup>
5332
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5433
<ImportGroup Label="ExtensionSettings">
5534
</ImportGroup>
5635
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5736
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
5837
</ImportGroup>
59-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'" Label="PropertySheets">
60-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
61-
</ImportGroup>
6238
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
6339
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6440
</ImportGroup>
65-
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'" Label="PropertySheets">
66-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
67-
</ImportGroup>
6841
<PropertyGroup Label="UserMacros" />
6942
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7043
<LinkIncremental>true</LinkIncremental>
7144
<TargetName>Cmder</TargetName>
7245
</PropertyGroup>
73-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">
74-
<LinkIncremental>true</LinkIncremental>
75-
<TargetName>Cmder</TargetName>
76-
</PropertyGroup>
7746
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7847
<LinkIncremental>false</LinkIncremental>
7948
<TargetName>Cmder</TargetName>
8049
</PropertyGroup>
81-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">
82-
<LinkIncremental>false</LinkIncremental>
83-
<TargetName>Cmder</TargetName>
84-
</PropertyGroup>
8550
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8651
<ClCompile>
8752
<PrecompiledHeader>
@@ -96,20 +61,6 @@
9661
<GenerateDebugInformation>true</GenerateDebugInformation>
9762
</Link>
9863
</ItemDefinitionGroup>
99-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugXP|Win32'">
100-
<ClCompile>
101-
<PrecompiledHeader>
102-
</PrecompiledHeader>
103-
<WarningLevel>Level3</WarningLevel>
104-
<Optimization>Disabled</Optimization>
105-
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;XP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106-
<SDLCheck>true</SDLCheck>
107-
</ClCompile>
108-
<Link>
109-
<SubSystem>Windows</SubSystem>
110-
<GenerateDebugInformation>true</GenerateDebugInformation>
111-
</Link>
112-
</ItemDefinitionGroup>
11364
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
11465
<ClCompile>
11566
<WarningLevel>Level3</WarningLevel>
@@ -132,28 +83,6 @@
13283
<Command>copy $(TargetPath) $(SolutionDir)..\$(TargetFileName)</Command>
13384
</PostBuildEvent>
13485
</ItemDefinitionGroup>
135-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseXP|Win32'">
136-
<ClCompile>
137-
<WarningLevel>Level3</WarningLevel>
138-
<PrecompiledHeader>
139-
</PrecompiledHeader>
140-
<Optimization>MinSpace</Optimization>
141-
<FunctionLevelLinking>true</FunctionLevelLinking>
142-
<IntrinsicFunctions>false</IntrinsicFunctions>
143-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;XP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144-
<SDLCheck>true</SDLCheck>
145-
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
146-
</ClCompile>
147-
<Link>
148-
<SubSystem>Windows</SubSystem>
149-
<GenerateDebugInformation>true</GenerateDebugInformation>
150-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
151-
<OptimizeReferences>true</OptimizeReferences>
152-
</Link>
153-
<PostBuildEvent>
154-
<Command>copy $(TargetPath) $(SolutionDir)..\$(TargetFileName)</Command>
155-
</PostBuildEvent>
156-
</ItemDefinitionGroup>
15786
<ItemGroup>
15887
<ResourceCompile Include="src\Resource.rc" />
15988
</ItemGroup>

‎launcher/src/CmderLauncher.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
#define USE_TASKBAR_API (_WIN32_WINNT >= _WIN32_WINNT_WIN7)
1414

15+
#define XP (_WIN32_WINNT < _WIN32_WINNT_VISTA)
16+
1517
#define MB_TITLE L"Cmder Launcher"
1618
#define SHELL_MENU_REGISTRY_PATH_BACKGROUND L"Directory\\Background\\shell\\Cmder"
1719
#define SHELL_MENU_REGISTRY_PATH_LISTITEM L"Directory\\shell\\Cmder"
@@ -205,12 +207,10 @@ void UnregisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
205207
FAIL_ON_ERROR(
206208
RegCreateKeyEx(root, keyBaseName, 0, NULL,
207209
REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));
208-
#ifdef XP
210+
#if XP
209211
FAIL_ON_ERROR(SHDeleteKey(cmderKey, NULL));
210-
FAIL_ON_ERROR(SHDeleteKey(root, SHELL_MENU_REGISTRY_PATH));
211212
#else
212-
FAIL_ON_ERROR(RegDeleteTree(cmderKey, NULL)););
213-
FAIL_ON_ERROR(RegDeleteKey(root, SHELL_MENU_REGISTRY_PATH));
213+
FAIL_ON_ERROR(RegDeleteTree(cmderKey, NULL));
214214
#endif
215215
RegCloseKey(cmderKey);
216216
RegCloseKey(root);

‎scripts/build.ps1

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@ Param(
3737
# Path to the vendor configuration source file
3838
[string]$sourcesPath = "..\vendor\sources.json",
3939

40-
# Vendor folder locaton
41-
[string]$saveTo = "..\vendor\"
40+
# Vendor folder location
41+
[string]$saveTo = "..\vendor\",
42+
43+
# Launcher folder location
44+
[string]$launcher = "..\launcher"
4245
)
4346

4447
. "$PSScriptRoot\utils.ps1"
@@ -68,4 +71,9 @@ foreach ($s in $sources) {
6871
}
6972

7073
Pop-Location
71-
Write-Verbose "All good and done!"
74+
75+
Push-Location -Path $launcher
76+
msbuild CmderLauncher.vcxproj /p:configuration=Release
77+
Pop-Location
78+
79+
Write-Verbose "All good and done!"

‎scripts/pack.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Param(
3737

3838
. "$PSScriptRoot\utils.ps1"
3939
$ErrorActionPreference = "Stop"
40+
Ensure-Executable "7z"
4041

4142
$targets = @{
4243
"cmder.zip" = $null;

‎scripts/utils.ps1

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
function Ensure-Exists ($path) {
2-
if (-not (Test-Path $path)) {
3-
Write-Error "Missing required $path! Ensure it is installed"
4-
exit 1
5-
}
6-
return $true > $null
7-
}
8-
91
function Ensure-Executable ($command) {
102
try { Get-Command $command -ErrorAction Stop > $null }
113
catch {
12-
if( ($command -eq "7z") -and (Ensure-Exists "$env:programfiles\7-zip\7z.exe") ){
4+
If( ($command -eq "7z") -and (Test-Path "$env:programfiles\7-zip\7z.exe") ){
135
set-alias -Name "7z" -Value "$env:programfiles\7-zip\7z.exe" -Scope script
14-
} else {
6+
}
7+
ElseIf( ($command -eq "7z") -and (Test-Path "$env:programw6432\7-zip\7z.exe") ) {
8+
set-alias -Name "7z" -Value "$env:programw6432\7-zip\7z.exe" -Scope script
9+
}
10+
Else {
1511
Write-Error "Missing $command! Ensure it is installed and on in the PATH"
1612
exit 1
1713
}

0 commit comments

Comments
 (0)