Update for latest community build

liblogicalaccess · Mar 24, 2023 · a86bccf · a86bccf
1 parent 80a0484
commit a86bccf
Show file tree

Hide file tree

Showing 18 changed files with 330 additions and 611 deletions.
diff --git a/build-windows.ps1 b/build-windows.ps1
@@ -10,15 +10,17 @@ Param(
     [Parameter(Mandatory=$false)]
     [bool]$build_nfc,
     [Parameter(Mandatory=$false)]
-    [bool]$build_rfideas
+    [bool]$build_rfideas,
+	[Parameter(Mandatory=$false)]
+    [bool]$build_unittest
 )
 
 Write-Host $arch $build_type $build_private $build_nfc
 Set-Location installer
 if($with_profile) {
-    .\conan-imports.ps1 -with_profile -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas
+    .\conan-imports.ps1 -with_profile -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas -build_unittest $build_unittest
 } else {
-    .\conan-imports.ps1 -arch $arch -build_type $build_type -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas
+    .\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
 }
 Set-Location ../sources/scripts
 #pip install -r requirements.txt
@@ -27,9 +29,9 @@ Set-Location ../../
 .\sources/scripts/generate-swig.ps1
 Set-Location sources/LibLogicalAccessNet.win32
 if($with_profile) {
-    .\conan-build.ps1 -with_profile -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas
+    .\conan-build.ps1 -with_profile -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas -build_unittest $build_unittest
 } else {
-    ./conan-build.ps1 -arch $arch -build_type $build_type -build_private $build_private -build_nfc $build_nfc -build_rfideas $build_rfideas
+    ./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
 }
 Set-Location ..
 

diff --git a/installer/LibLogicalAccessNetCEMergex64.aip b/installer/LibLogicalAccessNetCEMergex64.aip
diff --git a/installer/LibLogicalAccessNetCEMergex86.aip b/installer/LibLogicalAccessNetCEMergex86.aip
diff --git a/installer/conan-imports.ps1 b/installer/conan-imports.ps1
@@ -10,14 +10,16 @@ Param(
     [Parameter(Mandatory=$false)]
     [bool]$build_nfc,
     [Parameter(Mandatory=$false)]
-    [bool]$build_rfideas
+    [bool]$build_rfideas,
+	[Parameter(Mandatory=$false)]
+    [bool]$build_unittest
 )
 
 if($with_profile) {
-    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 .
-    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 .
-    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 .
-    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 .
+    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 .
+    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 .
+    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 .
+    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 .
 } else {
-    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 .
+    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 .
 }
diff --git a/installer/conanfile.py b/installer/conanfile.py
@@ -8,16 +8,18 @@ class LogicalAccessSwigConan(ConanFile):
     settings = "build_type", "arch", "os"
     options = { 'LLA_BUILD_PRIVATE': [True, False],
                 'LLA_BUILD_NFC': [True, False],
-                'LLA_BUILD_RFIDEAS': [True, False]}
-    default_options = 'LogicalAccess:LLA_BUILD_PKCS=True', 'LogicalAccess:LLA_BUILD_UNITTEST=True', \
-                        'LogicalAccessPrivate:LLA_BUILD_UNITTEST=True', 'LLA_BUILD_PRIVATE=True', \
-                        'LLA_BUILD_NFC=True', 'LLA_BUILD_RFIDEAS=True'
+                'LLA_BUILD_RFIDEAS': [True, False],
+                'LLA_BUILD_UNITTEST': [True, False]}
+    default_options = 'LogicalAccess:LLA_BUILD_PKCS=True', 'LLA_BUILD_PRIVATE=True', 'LLA_BUILD_NFC=True', 'LLA_BUILD_RFIDEAS=True'
     revision_mode = "scm"
 
     def configure(self):
         if self.settings.os == 'Windows' and self.options.LLA_BUILD_RFIDEAS:
             self.options['LogicalAccess'].LLA_BUILD_RFIDEAS = True
 
+        self.options['LogicalAccess'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
+        self.options['LogicalAccessPrivate'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
+
     def requirements(self):
         try:
             if self.options.LLA_BUILD_PRIVATE:

diff --git a/sources/DESFireEV1Tests/DESFireEV1Tests.csproj b/sources/DESFireEV1Tests/DESFireEV1Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Configurations>Debug;Release;DebugCE;ReleaseCE</Configurations>
   </PropertyGroup>

diff --git a/sources/ISO15693Tests/ISO15693Tests.csproj b/sources/ISO15693Tests/ISO15693Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Configurations>Debug;Release;DebugCE;ReleaseCE</Configurations>
   </PropertyGroup>

diff --git a/sources/LibLogicalAccessNet.win32/conan-build.ps1 b/sources/LibLogicalAccessNet.win32/conan-build.ps1
@@ -12,6 +12,8 @@ Param(
     [bool]$build_nfc,
     [Parameter(Mandatory=$false)]
     [bool]$build_rfideas,
+	[Parameter(Mandatory=$false)]
+    [bool]$build_unittest,
     [Parameter(Mandatory=$false)]
     [switch]$publish
 )
@@ -49,7 +51,7 @@ if (!$build_private) {
 
 if($with_profile) {
   foreach ($Profile in $Profiles) {
-    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 .. }
+    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 .. }
     ExecExternal { conan build .. }
     $config = $Profile[1]
     $arch = $Profile[2]
@@ -61,7 +63,7 @@ if($with_profile) {
 	Remove-Item * -Recurse -Force
   }
 } else {
-  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 .. }
+  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 .. }
   ExecExternal { conan build .. }
   Copy-Item bin/LibLogicalAccessNet.win32.* ../bin/$arch/$build_type/
   if ($publish) {

diff --git a/sources/LibLogicalAccessNet.win32/conanfile.py b/sources/LibLogicalAccessNet.win32/conanfile.py
@@ -11,10 +11,9 @@ class LLASwig(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
     options = { 'LLA_BUILD_PRIVATE': [True, False],
                 'LLA_BUILD_NFC': [True, False],
-                'LLA_BUILD_RFIDEAS': [True, False]}
-    default_options = 'LogicalAccess:LLA_BUILD_PKCS=True','LogicalAccess:LLA_BUILD_IKS=False', 'LogicalAccess:LLA_BUILD_UNITTEST=True', \
-                        'LogicalAccessPrivate:LLA_BUILD_UNITTEST=True', 'LLA_BUILD_PRIVATE=False', 'LLA_BUILD_NFC=True', \
-                        'LLA_BUILD_RFIDEAS=True'
+                'LLA_BUILD_RFIDEAS': [True, False],
+                'LLA_BUILD_UNITTEST': [True, False]}
+    default_options = 'LogicalAccess:LLA_BUILD_PKCS=True','LogicalAccess:LLA_BUILD_IKS=False', 'LLA_BUILD_PRIVATE=False', 'LLA_BUILD_NFC=True', 'LLA_BUILD_RFIDEAS=True'
     generators = "cmake"
     revision_mode = "scm"
 
@@ -38,6 +37,9 @@ def requirements(self):
     def configure(self):
         if self.settings.os == 'Windows' and self.options.LLA_BUILD_RFIDEAS:
             self.options['LogicalAccess'].LLA_BUILD_RFIDEAS = True
+
+        self.options['LogicalAccess'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
+        self.options['LogicalAccessPrivate'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
 
     def configure_cmake(self):
         cmake = CMake(self, build_type=self.settings.build_type)