From 50dc8ae605a6af615c54db4863c6fb54308a3006 Mon Sep 17 00:00:00 2001 From: Jose Vicente Campos Date: Sun, 9 Jan 2022 10:51:04 +0100 Subject: [PATCH] prepare release 2.6.2 --- bin/config/config.xml | 4 ++-- bin/packages/nfc-lab/meta/package.xml | 6 +++--- build-installer.ps1 | 2 +- src/nfc-app/app-qt/CMakeLists.txt | 4 ++-- src/nfc-lib/lib-rt/rt-lang/src/main/cpp/Logger.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/config/config.xml b/bin/config/config.xml index 35bed75..251c9fd 100644 --- a/bin/config/config.xml +++ b/bin/config/config.xml @@ -1,7 +1,7 @@ - NFC Laboratory 2.6.0 - josevcm@gmail.com - 2.6.0 + NFC Laboratory 2.6.2 - josevcm@gmail.com + 2.6.2 NFC Laboratory Installer Jose Vicente Campos Martinez NFC Laboratory diff --git a/bin/packages/nfc-lab/meta/package.xml b/bin/packages/nfc-lab/meta/package.xml index 74714c2..c6b0fe0 100644 --- a/bin/packages/nfc-lab/meta/package.xml +++ b/bin/packages/nfc-lab/meta/package.xml @@ -1,9 +1,9 @@ - NFC Laboratory 2.6.0 - josevcm@gmail.com + NFC Laboratory 2.6.2 - josevcm@gmail.com NFC Laboratory Package Installer - 2.6.0 - 2021-11-21 + 2.6.2 + 2022-01-09 diff --git a/build-installer.ps1 b/build-installer.ps1 index 187e2bd..f2835d3 100644 --- a/build-installer.ps1 +++ b/build-installer.ps1 @@ -23,4 +23,4 @@ windeployqt.exe --debug --force --compiler-runtime --no-translations --no-system # windeployqt.exe --release --force --compiler-runtime --no-translations --no-system-d3d-compiler --no-angle --no-opengl-sw $BuildPath/packages/nfc-lab/data/nfc-lab.exe # Create QT installer -binarycreator.exe -c $BuildPath/config/config.xml -p $BuildPath/packages $BuildPath/nfc-lab-2.6.0-x86_64.exe +binarycreator.exe -c $BuildPath/config/config.xml -p $BuildPath/packages $BuildPath/nfc-lab-2.6.2-x86_64.exe diff --git a/src/nfc-app/app-qt/CMakeLists.txt b/src/nfc-app/app-qt/CMakeLists.txt index 507d779..9dca7e6 100644 --- a/src/nfc-app/app-qt/CMakeLists.txt +++ b/src/nfc-app/app-qt/CMakeLists.txt @@ -8,8 +8,8 @@ set(PRIVATE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp) find_package(Qt5 COMPONENTS Core Widgets PrintSupport OpenGL REQUIRED) -#add_executable(nfc-lab WIN32 -add_executable(nfc-lab +add_executable(nfc-lab WIN32 +#add_executable(nfc-lab src/main/cpp/main.cpp src/main/cpp/main.rc src/main/cpp/QtApplication.cpp diff --git a/src/nfc-lib/lib-rt/rt-lang/src/main/cpp/Logger.cpp b/src/nfc-lib/lib-rt/rt-lang/src/main/cpp/Logger.cpp index d57d694..1266199 100644 --- a/src/nfc-lib/lib-rt/rt-lang/src/main/cpp/Logger.cpp +++ b/src/nfc-lib/lib-rt/rt-lang/src/main/cpp/Logger.cpp @@ -43,8 +43,8 @@ //#define NULL_LOG //#define STDERR_LOG -#define STDOUT_LOG -//#define FSTREAM_LOG +//#define STDOUT_LOG +#define FSTREAM_LOG namespace rt {