Fix Linux support (#1143)

* Fix #1140 * Change fgen * Change changelog * Revert readme change * Update CHANGELOG.md Reworded for clarity to non-contributors.
ni · Nov 22, 2019 · 8b4e24e · 8b4e24e
1 parent dd8e3cb
commit 8b4e24e
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
 * ### ALL
     * #### Added
     * #### Changed
+        * Fix #1140: Linux support was accidentally broken.
     * #### Removed
 * ### NI-DMM
     * #### Added

diff --git a/generated/nidcpower/_library_singleton.py b/generated/nidcpower/_library_singleton.py
@@ -12,7 +12,7 @@
 
 _instance = None
 _instance_lock = threading.Lock()
-_library_info = {'Linux': {'64bit': {'name': 'libnidcpower.so', 'type': 'cdll'}},
+_library_info = {'Linux': {'64bit': {'name': 'nidcpower', 'type': 'cdll'}},
                  'Windows': {'32bit': {'name': 'nidcpower_32.dll', 'type': 'windll'},
                              '64bit': {'name': 'nidcpower_64.dll', 'type': 'cdll'}}}
 

diff --git a/generated/nidigital/_library_singleton.py b/generated/nidigital/_library_singleton.py
@@ -12,7 +12,7 @@
 
 _instance = None
 _instance_lock = threading.Lock()
-_library_info = {'Linux': {'64bit': {'name': 'libnidigital.so', 'type': 'cdll'}},
+_library_info = {'Linux': {'64bit': {'name': 'nidigital', 'type': 'cdll'}},
                  'Windows': {'32bit': {'name': 'nidigital_32.dll', 'type': 'windll'},
                              '64bit': {'name': 'nidigital_64.dll', 'type': 'cdll'}}}
 

diff --git a/generated/nidmm/_library_singleton.py b/generated/nidmm/_library_singleton.py
@@ -12,7 +12,7 @@
 
 _instance = None
 _instance_lock = threading.Lock()
-_library_info = {'Linux': {'64bit': {'name': 'libnidmm.so', 'type': 'cdll'}},
+_library_info = {'Linux': {'64bit': {'name': 'nidmm', 'type': 'cdll'}},
                  'Windows': {'32bit': {'name': 'nidmm_32.dll', 'type': 'windll'},
                              '64bit': {'name': 'nidmm_64.dll', 'type': 'cdll'}}}
 

diff --git a/generated/nifake/_library_singleton.py b/generated/nifake/_library_singleton.py
@@ -12,7 +12,7 @@
 
 _instance = None
 _instance_lock = threading.Lock()
-_library_info = {'Linux': {'64bit': {'name': 'libnifake.so', 'type': 'cdll'}},
+_library_info = {'Linux': {'64bit': {'name': 'nifake', 'type': 'cdll'}},
                  'Windows': {'32bit': {'name': 'nifake_32.dll', 'type': 'windll'},
                              '64bit': {'name': 'nifake_64.dll', 'type': 'cdll'}}}
 

diff --git a/generated/nifgen/_library_singleton.py b/generated/nifgen/_library_singleton.py
@@ -12,7 +12,7 @@
 
 _instance = None
 _instance_lock = threading.Lock()
-_library_info = {'Linux': {'64bit': {'name': 'libfgen.so', 'type': 'cdll'}},
+_library_info = {'Linux': {'64bit': {'name': 'nifgen', 'type': 'cdll'}},
                  'Windows': {'32bit': {'name': 'nifgen_32.dll', 'type': 'windll'},
                              '64bit': {'name': 'nifgen_64.dll', 'type': 'cdll'}}}
 

diff --git a/generated/nimodinst/_library_singleton.py b/generated/nimodinst/_library_singleton.py
@@ -12,7 +12,7 @@
 
 _instance = None
 _instance_lock = threading.Lock()
-_library_info = {'Linux': {'64bit': {'name': 'libnimodinst.so', 'type': 'cdll'}},
+_library_info = {'Linux': {'64bit': {'name': 'nimodinst', 'type': 'cdll'}},
                  'Windows': {'32bit': {'name': 'nimodinst.dll', 'type': 'windll'},
                              '64bit': {'name': 'nimodinst_64.dll', 'type': 'cdll'}}}
 

diff --git a/generated/niscope/_library_singleton.py b/generated/niscope/_library_singleton.py
@@ -12,7 +12,7 @@
 
 _instance = None
 _instance_lock = threading.Lock()
-_library_info = {'Linux': {'64bit': {'name': 'libniscope.so', 'type': 'cdll'}},
+_library_info = {'Linux': {'64bit': {'name': 'niscope', 'type': 'cdll'}},
                  'Windows': {'32bit': {'name': 'niscope_32.dll', 'type': 'windll'},
                              '64bit': {'name': 'niscope_64.dll', 'type': 'cdll'}}}
 

diff --git a/generated/nise/_library_singleton.py b/generated/nise/_library_singleton.py
@@ -12,7 +12,7 @@
 
 _instance = None
 _instance_lock = threading.Lock()
-_library_info = {'Linux': {'64bit': {'name': 'libnise.so', 'type': 'cdll'}},
+_library_info = {'Linux': {'64bit': {'name': 'nise', 'type': 'cdll'}},
                  'Windows': {'32bit': {'name': 'nise.dll', 'type': 'windll'},
                              '64bit': {'name': 'nise.dll', 'type': 'cdll'}}}
 

diff --git a/generated/niswitch/_library_singleton.py b/generated/niswitch/_library_singleton.py
@@ -12,7 +12,7 @@
 
 _instance = None
 _instance_lock = threading.Lock()
-_library_info = {'Linux': {'64bit': {'name': 'libniswitch.so', 'type': 'cdll'}},
+_library_info = {'Linux': {'64bit': {'name': 'niswitch', 'type': 'cdll'}},
                  'Windows': {'32bit': {'name': 'niswitch_32.dll', 'type': 'windll'},
                              '64bit': {'name': 'niswitch_64.dll', 'type': 'cdll'}}}
 

diff --git a/generated/nitclk/_library_singleton.py b/generated/nitclk/_library_singleton.py
@@ -12,7 +12,7 @@
 
 _instance = None
 _instance_lock = threading.Lock()
-_library_info = {'Linux': {'64bit': {'name': 'libnitclk.so', 'type': 'cdll'}},
+_library_info = {'Linux': {'64bit': {'name': 'nitclk', 'type': 'cdll'}},
                  'Windows': {'32bit': {'name': 'nitclk.dll', 'type': 'windll'},
                              '64bit': {'name': 'nitclk_64.dll', 'type': 'cdll'}}}
 

diff --git a/src/nidcpower/metadata/config.py b/src/nidcpower/metadata/config.py
@@ -16,7 +16,7 @@
     'library_info': {
         'Linux': {
             '64bit': {
-                'name': 'libnidcpower.so',
+                'name': 'nidcpower',
                 'type': 'cdll'
             }
         },

diff --git a/src/nidigital/metadata/config.py b/src/nidigital/metadata/config.py
@@ -18,7 +18,7 @@
     'library_info': {
         'Linux': {
             '64bit': {
-                'name': 'libnidigital.so',
+                'name': 'nidigital',
                 'type': 'cdll'
             }
         },

diff --git a/src/nidmm/metadata/config.py b/src/nidmm/metadata/config.py
@@ -16,7 +16,7 @@
     'library_info': {
         'Linux': {
             '64bit': {
-                'name': 'libnidmm.so',
+                'name': 'nidmm',
                 'type': 'cdll'
             }
         },

diff --git a/src/nifake/metadata/config.py b/src/nifake/metadata/config.py
@@ -24,7 +24,7 @@
     'library_info': {
         'Linux': {
             '64bit': {
-                'name': 'libnifake.so',
+                'name': 'nifake',
                 'type': 'cdll'
             }
         },

diff --git a/src/nifgen/metadata/config.py b/src/nifgen/metadata/config.py
@@ -16,7 +16,7 @@
     'library_info': {
         'Linux': {
             '64bit': {
-                'name': 'libfgen.so',
+                'name': 'nifgen',
                 'type': 'cdll'
             }
         },

diff --git a/src/nimodinst/metadata/config.py b/src/nimodinst/metadata/config.py
@@ -11,7 +11,7 @@
     'library_info': {
         'Linux': {
             '64bit': {
-                'name': 'libnimodinst.so',
+                'name': 'nimodinst',
                 'type': 'cdll'
             }
         },

diff --git a/src/niscope/metadata/config.py b/src/niscope/metadata/config.py
@@ -21,7 +21,7 @@
     'library_info': {
         'Linux': {
             '64bit': {
-                'name': 'libniscope.so',
+                'name': 'niscope',
                 'type': 'cdll'
             }
         },

diff --git a/src/nise/metadata/config.py b/src/nise/metadata/config.py
@@ -14,7 +14,7 @@
     'library_info': {
         'Linux': {
             '64bit': {
-                'name': 'libnise.so',
+                'name': 'nise',
                 'type': 'cdll'
             }
         },

diff --git a/src/niswitch/metadata/config.py b/src/niswitch/metadata/config.py
@@ -16,7 +16,7 @@
     'library_info': {
         'Linux': {
             '64bit': {
-                'name': 'libniswitch.so',
+                'name': 'niswitch',
                 'type': 'cdll'
             }
         },

diff --git a/src/nitclk/metadata/config.py b/src/nitclk/metadata/config.py
@@ -10,7 +10,7 @@
     'library_info': {
         'Linux': {
             '64bit': {
-                'name': 'libnitclk.so',
+                'name': 'nitclk',
                 'type': 'cdll'
             }
         },