rename target from nfc-spy to nfc-lab

Author: josevcm

.github/workflows/cmake-ubuntu.yml

@@ -44,4 +44,4 @@ jobs:
 
     - name: 'Build project'
       run: |
-        cmake --build ${{ steps.strings.outputs.build-dir }} --target nfc-spy --parallel ${{ steps.strings.outputs.cpu-count }} 
+        cmake --build ${{ steps.strings.outputs.build-dir }} --target nfc-lab --parallel ${{ steps.strings.outputs.cpu-count }} 

.github/workflows/cmake-windows.yml

@@ -34,8 +34,8 @@ jobs:
         echo "mingw-dir=${{ github.workspace }}/tools/mingw1310_64" >> "$GITHUB_OUTPUT"
         echo "installer-dir=${{ github.workspace }}/tools/QtInstallerFramework/4.7" >> "$GITHUB_OUTPUT"
         echo "package-dir=${{ github.workspace }}/build/installer/package" >> "$GITHUB_OUTPUT"
-        echo "package-data-dir=${{ github.workspace }}/build/installer/package/org.josevcm.nfc-spy/data" >> "$GITHUB_OUTPUT"
-        echo "package-meta-dir=${{ github.workspace }}/build/installer/package/org.josevcm.nfc-spy/meta" >> "$GITHUB_OUTPUT"
+        echo "package-data-dir=${{ github.workspace }}/build/installer/package/org.josevcm.nfc-lab/data" >> "$GITHUB_OUTPUT"
+        echo "package-meta-dir=${{ github.workspace }}/build/installer/package/org.josevcm.nfc-lab/meta" >> "$GITHUB_OUTPUT"
         echo "cpu-count=4" >> "$GITHUB_OUTPUT"
 
     - name: 'Cache dependencies'
@@ -74,7 +74,7 @@ jobs:
       run: |
         ${{ steps.strings.outputs.cmake-dir }}/bin/cmake `
           --build ${{ steps.strings.outputs.build-dir }} `
-          --target nfc-spy --parallel ${{ steps.strings.outputs.cpu-count }} 
+          --target nfc-lab --parallel ${{ steps.strings.outputs.cpu-count }} 
         
     - name: 'Create installer'
       run: |
@@ -83,7 +83,7 @@ jobs:
         New-Item -Force -ItemType "directory" -Path ${{ steps.strings.outputs.package-meta-dir }}
 
         # copy executable and libraries
-        Copy-Item -Force ${{ steps.strings.outputs.build-dir }}/src/nfc-app/app-qt/nfc-spy.exe ${{ steps.strings.outputs.package-data-dir }}
+        Copy-Item -Force ${{ steps.strings.outputs.build-dir }}/src/nfc-app/app-qt/nfc-lab.exe ${{ steps.strings.outputs.package-data-dir }}
         Copy-Item -Force ${{ steps.strings.outputs.mingw-dir }}/bin/*.dll ${{ steps.strings.outputs.package-data-dir }}
         Copy-Item -Force ${{ github.workspace }}/dll/airspy/x86_64/bin/*.dll ${{ steps.strings.outputs.package-data-dir }}
         Copy-Item -Force ${{ github.workspace }}/dll/openssl/x86_64/bin/*.dll ${{ steps.strings.outputs.package-data-dir }}
@@ -105,20 +105,20 @@ jobs:
           --no-translations `
           --no-system-d3d-compiler `
           --no-opengl-sw `
-          ${{ steps.strings.outputs.package-data-dir }}/nfc-spy.exe
+          ${{ steps.strings.outputs.package-data-dir }}/nfc-lab.exe
 
         # create installer
         ${{ steps.strings.outputs.installer-dir }}/bin/binarycreator `
           --verbose `
           -c ${{ steps.strings.outputs.build-dir }}/installer/config/config.xml `
           -p ${{ steps.strings.outputs.package-dir }} `
-          ${{ steps.strings.outputs.build-dir }}/nfc-spy-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
+          ${{ steps.strings.outputs.build-dir }}/nfc-lab-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
 
     - name: 'Upload artifact'
       uses: actions/upload-artifact@v4
       with:
-        name: nfc-spy-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
-        path: ${{ steps.strings.outputs.build-dir }}/nfc-spy-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
+        name: nfc-lab-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
+        path: ${{ steps.strings.outputs.build-dir }}/nfc-lab-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
 
     - name: 'Create release'
       if: startsWith(github.ref, 'refs/tags/')
@@ -139,8 +139,8 @@ jobs:
       uses: actions/upload-release-asset@v1
       with:
         upload_url: ${{ steps.create-release.outputs.upload_url }}
-        asset_name: nfc-spy-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
-        asset_path: ${{ steps.strings.outputs.build-dir }}/nfc-spy-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
+        asset_name: nfc-lab-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
+        asset_path: ${{ steps.strings.outputs.build-dir }}/nfc-lab-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
         asset_content_type: application/octet-stream
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -4,4 +4,4 @@
 /run/
 src/nfc-app/app-qt/src/main/cpp/QtConfig.h
 /build
-/nfc-spy
+/nfc-lab

CMakeLists.txt

@@ -3,15 +3,15 @@ cmake_minimum_required(VERSION 3.17)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 set(COMPANY "Jose Vicente Campos")
-set(PROGRAM_NAME "nfc-spy")
+set(PROGRAM_NAME "nfc-lab")
 set(ICON_FILE_PATH "../assets/app/rc/app-icon.ico")
 set(APP_TARGET_DIR "@HomeDir@/.${PROGRAM_NAME}")
 
 if(NOT DEFINED BUILD_PROJECT_VERSION)
   set(BUILD_PROJECT_VERSION "0.0.0")
 endif()
 
-project(nfc-spy VERSION "${BUILD_PROJECT_VERSION}" LANGUAGES C CXX)
+project(nfc-lab VERSION "${BUILD_PROJECT_VERSION}" LANGUAGES C CXX)
 
 #-------------------------------------------------------------------------------
 # build flags

README.md

@@ -71,7 +71,7 @@ As can be seen, the application split functionalities in different tabs:
 
 ## Application settings
 
-Settings are stored in user home directory, inside Roaming folder for windows %USERPROFILE%\AppData\Roaming\josevcm\nfc-spy.ini.
+Settings are stored in user home directory, inside Roaming folder for windows %USERPROFILE%\AppData\Roaming\josevcm\nfc-lab.ini.
 The file is created the first time the application is run and can contain the following sections:
 
 Window state, updated every application close.
@@ -257,7 +257,7 @@ directSampling=1
 
 The only tested LA is DreamSourceLab DSLogic Plus, it works perfectly with the app, Pro16 and Pro32 are also supported but not tested (I don't have one).
 Firmware files for this LA are included in the repository, you can find them in the **dat/firmware** folder, this files must
-be located inside firmware folder along nfc-spy.exe application. Thanks to [DreamSourceLab](https://www.dreamsourcelab.com/product/dslogic-series/).
+be located inside firmware folder along nfc-lab.exe application. Thanks to [DreamSourceLab](https://www.dreamsourcelab.com/product/dslogic-series/).
 
 ![Devices](doc/img/nfc-lab-devices4.png "Devices")
 
@@ -447,7 +447,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -G "CodeBlocks - MinGW Makefiles" -S nfc-labora
 
 Compile the project:
 ```
-cmake --build build --target nfc-spy -- -j 6
+cmake --build build --target nfc-lab -- -j 6
 ```
 
 ```
@@ -456,14 +456,14 @@ cmake
 [  2%] Building C object src/nfc-lib/lib-ext/mufft/CMakeFiles/mufft-sse.dir/src/main/c/x86/kernel.sse.c.obj
 [  2%] Building C object src/nfc-lib/lib-ext/airspy/CMakeFiles/airspy.dir/src/main/c/airspy.c.obj
 ....
-[ 98%] Linking CXX executable nfc-spy.exe
-[100%] Built target nfc-spy
+[ 98%] Linking CXX executable nfc-lab.exe
+[100%] Built target nfc-lab
 ```
 
 Create a coppy of the application for easier access:
 
 ```
-cp .\build\src\nfc-app\app-qt\nfc-spy.exe nfc-spy.exe
+cp .\build\src\nfc-app\app-qt\nfc-lab.exe nfc-lab.exe
 ```
 
 Application is ready to use!
@@ -493,7 +493,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -S nfc-laboratory -B build
 Compile the project:
 
 ```
-cmake --build build --target nfc-spy -- -j$(nproc)
+cmake --build build --target nfc-lab -- -j$(nproc)
 ```
 
 Copy the base configuration files to the build directory:
@@ -505,13 +505,13 @@ cp -r nfc-laboratory/dat/firmware build/src/nfc-app/app-qt/
 Create a symbolic link to the application for easier access:
 
 ```
-ln -s build/src/nfc-app/app-qt/nfc-spy nfc-spy
+ln -s build/src/nfc-app/app-qt/nfc-lab nfc-lab
 ```
 
 Launch the application:
 
 ```
-./nfc-spy
+./nfc-lab
 ```
 
 ## Source code licensing

dat/config/nfc-spy.ini renamed to dat/config/nfc-lab.ini

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
-    <Name>NFC SPY @nfc-spy_VERSION@ - [email protected]</Name>
-    <Version>@nfc-spy_VERSION@</Version>
-    <Title>NFC SPY Installer</Title>
+    <Name>NFC SPY @nfc-lab_VERSION@ - [email protected]</Name>
+    <Version>@nfc-lab_VERSION@</Version>
+    <Title>NFC LAB Installer</Title>
     <Publisher>Jose Vicente Campos Martinez</Publisher>
-    <StartMenuDir>NFC SPY</StartMenuDir>
+    <StartMenuDir>NFC LAB</StartMenuDir>
     <TargetDir>@APP_TARGET_DIR@</TargetDir>
 </Installer>

dat/installer/config.xml.in

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Package>
-    <Name>org.josevcm.nfc-spy</Name>
-    <DisplayName>NFC SPY @nfc-spy_VERSION@ Installer</DisplayName>
-    <Description>NFC SPY @nfc-spy_VERSION@ Software Installer</Description>
-    <Version>@nfc-spy_VERSION@</Version>
+    <Name>org.josevcm.nfc-lab</Name>
+    <DisplayName>NFC SPY @nfc-lab_VERSION@ Installer</DisplayName>
+    <Description>NFC SPY @nfc-lab_VERSION@ Software Installer</Description>
+    <Version>@nfc-lab_VERSION@</Version>
     <ReleaseDate>2024-06-01</ReleaseDate>
     <Licenses>
         <License name="License Agreement" file="license.txt" />

dat/installer/package.xml.in

@@ -4,8 +4,8 @@ $TargetPath="@CMAKE_CURRENT_BINARY_DIR@"
 $InstallerPath="$TargetPath/installer"
 $ConfigPath="$InstallerPath/config"
 $PackagePath="$InstallerPath/package"
-$PackageDataPath="$PackagePath/org.josevcm.nfc-spy/data"
-$PackageMetaPath="$PackagePath/org.josevcm.nfc-spy/meta"
+$PackageDataPath="$PackagePath/org.josevcm.nfc-lab/data"
+$PackageMetaPath="$PackagePath/org.josevcm.nfc-lab/meta"
 
 New-Item -Force -Path $PackageDataPath -ItemType "directory"
 New-Item -Force -Path $PackageMetaPath -ItemType "directory"
@@ -15,15 +15,15 @@ Copy-Item -Force $SourcePath/dll/airspy/x86_64/bin/*.dll $PackageDataPath
 Copy-Item -Force $SourcePath/dll/openssl/x86_64/bin/*.dll $PackageDataPath
 Copy-Item -Force $SourcePath/dll/rtlsdr/x86_64/bin/*.dll $PackageDataPath
 Copy-Item -Force $SourcePath/dll/usb/x86_64/bin/*.dll $PackageDataPath
-Copy-Item -Force $TargetPath/src/nfc-app/app-qt/nfc-spy.exe $PackageDataPath
+Copy-Item -Force $TargetPath/src/nfc-app/app-qt/nfc-lab.exe $PackageDataPath
 
 # Copy meta resources
 Copy-Item -Force $SourcePath/dat/installer/*.js $PackageMetaPath
 Copy-Item -Force $TargetPath/installer/config/license.txt $PackageMetaPath
 Copy-Item -Force $TargetPath/installer/config/package.xml $PackageMetaPath
 
 # Create QT deployment from executable
-windeployqt --verbose 1 --release --force --compiler-runtime --no-translations --no-system-d3d-compiler --no-opengl-sw $PackageDataPath/nfc-spy.exe
+windeployqt --verbose 1 --release --force --compiler-runtime --no-translations --no-system-d3d-compiler --no-opengl-sw $PackageDataPath/nfc-lab.exe
 
 # Create QT installer
-binarycreator --verbose -c $ConfigPath/config.xml -p $PackagePath $TargetPath/nfc-spy-@nfc-spy_VERSION@-x86_64.exe
+binarycreator --verbose -c $ConfigPath/config.xml -p $PackagePath $TargetPath/nfc-lab-@nfc-lab_VERSION@-x86_64.exe

dat/scripts/build-installer.ps1.in

@@ -1,7 +1,7 @@
 $SourcePath="@CMAKE_CURRENT_SOURCE_DIR@"
 $TargetPath="@CMAKE_CURRENT_BINARY_DIR@"
 
-if (Test-Path "$TargetPath/src/nfc-app/app-qt/nfc-spy.exe") {
+if (Test-Path "$TargetPath/src/nfc-app/app-qt/nfc-lab.exe") {
 
     # Copy application resources
     Copy-Item -Force -Recurse $SourcePath/dat/config/*.conf $TargetPath
@@ -14,5 +14,5 @@ if (Test-Path "$TargetPath/src/nfc-app/app-qt/nfc-spy.exe") {
 
     # Deploy QT required libraries
     # Debug, not deployable for production
-    windeployqt.exe --debug --compiler-runtime --no-translations --no-system-d3d-compiler --no-angle --no-opengl-sw $TargetPath/src/nfc-app/app-qt/nfc-spy.exe
+    windeployqt.exe --debug --compiler-runtime --no-translations --no-system-d3d-compiler --no-angle --no-opengl-sw $TargetPath/src/nfc-app/app-qt/nfc-lab.exe
 }

dat/scripts/build-runenv.ps1.in

@@ -100,23 +100,23 @@ if (WIN32)
 
     if(ENABLE_CONSOLE_OUTPUT)
         message(STATUS "Enable debug output to console.")
-        add_executable(nfc-spy ${SOURCES})
+        add_executable(nfc-lab ${SOURCES})
         add_compile_definitions(ENABLE_CONSOLE_LOGGING)
     else()
-        add_executable(nfc-spy WIN32 ${SOURCES})
+        add_executable(nfc-lab WIN32 ${SOURCES})
     endif ()
 
 elseif (UNIX)
-    add_executable(nfc-spy ${SOURCES})
+    add_executable(nfc-lab ${SOURCES})
 endif ()
 
 add_compile_definitions(QT_DISABLE_DEPRECATED_UP_TO=0x050F00)
 
-target_include_directories(nfc-spy PRIVATE ${PRIVATE_SOURCE_DIR})
-target_include_directories(nfc-spy PRIVATE ${AUTOGEN_BUILD_DIR}/include)
-target_include_directories(nfc-spy PRIVATE ${LIBUSB_INCLUDE_DIR})
+target_include_directories(nfc-lab PRIVATE ${PRIVATE_SOURCE_DIR})
+target_include_directories(nfc-lab PRIVATE ${AUTOGEN_BUILD_DIR}/include)
+target_include_directories(nfc-lab PRIVATE ${LIBUSB_INCLUDE_DIR})
 
-target_link_libraries(nfc-spy
+target_link_libraries(nfc-lab
         ${PLATFORM_LIBS}
         lab-tasks
         lab-logic

src/nfc-app/app-qt/CMakeLists.txt

@@ -19,12 +19,12 @@
 
 */
 
-#define NFC_LAB_VERSION_MAJOR @nfc-spy_VERSION_MAJOR@
-#define NFC_LAB_VERSION_MINOR @nfc-spy_VERSION_MINOR@
-#define NFC_LAB_VERSION_PATCH @nfc-spy_VERSION_PATCH@
-#define NFC_LAB_VERSION_STRING "@nfc-spy_VERSION@"
-#define NFC_LAB_VENDOR_STRING "[email protected] nfc-spy @nfc-spy_VERSION@"
+#define NFC_LAB_VERSION_MAJOR @nfc-lab_VERSION_MAJOR@
+#define NFC_LAB_VERSION_MINOR @nfc-lab_VERSION_MINOR@
+#define NFC_LAB_VERSION_PATCH @nfc-lab_VERSION_PATCH@
+#define NFC_LAB_VERSION_STRING "@nfc-lab_VERSION@"
+#define NFC_LAB_VENDOR_STRING "[email protected] nfc-lab @nfc-lab_VERSION@"
 #define NFC_LAB_COMPANY_NAME "josevcm"
-#define NFC_LAB_APPLICATION_NAME "nfc-spy"
+#define NFC_LAB_APPLICATION_NAME "nfc-lab"
 #define NFC_LAB_DOMAIN_NAME "josevcm"
 

src/nfc-app/app-qt/src/main/cpp/QtConfig.h.in

@@ -81,7 +81,7 @@ int startApp(int argc, char *argv[])
    rt::Logger *log = rt::Logger::getLogger("app.main", rt::Logger::INFO_LEVEL);
 
    log->info("***********************************************************************");
-   log->info("NFC-SPY {}", {NFC_LAB_VERSION_STRING});
+   log->info("NFC-LAB {}", {NFC_LAB_VERSION_STRING});
    log->info("***********************************************************************");
 
    if (argc > 1)