Skip to content

Commit 05887ef

Browse files
josevcmjosevcm
committed
rename target from nfc-spy to nfc-lab
1 parent 839a357 commit 05887ef

File tree

13 files changed

+52
-52
lines changed

13 files changed

+52
-52
lines changed

‎.github/workflows/cmake-ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ jobs:
4444
4545
- name: 'Build project'
4646
run: |
47-
cmake --build ${{ steps.strings.outputs.build-dir }} --target nfc-spy --parallel ${{ steps.strings.outputs.cpu-count }}
47+
cmake --build ${{ steps.strings.outputs.build-dir }} --target nfc-lab --parallel ${{ steps.strings.outputs.cpu-count }}

‎.github/workflows/cmake-windows.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
echo "mingw-dir=${{ github.workspace }}/tools/mingw1310_64" >> "$GITHUB_OUTPUT"
3535
echo "installer-dir=${{ github.workspace }}/tools/QtInstallerFramework/4.7" >> "$GITHUB_OUTPUT"
3636
echo "package-dir=${{ github.workspace }}/build/installer/package" >> "$GITHUB_OUTPUT"
37-
echo "package-data-dir=${{ github.workspace }}/build/installer/package/org.josevcm.nfc-spy/data" >> "$GITHUB_OUTPUT"
38-
echo "package-meta-dir=${{ github.workspace }}/build/installer/package/org.josevcm.nfc-spy/meta" >> "$GITHUB_OUTPUT"
37+
echo "package-data-dir=${{ github.workspace }}/build/installer/package/org.josevcm.nfc-lab/data" >> "$GITHUB_OUTPUT"
38+
echo "package-meta-dir=${{ github.workspace }}/build/installer/package/org.josevcm.nfc-lab/meta" >> "$GITHUB_OUTPUT"
3939
echo "cpu-count=4" >> "$GITHUB_OUTPUT"
4040
4141
- name: 'Cache dependencies'
@@ -74,7 +74,7 @@ jobs:
7474
run: |
7575
${{ steps.strings.outputs.cmake-dir }}/bin/cmake `
7676
--build ${{ steps.strings.outputs.build-dir }} `
77-
--target nfc-spy --parallel ${{ steps.strings.outputs.cpu-count }}
77+
--target nfc-lab --parallel ${{ steps.strings.outputs.cpu-count }}
7878
7979
- name: 'Create installer'
8080
run: |
@@ -83,7 +83,7 @@ jobs:
8383
New-Item -Force -ItemType "directory" -Path ${{ steps.strings.outputs.package-meta-dir }}
8484
8585
# copy executable and libraries
86-
Copy-Item -Force ${{ steps.strings.outputs.build-dir }}/src/nfc-app/app-qt/nfc-spy.exe ${{ steps.strings.outputs.package-data-dir }}
86+
Copy-Item -Force ${{ steps.strings.outputs.build-dir }}/src/nfc-app/app-qt/nfc-lab.exe ${{ steps.strings.outputs.package-data-dir }}
8787
Copy-Item -Force ${{ steps.strings.outputs.mingw-dir }}/bin/*.dll ${{ steps.strings.outputs.package-data-dir }}
8888
Copy-Item -Force ${{ github.workspace }}/dll/airspy/x86_64/bin/*.dll ${{ steps.strings.outputs.package-data-dir }}
8989
Copy-Item -Force ${{ github.workspace }}/dll/openssl/x86_64/bin/*.dll ${{ steps.strings.outputs.package-data-dir }}
@@ -105,20 +105,20 @@ jobs:
105105
--no-translations `
106106
--no-system-d3d-compiler `
107107
--no-opengl-sw `
108-
${{ steps.strings.outputs.package-data-dir }}/nfc-spy.exe
108+
${{ steps.strings.outputs.package-data-dir }}/nfc-lab.exe
109109

110110
# create installer
111111
${{ steps.strings.outputs.installer-dir }}/bin/binarycreator `
112112
--verbose `
113113
-c ${{ steps.strings.outputs.build-dir }}/installer/config/config.xml `
114114
-p ${{ steps.strings.outputs.package-dir }} `
115-
${{ steps.strings.outputs.build-dir }}/nfc-spy-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
115+
${{ steps.strings.outputs.build-dir }}/nfc-lab-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
116116

117117
- name: 'Upload artifact'
118118
uses: actions/upload-artifact@v4
119119
with:
120-
name: nfc-spy-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
121-
path: ${{ steps.strings.outputs.build-dir }}/nfc-spy-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
120+
name: nfc-lab-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
121+
path: ${{ steps.strings.outputs.build-dir }}/nfc-lab-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
122122

123123
- name: 'Create release'
124124
if: startsWith(github.ref, 'refs/tags/')
@@ -139,8 +139,8 @@ jobs:
139139
uses: actions/upload-release-asset@v1
140140
with:
141141
upload_url: ${{ steps.create-release.outputs.upload_url }}
142-
asset_name: nfc-spy-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
143-
asset_path: ${{ steps.strings.outputs.build-dir }}/nfc-spy-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
142+
asset_name: nfc-lab-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
143+
asset_path: ${{ steps.strings.outputs.build-dir }}/nfc-lab-${{ steps.strings.outputs.build-name }}-installer-x86_64.exe
144144
asset_content_type: application/octet-stream
145145
env:
146146
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
/run/
55
src/nfc-app/app-qt/src/main/cpp/QtConfig.h
66
/build
7-
/nfc-spy
7+
/nfc-lab

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ cmake_minimum_required(VERSION 3.17)
33
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
44

55
set(COMPANY "Jose Vicente Campos")
6-
set(PROGRAM_NAME "nfc-spy")
6+
set(PROGRAM_NAME "nfc-lab")
77
set(ICON_FILE_PATH "../assets/app/rc/app-icon.ico")
88
set(APP_TARGET_DIR "@HomeDir@/.${PROGRAM_NAME}")
99

1010
if(NOT DEFINED BUILD_PROJECT_VERSION)
1111
set(BUILD_PROJECT_VERSION "0.0.0")
1212
endif()
1313

14-
project(nfc-spy VERSION "${BUILD_PROJECT_VERSION}" LANGUAGES C CXX)
14+
project(nfc-lab VERSION "${BUILD_PROJECT_VERSION}" LANGUAGES C CXX)
1515

1616
#-------------------------------------------------------------------------------
1717
# build flags

‎README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ As can be seen, the application split functionalities in different tabs:
7171

7272
## Application settings
7373

74-
Settings are stored in user home directory, inside Roaming folder for windows %USERPROFILE%\AppData\Roaming\josevcm\nfc-spy.ini.
74+
Settings are stored in user home directory, inside Roaming folder for windows %USERPROFILE%\AppData\Roaming\josevcm\nfc-lab.ini.
7575
The file is created the first time the application is run and can contain the following sections:
7676

7777
Window state, updated every application close.
@@ -257,7 +257,7 @@ directSampling=1
257257

258258
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).
259259
Firmware files for this LA are included in the repository, you can find them in the **dat/firmware** folder, this files must
260-
be located inside firmware folder along nfc-spy.exe application. Thanks to [DreamSourceLab](https://www.dreamsourcelab.com/product/dslogic-series/).
260+
be located inside firmware folder along nfc-lab.exe application. Thanks to [DreamSourceLab](https://www.dreamsourcelab.com/product/dslogic-series/).
261261

262262
![Devices](doc/img/nfc-lab-devices4.png "Devices")
263263

@@ -447,7 +447,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -G "CodeBlocks - MinGW Makefiles" -S nfc-labora
447447

448448
Compile the project:
449449
```
450-
cmake --build build --target nfc-spy -- -j 6
450+
cmake --build build --target nfc-lab -- -j 6
451451
```
452452

453453
```
@@ -456,14 +456,14 @@ cmake
456456
[ 2%] Building C object src/nfc-lib/lib-ext/mufft/CMakeFiles/mufft-sse.dir/src/main/c/x86/kernel.sse.c.obj
457457
[ 2%] Building C object src/nfc-lib/lib-ext/airspy/CMakeFiles/airspy.dir/src/main/c/airspy.c.obj
458458
....
459-
[ 98%] Linking CXX executable nfc-spy.exe
460-
[100%] Built target nfc-spy
459+
[ 98%] Linking CXX executable nfc-lab.exe
460+
[100%] Built target nfc-lab
461461
```
462462

463463
Create a coppy of the application for easier access:
464464

465465
```
466-
cp .\build\src\nfc-app\app-qt\nfc-spy.exe nfc-spy.exe
466+
cp .\build\src\nfc-app\app-qt\nfc-lab.exe nfc-lab.exe
467467
```
468468

469469
Application is ready to use!
@@ -493,7 +493,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -S nfc-laboratory -B build
493493
Compile the project:
494494

495495
```
496-
cmake --build build --target nfc-spy -- -j$(nproc)
496+
cmake --build build --target nfc-lab -- -j$(nproc)
497497
```
498498

499499
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/
505505
Create a symbolic link to the application for easier access:
506506

507507
```
508-
ln -s build/src/nfc-app/app-qt/nfc-spy nfc-spy
508+
ln -s build/src/nfc-app/app-qt/nfc-lab nfc-lab
509509
```
510510

511511
Launch the application:
512512

513513
```
514-
./nfc-spy
514+
./nfc-lab
515515
```
516516

517517
## Source code licensing

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

File renamed without changes.

‎dat/installer/config.xml.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Installer>
3-
<Name>NFC SPY @nfc-spy_VERSION@ - josevcm@gmail.com</Name>
4-
<Version>@nfc-spy_VERSION@</Version>
5-
<Title>NFC SPY Installer</Title>
3+
<Name>NFC SPY @nfc-lab_VERSION@ - josevcm@gmail.com</Name>
4+
<Version>@nfc-lab_VERSION@</Version>
5+
<Title>NFC LAB Installer</Title>
66
<Publisher>Jose Vicente Campos Martinez</Publisher>
7-
<StartMenuDir>NFC SPY</StartMenuDir>
7+
<StartMenuDir>NFC LAB</StartMenuDir>
88
<TargetDir>@APP_TARGET_DIR@</TargetDir>
99
</Installer>

‎dat/installer/package.xml.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Package>
3-
<Name>org.josevcm.nfc-spy</Name>
4-
<DisplayName>NFC SPY @nfc-spy_VERSION@ Installer</DisplayName>
5-
<Description>NFC SPY @nfc-spy_VERSION@ Software Installer</Description>
6-
<Version>@nfc-spy_VERSION@</Version>
3+
<Name>org.josevcm.nfc-lab</Name>
4+
<DisplayName>NFC SPY @nfc-lab_VERSION@ Installer</DisplayName>
5+
<Description>NFC SPY @nfc-lab_VERSION@ Software Installer</Description>
6+
<Version>@nfc-lab_VERSION@</Version>
77
<ReleaseDate>2024-06-01</ReleaseDate>
88
<Licenses>
99
<License name="License Agreement" file="license.txt" />

‎dat/scripts/build-installer.ps1.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ $TargetPath="@CMAKE_CURRENT_BINARY_DIR@"
44
$InstallerPath="$TargetPath/installer"
55
$ConfigPath="$InstallerPath/config"
66
$PackagePath="$InstallerPath/package"
7-
$PackageDataPath="$PackagePath/org.josevcm.nfc-spy/data"
8-
$PackageMetaPath="$PackagePath/org.josevcm.nfc-spy/meta"
7+
$PackageDataPath="$PackagePath/org.josevcm.nfc-lab/data"
8+
$PackageMetaPath="$PackagePath/org.josevcm.nfc-lab/meta"
99

1010
New-Item -Force -Path $PackageDataPath -ItemType "directory"
1111
New-Item -Force -Path $PackageMetaPath -ItemType "directory"
@@ -15,15 +15,15 @@ Copy-Item -Force $SourcePath/dll/airspy/x86_64/bin/*.dll $PackageDataPath
1515
Copy-Item -Force $SourcePath/dll/openssl/x86_64/bin/*.dll $PackageDataPath
1616
Copy-Item -Force $SourcePath/dll/rtlsdr/x86_64/bin/*.dll $PackageDataPath
1717
Copy-Item -Force $SourcePath/dll/usb/x86_64/bin/*.dll $PackageDataPath
18-
Copy-Item -Force $TargetPath/src/nfc-app/app-qt/nfc-spy.exe $PackageDataPath
18+
Copy-Item -Force $TargetPath/src/nfc-app/app-qt/nfc-lab.exe $PackageDataPath
1919

2020
# Copy meta resources
2121
Copy-Item -Force $SourcePath/dat/installer/*.js $PackageMetaPath
2222
Copy-Item -Force $TargetPath/installer/config/license.txt $PackageMetaPath
2323
Copy-Item -Force $TargetPath/installer/config/package.xml $PackageMetaPath
2424

2525
# Create QT deployment from executable
26-
windeployqt --verbose 1 --release --force --compiler-runtime --no-translations --no-system-d3d-compiler --no-opengl-sw $PackageDataPath/nfc-spy.exe
26+
windeployqt --verbose 1 --release --force --compiler-runtime --no-translations --no-system-d3d-compiler --no-opengl-sw $PackageDataPath/nfc-lab.exe
2727

2828
# Create QT installer
29-
binarycreator --verbose -c $ConfigPath/config.xml -p $PackagePath $TargetPath/nfc-spy-@nfc-spy_VERSION@-x86_64.exe
29+
binarycreator --verbose -c $ConfigPath/config.xml -p $PackagePath $TargetPath/nfc-lab-@nfc-lab_VERSION@-x86_64.exe

‎dat/scripts/build-runenv.ps1.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$SourcePath="@CMAKE_CURRENT_SOURCE_DIR@"
22
$TargetPath="@CMAKE_CURRENT_BINARY_DIR@"
33

4-
if (Test-Path "$TargetPath/src/nfc-app/app-qt/nfc-spy.exe") {
4+
if (Test-Path "$TargetPath/src/nfc-app/app-qt/nfc-lab.exe") {
55

66
# Copy application resources
77
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") {
1414

1515
# Deploy QT required libraries
1616
# Debug, not deployable for production
17-
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
17+
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
1818
}

0 commit comments

Comments
 (0)