Skip to content

Commit

Permalink
build of the help file is no longer required
Browse files Browse the repository at this point in the history
moved in a new project named help
  • Loading branch information
cbucher committed Feb 25, 2016
1 parent d9bf683 commit bcf8bc3
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 414 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ obj/
ipch/
help/console.chm
help/html/changelog.html
help/xx*

*.aps
*.user
Expand Down
280 changes: 0 additions & 280 deletions Console/Console.vcxproj

Large diffs are not rendered by default.

108 changes: 0 additions & 108 deletions Console/Console.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,6 @@
<UniqueIdentifier>{4489e1b3-a800-45a7-8ae5-ca49ea815733}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;jpg;jpeg;jpe;manifest</Extensions>
</Filter>
<Filter Include="Help Files">
<UniqueIdentifier>{cc4765aa-179c-439b-83ac-a4bb303faca5}</UniqueIdentifier>
</Filter>
<Filter Include="Help Files\html">
<UniqueIdentifier>{44a4528b-d8da-4212-aa2b-1f4888f80c0a}</UniqueIdentifier>
</Filter>
<Filter Include="Help Files\html\styles">
<UniqueIdentifier>{5fe3ba1d-76b1-443d-a80c-c5a24a502a52}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\shared">
<UniqueIdentifier>{8c14276e-e91a-4f46-8dd5-975b3b0c355f}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -286,120 +277,21 @@
<None Include="res\Console.ico">
<Filter>Resource Files</Filter>
</None>
<None Include="..\help\console.hhc">
<Filter>Help Files</Filter>
</None>
<None Include="..\help\console.hhk">
<Filter>Help Files</Filter>
</None>
<None Include="..\help\html\acknowledgements.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\changelog.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\copyright.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\gpl.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\introduction.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\language.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\menus.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\running.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_appearance.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_appearance_more.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_behavior.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_console.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_hotkeys.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_mouse.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_tabs.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\tips_tricks.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\styles\help.css">
<Filter>Help Files\html\styles</Filter>
</None>
<None Include="..\setup\config\console.xml">
<Filter>Resource Files</Filter>
</None>
<None Include="..\help\html\settings_appearance_fullscreen.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_tabs_background.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_tabs_colors.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_tabs_main.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_appearance_font.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_appearance_styles.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_behavior_more.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\text_formatting.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\credentials.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="res\Toolbar.rc2">
<Filter>Resource Files</Filter>
</None>
<None Include="res\SearchBar.rc2">
<Filter>Resource Files</Filter>
</None>
<None Include="..\help\html\settings_appearance_transparency.html">
<Filter>Help Files\html</Filter>
</None>
<None Include="..\help\html\settings_tabs_environment.html">
<Filter>Help Files\html</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Console.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\help\console.hhp">
<Filter>Help Files</Filter>
</CustomBuild>
<CustomBuild Include="..\README.md" />
</ItemGroup>
<ItemGroup>
<Image Include="res\fullscreen1_16.bmp">
<Filter>Resource Files</Filter>
Expand Down
22 changes: 16 additions & 6 deletions ConsoleZ.sln
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DA1A8A1D-90C0-49B9-A9B2-DF2C574F19E6}"
ProjectSection(SolutionItems) = preProject
todo.txt = todo.txt
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConsoleHook", "ConsoleHook\ConsoleHook.vcxproj", "{69234D74-7133-48FF-8DDB-9901FFC4D7FF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Console", "Console\Console.vcxproj", "{6EA5C354-A242-49F3-88D1-559EACA7FB8A}"
ProjectSection(ProjectDependencies) = postProject
{69234D74-7133-48FF-8DDB-9901FFC4D7FF} = {69234D74-7133-48FF-8DDB-9901FFC4D7FF}
{8A25E8AF-CC4A-4145-B878-3D99271562D4} = {8A25E8AF-CC4A-4145-B878-3D99271562D4}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConsoleWow", "ConsoleWow\ConsoleWow.vcxproj", "{8A25E8AF-CC4A-4145-B878-3D99271562D4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Packaging", "Packaging\Packaging.vcxproj", "{10FD8ABB-2ACC-4EE3-8915-CD0DE3E7809D}"
ProjectSection(ProjectDependencies) = postProject
{4A84CC27-64C4-436F-AA9F-D4A4A3D4835E} = {4A84CC27-64C4-436F-AA9F-D4A4A3D4835E}
{6EA5C354-A242-49F3-88D1-559EACA7FB8A} = {6EA5C354-A242-49F3-88D1-559EACA7FB8A}
{69234D74-7133-48FF-8DDB-9901FFC4D7FF} = {69234D74-7133-48FF-8DDB-9901FFC4D7FF}
{8A25E8AF-CC4A-4145-B878-3D99271562D4} = {8A25E8AF-CC4A-4145-B878-3D99271562D4}
Expand All @@ -24,6 +24,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Packaging", "Packaging\Pack
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "l10n", "l10n\l10n.vcxproj", "{86262ED4-F5D5-4199-9BE3-D8C86054CD12}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "help", "help\help.vcxproj", "{4A84CC27-64C4-436F-AA9F-D4A4A3D4835E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug Legacy|Win32 = Debug Legacy|Win32
Expand Down Expand Up @@ -96,6 +98,14 @@ Global
{86262ED4-F5D5-4199-9BE3-D8C86054CD12}.Release Legacy|x64.ActiveCfg = Release Legacy|Win32
{86262ED4-F5D5-4199-9BE3-D8C86054CD12}.Release|Win32.ActiveCfg = Release|Win32
{86262ED4-F5D5-4199-9BE3-D8C86054CD12}.Release|x64.ActiveCfg = Release|Win32
{4A84CC27-64C4-436F-AA9F-D4A4A3D4835E}.Debug Legacy|Win32.ActiveCfg = Release|Win32
{4A84CC27-64C4-436F-AA9F-D4A4A3D4835E}.Debug Legacy|x64.ActiveCfg = Release|Win32
{4A84CC27-64C4-436F-AA9F-D4A4A3D4835E}.Debug|Win32.ActiveCfg = Release|Win32
{4A84CC27-64C4-436F-AA9F-D4A4A3D4835E}.Debug|x64.ActiveCfg = Release|Win32
{4A84CC27-64C4-436F-AA9F-D4A4A3D4835E}.Release Legacy|Win32.ActiveCfg = Release|Win32
{4A84CC27-64C4-436F-AA9F-D4A4A3D4835E}.Release Legacy|x64.ActiveCfg = Release|Win32
{4A84CC27-64C4-436F-AA9F-D4A4A3D4835E}.Release|Win32.ActiveCfg = Release|Win32
{4A84CC27-64C4-436F-AA9F-D4A4A3D4835E}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
20 changes: 0 additions & 20 deletions Packaging/Packaging.vcxproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
Expand All @@ -18,11 +14,6 @@
<Keyword>MakeFileProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
Expand All @@ -31,21 +22,10 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<NMakeBuildCommandLine>nmake release</NMakeBuildCommandLine>
<NMakeCleanCommandLine>nmake clean</NMakeCleanCommandLine>
<NMakeReBuildCommandLine>nmake release /A</NMakeReBuildCommandLine>
<NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<OutDir>..\bin\$(Platform)\$(Configuration)\</OutDir>
<IntDir>..\obj\$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<NMakeBuildCommandLine>nmake release</NMakeBuildCommandLine>
<NMakeCleanCommandLine>nmake clean</NMakeCleanCommandLine>
Expand Down
5 changes: 5 additions & 0 deletions Packaging/makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
!INCLUDE ../shared/version.h

release:
@echo "copy help file"
@xcopy "$(MAKEDIR)\..\help\console.chm" "$(MAKEDIR)\..\bin\Win32\Release\*" /F /Y
@xcopy "$(MAKEDIR)\..\help\console.chm" "$(MAKEDIR)\..\bin\Win32\Release Legacy\*" /F /Y
@xcopy "$(MAKEDIR)\..\help\console.chm" "$(MAKEDIR)\..\bin\x64\Release\*" /F /Y
@xcopy "$(MAKEDIR)\..\help\console.chm" "$(MAKEDIR)\..\bin\x64\Release Legacy\*" /F /Y
@echo "$(MAKEDIR)\..\bin\ConsoleZ.$(VERSION).7z"
"C:\Program Files\7-Zip\7z.exe" a -t7z -m9=lzma2 -mx -mmt2 "$(MAKEDIR)\..\bin\ConsoleZ.$(VERSION).7z" -xr!*.xml "$(MAKEDIR)\..\bin\Win32" "$(MAKEDIR)\..\bin\x64" "$(MAKEDIR)\..\bin\l10n"
@echo "$(MAKEDIR)\..\bin\ConsoleZ.x86.$(VERSION).zip"
Expand Down

0 comments on commit bcf8bc3

Please sign in to comment.