Skip to content

Commit

Permalink
Show version as major.minor.build.revision, restore /x, refactoring
Browse files Browse the repository at this point in the history
1. Show the version in the UI as major.minor.build.revision, for compatibility with the OS and for the future.
2. Restore the /x parameter - disable exception handling (for ease of development and debugging).
3. Refactoring.
  • Loading branch information
alabuzhev committed Aug 31, 2020
1 parent ed5119a commit 05449c0
Show file tree
Hide file tree
Showing 47 changed files with 1,863 additions and 983 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
@@ -1,6 +1,9 @@
language: bash
os: windows

install:
- choco install visualstudio2019buildtools --package-parameters "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64"

env:
- COMPILER=MSVC_PROJ PLATFORM=x64 CONFIG=Debug
- COMPILER=MSVC_PROJ PLATFORM=x64 CONFIG=Release
Expand Down
6 changes: 3 additions & 3 deletions _build/ci/travis/build.cmd
Expand Up @@ -5,7 +5,7 @@
goto :main

:MSVC_PROJ
set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin;%PATH%
set PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin;%PATH%

cd far
MSBuild.exe /property:Configuration=%CONFIG% /property:Platform=%PLATFORM% far.vcxproj || %throw%
Expand All @@ -14,7 +14,7 @@ MSBuild.exe /property:Configuration=%CONFIG% /property:Platform=%PLATFORM% far.v


:MSVC_NMAKE
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars%PLATFORM:~-2%.bat" || %throw%
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars%PLATFORM:~-2%.bat" || %throw%
if %CONFIG%==Debug set DEBUG=1

rem print version
Expand All @@ -32,7 +32,7 @@ cd ..


:CLANG_NMAKE
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars%PLATFORM:~-2%.bat" || %throw%
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars%PLATFORM:~-2%.bat" || %throw%
set PATH=C:\Program Files\LLVM\bin;%PATH%
set CLANG=1
if %CONFIG%==Debug set DEBUG=1
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Expand Up @@ -13,7 +13,7 @@ pr:
- master

pool:
vmImage: 'VS2017-Win2016'
vmImage: 'windows-2019'

variables:
solution: 'far/far.sln'
Expand Down
5 changes: 4 additions & 1 deletion far/FarEng.hlf.m4
Expand Up @@ -268,6 +268,10 @@ title.
#-set:<parameter>=<value>#
Override the configuration parameter, see ~far:config~@FarConfig@ for details.

#-x#
Disable exception handling. This parameter is for developers
and is not recommended for normal operations.

It is possible to specify at most two paths (to folders, files or archives) or
two commands with plugin prefix in the command line. The first path applies to the
active panel, the second path - to the passive one:
Expand Down Expand Up @@ -2550,7 +2554,6 @@ Otherwise you can choose any desired icon in the Far shourtcut properties.
Additional information, displayed in the window title.
Can contain any text, including environment variables (e.g. "%USERDOMAIN%\%USERNAME%") and the following special variables:
- #%Ver# - Far version;
- #%Build# - Far build number;
- #%Platform# - Far platform;
- #%Admin# - ^<wrap>"Administrator" if running as administrator, otherwise an empty string.
- #%PID# - Far process ID;
Expand Down
5 changes: 4 additions & 1 deletion far/FarHun.hlf.m4
Expand Up @@ -278,6 +278,10 @@ title.
#-set:<parameter>=<value>#
Override the configuration parameter, see ~far:config~@FarConfig@ for details.

#-x#
Disable exception handling. This parameter is for developers
and is not recommended for normal operations.

A parancssorban megadható legfeljebb két olyan elérési út, ami mappára,
fájlra vagy tömörített fájlra mutat. Az első elérési út az aktív, a második a
passzív panelre vonatkozik:
Expand Down Expand Up @@ -2629,7 +2633,6 @@ Otherwise you can choose any desired icon in the Far shourtcut properties.
Additional information, displayed in the window title.
Can contain any text, including environment variables (e.g. "%USERDOMAIN%\%USERNAME%") and the following special variables:
- #%Ver# - Far version;
- #%Build# - Far build number;
- #%Platform# - Far platform;
- #%Admin# - ^<wrap>"Administrator" if running as administrator, otherwise an empty string.
- #%PID# - Far process ID;
Expand Down
5 changes: 4 additions & 1 deletion far/FarPol.hlf.m4
Expand Up @@ -274,6 +274,10 @@ zastąpione standardowym tekstem okna Far, zależnym od kontekstu programu.
#-set:<parametr>=<wartość>#
Nadpisuje parametr konfiguracyjny, zobacz szczegóły w ~far:config~@Konfiguracji FAR@.

#-x#
Disable exception handling. This parameter is for developers
and is not recommended for normal operations.

Istnieje możliwość podania maksymalnie dwóch ścieżek (do folderów, plików lub archiwów)
lub dwóch poleceń z przedrostkami wtyczek w linii poleceń. Pierwsza ścieżka dotyczy
panelu aktywnego, druga - panelu pasywnego:
Expand Down Expand Up @@ -2540,7 +2544,6 @@ Otherwise you can choose any desired icon in the Far shourtcut properties.
Additional information, displayed in the window title.
Can contain any text, including environment variables (e.g. "%USERDOMAIN%\%USERNAME%") and the following special variables:
- #%Ver# - Far version;
- #%Build# - Far build number;
- #%Platform# - Far platform;
- #%Admin# - ^<wrap>"Administrator" if running as administrator, otherwise an empty string.
- #%PID# - Far process ID;
Expand Down
5 changes: 4 additions & 1 deletion far/FarRus.hlf.m4
Expand Up @@ -286,6 +286,10 @@ $ #Far: параметры командной строки#
#-set:<parameter>=<value>#
Изменить значение конфигурационного параметра. См. ~far:config~@FarConfig@.

#-x#
Отключить обработку исключительных ситуаций. Параметр предназначен для разработчиков
и не рекомендуется в обычных ситуациях.

В командной строке можно указать не более двух путей (к каталогам, файлам, архивам)
или двух команд с префиксом плагина. Первый путь для активной панели, второй - для пассивной:
- ^<wrap>для каталогов и архивов Far покажет их содержимое;
Expand Down Expand Up @@ -2591,7 +2595,6 @@ $ #Настройка интерфейса#
Дополнительная информация, выводимая в заголовке окна консоли.
Может содержать любой текст, включая переменные окружения (например "%USERDOMAIN%\%USERNAME%") и следующие специальные переменные:
- #%Ver# - версия Far;
- #%Build# - номер сборки Far;
- #%Platform# - архитектура Far;
- #%Admin# - ^<wrap>слово "Администратор", если Far запущен от имени администратора, иначе пустая строка.
- #%PID# - ИД текущего процесса Far;
Expand Down

0 comments on commit 05449c0

Please sign in to comment.