Skip to content

Commit a86bccf

Browse files
MaxhyMaxhy
committed
Update for latest community build
1 parent 80a0484 commit a86bccf

File tree

18 files changed

+330
-611
lines changed

18 files changed

+330
-611
lines changed

‎build-windows.ps1‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@ Param(
1010
[Parameter(Mandatory=$false)]
1111
[bool]$build_nfc,
1212
[Parameter(Mandatory=$false)]
13-
[bool]$build_rfideas
13+
[bool]$build_rfideas,
14+
[Parameter(Mandatory=$false)]
15+
[bool]$build_unittest
1416
)
1517

1618
Write-Host $arch $build_type $build_private $build_nfc
1719
Set-Location installer
1820
if($with_profile) {
19-
.\conan-imports.ps1 -with_profile -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas
21+
.\conan-imports.ps1 -with_profile -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas -build_unittest $build_unittest
2022
} else {
21-
.\conan-imports.ps1 -arch $arch -build_type $build_type -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas
23+
.\conan-imports.ps1 -arch $arch -build_type $build_type -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas -build_unittest $build_unittest
2224
}
2325
Set-Location ../sources/scripts
2426
#pip install -r requirements.txt
@@ -27,9 +29,9 @@ Set-Location ../../
2729
.\sources/scripts/generate-swig.ps1
2830
Set-Location sources/LibLogicalAccessNet.win32
2931
if($with_profile) {
30-
.\conan-build.ps1 -with_profile -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas
32+
.\conan-build.ps1 -with_profile -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas -build_unittest $build_unittest
3133
} else {
32-
./conan-build.ps1 -arch $arch -build_type $build_type -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas
34+
./conan-build.ps1 -arch $arch -build_type $build_type -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas -build_unittest $build_unittest
3335
}
3436
Set-Location ..
3537

‎installer/LibLogicalAccessNetCEMergex64.aip‎

Lines changed: 111 additions & 67 deletions
Large diffs are not rendered by default.

‎installer/LibLogicalAccessNetCEMergex86.aip‎

Lines changed: 110 additions & 66 deletions
Large diffs are not rendered by default.

‎installer/conan-imports.ps1‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ Param(
1010
[Parameter(Mandatory=$false)]
1111
[bool]$build_nfc,
1212
[Parameter(Mandatory=$false)]
13-
[bool]$build_rfideas
13+
[bool]$build_rfideas,
14+
[Parameter(Mandatory=$false)]
15+
[bool]$build_unittest
1416
)
1517

1618
if($with_profile) {
17-
conan install -pr compilers/x64_msvc_debug -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas -u .
18-
conan install -pr compilers/x64_msvc_release -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas -u .
19-
conan install -pr compilers/x86_msvc_debug -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas -u .
20-
conan install -pr compilers/x86_msvc_release -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas -u .
19+
conan install -pr compilers/x64_msvc_debug -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas -o LLA_BUILD_UNITTEST=$build_unittest -u .
20+
conan install -pr compilers/x64_msvc_release -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas -o LLA_BUILD_UNITTEST=$build_unittest -u .
21+
conan install -pr compilers/x86_msvc_debug -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas -o LLA_BUILD_UNITTEST=$build_unittest -u .
22+
conan install -pr compilers/x86_msvc_release -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas -o LLA_BUILD_UNITTEST=$build_unittest -u .
2123
} else {
22-
conan install -s arch=$arch -s build_type=$build_type -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas --build=missing -u .
24+
conan install -s arch=$arch -s build_type=$build_type -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas -o LLA_BUILD_UNITTEST=$build_unittest --build=missing -u .
2325
}

‎installer/conanfile.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,18 @@ class LogicalAccessSwigConan(ConanFile):
88
settings = "build_type", "arch", "os"
99
options = { 'LLA_BUILD_PRIVATE': [True, False],
1010
'LLA_BUILD_NFC': [True, False],
11-
'LLA_BUILD_RFIDEAS': [True, False]}
12-
default_options = 'LogicalAccess:LLA_BUILD_PKCS=True', 'LogicalAccess:LLA_BUILD_UNITTEST=True', \
13-
'LogicalAccessPrivate:LLA_BUILD_UNITTEST=True', 'LLA_BUILD_PRIVATE=True', \
14-
'LLA_BUILD_NFC=True', 'LLA_BUILD_RFIDEAS=True'
11+
'LLA_BUILD_RFIDEAS': [True, False],
12+
'LLA_BUILD_UNITTEST': [True, False]}
13+
default_options = 'LogicalAccess:LLA_BUILD_PKCS=True', 'LLA_BUILD_PRIVATE=True', 'LLA_BUILD_NFC=True', 'LLA_BUILD_RFIDEAS=True'
1514
revision_mode = "scm"
1615

1716
def configure(self):
1817
if self.settings.os == 'Windows' and self.options.LLA_BUILD_RFIDEAS:
1918
self.options['LogicalAccess'].LLA_BUILD_RFIDEAS = True
2019

20+
self.options['LogicalAccess'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
21+
self.options['LogicalAccessPrivate'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
22+
2123
def requirements(self):
2224
try:
2325
if self.options.LLA_BUILD_PRIVATE:

‎sources/DESFireEV1Tests/DESFireEV1Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<Configurations>Debug;Release;DebugCE;ReleaseCE</Configurations>
77
</PropertyGroup>

‎sources/ISO15693Tests/ISO15693Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<Configurations>Debug;Release;DebugCE;ReleaseCE</Configurations>
77
</PropertyGroup>

‎sources/LibLogicalAccessNet.win32/conan-build.ps1‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Param(
1212
[bool]$build_nfc,
1313
[Parameter(Mandatory=$false)]
1414
[bool]$build_rfideas,
15+
[Parameter(Mandatory=$false)]
16+
[bool]$build_unittest,
1517
[Parameter(Mandatory=$false)]
1618
[switch]$publish
1719
)
@@ -49,7 +51,7 @@ if (!$build_private) {
4951

5052
if($with_profile) {
5153
foreach ($Profile in $Profiles) {
52-
ExecExternal { conan install -pr $Profile[0] -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas --build=missing .. }
54+
ExecExternal { conan install -pr $Profile[0] -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas -o LLA_BUILD_UNITTEST=$build_unittest --build=missing .. }
5355
ExecExternal { conan build .. }
5456
$config = $Profile[1]
5557
$arch = $Profile[2]
@@ -61,7 +63,7 @@ if($with_profile) {
6163
Remove-Item * -Recurse -Force
6264
}
6365
} else {
64-
ExecExternal { conan install -s arch=$arch -s build_type=$build_type -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas --build=missing .. }
66+
ExecExternal { conan install -s arch=$arch -s build_type=$build_type -o LLA_BUILD_PRIVATE=$build_private -o LLA_BUILD_NFC=$build_nfc -o LLA_BUILD_RFIDEAS=$build_rfideas -o LLA_BUILD_UNITTEST=$build_unittest --build=missing .. }
6567
ExecExternal { conan build .. }
6668
Copy-Item bin/LibLogicalAccessNet.win32.* ../bin/$arch/$build_type/
6769
if ($publish) {

‎sources/LibLogicalAccessNet.win32/conanfile.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ class LLASwig(ConanFile):
1111
settings = "os", "compiler", "build_type", "arch"
1212
options = { 'LLA_BUILD_PRIVATE': [True, False],
1313
'LLA_BUILD_NFC': [True, False],
14-
'LLA_BUILD_RFIDEAS': [True, False]}
15-
default_options = 'LogicalAccess:LLA_BUILD_PKCS=True','LogicalAccess:LLA_BUILD_IKS=False', 'LogicalAccess:LLA_BUILD_UNITTEST=True', \
16-
'LogicalAccessPrivate:LLA_BUILD_UNITTEST=True', 'LLA_BUILD_PRIVATE=False', 'LLA_BUILD_NFC=True', \
17-
'LLA_BUILD_RFIDEAS=True'
14+
'LLA_BUILD_RFIDEAS': [True, False],
15+
'LLA_BUILD_UNITTEST': [True, False]}
16+
default_options = 'LogicalAccess:LLA_BUILD_PKCS=True','LogicalAccess:LLA_BUILD_IKS=False', 'LLA_BUILD_PRIVATE=False', 'LLA_BUILD_NFC=True', 'LLA_BUILD_RFIDEAS=True'
1817
generators = "cmake"
1918
revision_mode = "scm"
2019

@@ -38,6 +37,9 @@ def requirements(self):
3837
def configure(self):
3938
if self.settings.os == 'Windows' and self.options.LLA_BUILD_RFIDEAS:
4039
self.options['LogicalAccess'].LLA_BUILD_RFIDEAS = True
40+
41+
self.options['LogicalAccess'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
42+
self.options['LogicalAccessPrivate'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
4143

4244
def configure_cmake(self):
4345
cmake = CMake(self, build_type=self.settings.build_type)

0 commit comments

Comments
 (0)