Rename win32 to native

liblogicalaccess · Jan 9, 2024 · 2272c8e · 2272c8e
1 parent 0e2133e
commit 2272c8e
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 924 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,14 +27,14 @@ sources/!LibLogicalAccessNet/Exception/CustomException.cs
 *.sdf
 *opensdf
 .vs
-sources/LibLogicalAccessNet.win32/*.filters
+sources/LibLogicalAccessNet.native/*.filters
 installer/LibLogicalAccessNet-cache
 installer/LibLogicalAccessNet-SetupFiles
 /installer/output
 /installer/VERSION
 /installer/build.*
-sources/LibLogicalAccessNet.win32/build/
-sources/LibLogicalAccessNet.win32/bin/
+sources/LibLogicalAccessNet.native/build/
+sources/LibLogicalAccessNet.native/bin/
 /installer/conanbuildinfo.txt
 /installer/conaninfo.txt
 /installer/conan_imports_manifest.txt

diff --git a/installer/conanfile.py b/installer/conanfile.py
@@ -15,22 +15,10 @@ def configure(self):
         self.options['LogicalAccess'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST
 
     def requirements(self):
-        try:
-            if self.options.LLA_BUILD_NFC:
-                self.requires('LogicalAccessNFC/' + self.version + '@lla/' + self.channel)
-            else:
-                self.requires('LogicalAccess/' + self.version + '@lla/' + self.channel)
-        except ConanException:
-            try:
-                if self.options.LLA_BUILD_NFC:
-                    self.requires('LogicalAccessNFC/' + self.version + '@lla/' + tools.Git().get_branch())
-                else:
-                    self.requires('LogicalAccess/' + self.version + '@lla/' + tools.Git().get_branch())
-            except ConanException:
-                if self.options.LLA_BUILD_NFC:
-                    self.requires('LogicalAccessNFC/' + self.version)
-                else:
-                    self.requires('LogicalAccess/' + self.version)
+        if self.options.LLA_BUILD_NFC:
+            self.requires('LogicalAccessNFC/' + self.version)
+        else:
+            self.requires('LogicalAccess/' + self.version)
 
     def imports(self):
         self.copy("bin/*.dll", keep_path=False, dst="./packages/dll/" + str(self.settings.arch) + "/" + str(self.settings.build_type))

diff --git a/sources/LibLogicalAccessNet.native/conanfile.py b/sources/LibLogicalAccessNet.native/conanfile.py
@@ -11,27 +11,15 @@ class LLASwig(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
     options = { 'LLA_BUILD_NFC': [True, False],
                 'LLA_BUILD_UNITTEST': [True, False]}
-    default_options = 'LogicalAccess:LLA_BUILD_PKCS=True','LogicalAccess:LLA_BUILD_IKS=False', 'LLA_BUILD_NFC=True'
+    default_options = 'LogicalAccess:LLA_BUILD_PKCS=True', 'LLA_BUILD_NFC=False', 'LLA_BUILD_UNITTEST=False'
     generators = "cmake"
     revision_mode = "scm"
 
     def requirements(self):
-        try:
-            if self.options.LLA_BUILD_NFC:
-                self.requires('LogicalAccessNFC/' + self.version + '@lla/' + self.channel)
-            else:
-                self.requires('LogicalAccess/'+ self.version + '@lla/' + self.channel)
-        except ConanException:
-            try:
-                if self.options.LLA_BUILD_NFC:
-                    self.requires('LogicalAccessNFC/' + self.version + '@lla/' + tools.Git().get_branch())
-                else:
-                    self.requires('LogicalAccess/'+ self.version + '@lla/' + tools.Git().get_branch())
-            except ConanException:
-                if self.options.LLA_BUILD_NFC:
-                    self.requires('LogicalAccessNFC/' + self.version)
-                else:
-                    self.requires('LogicalAccess/'+ self.version)
+        if self.options.LLA_BUILD_NFC:
+            self.requires('LogicalAccessNFC/' + self.version)
+        else:
+            self.requires('LogicalAccess/'+ self.version)
 
     def configure(self):
         self.options['LogicalAccess'].LLA_BUILD_UNITTEST = self.options.LLA_BUILD_UNITTEST

diff --git a/sources/LibLogicalAccessNet.native/liblogicalaccess.i b/sources/LibLogicalAccessNet.native/liblogicalaccess.i
@@ -11,45 +11,6 @@
 
 /* Define_section */
 
-#define LLA_READERS_STIDSTR_API
-#define LLA_READERS_PRIVATE_KEYBOARD_API
-#define LLA_READERS_PCSC_API
-#define LLA_READERS_OSDP_API
-#define LLA_READERS_OK5553_API
-#define LLA_READERS_ISO7816_API
-#define LLA_READERS_GUNNEBO_API
-#define LLA_READERS_ELATEC_API
-#define LLA_READERS_DEISTER_API
-#define LLA_CRYPTO_API
-#define LLA_CORE_API
-#define LLA_COMMON_API
-#define LLA_CARDS_YUBIKEY_API
-#define LLA_CARDS_TWIC_API
-#define LLA_CARDS_TOPAZ_API
-#define LLA_CARDS_TAGIT_API
-#define LLA_CARDS_STMLRI_API
-#define LLA_CARDS_SMARTFRAME_API
-#define LLA_CARDS_SEOS_API
-#define LLA_CARDS_SAMAV_API
-#define LLA_CARDS_PROX_API
-#define LLA_CARDS_PROXLITE_API
-#define LLA_CARDS_MIFARE_API
-#define LLA_CARDS_MIFAREULTRALIGHT_API
-#define LLA_CARDS_MIFAREPLUS_API
-#define LLA_CARDS_LEGICPRIME_API
-#define LLA_CARDS_ISO7816_API
-#define LLA_CARDS_ISO15693_API
-#define LLA_CARDS_INFINEONMYD_API
-#define LLA_CARDS_INDALA_API
-#define LLA_CARDS_ICODE2_API
-#define LLA_CARDS_ICODE1_API
-#define LLA_CARDS_GENERICTAG_API
-#define LLA_CARDS_FELICA_API
-#define LLA_CARDS_EPASS_API
-#define LLA_CARDS_EM4135_API
-#define LLA_CARDS_EM4102_API
-#define LLA_CARDS_DESFIRE_API
-#define LLA_CARDS_CPS3_API
 
 /* END_Define_section */
 
@@ -79,6 +40,7 @@
 
 /*****SHARED PTR SECTION*****/
 
+
 /*** MULTIPLE INHERITANCE ***/
 
 %define INTERFACEPTR(CTYPE)