Merge pull request #129 from Mahlet-Inc/develop

Develop

.releaserc.json

@@ -35,14 +35,29 @@
                     "name": "hobbits-${nextRelease.version}-gcc7.tgz"
                 },
                 {
-                    "path": "hobbits/windows_release/windows_release.zip",
+                    "path": "hobbits/ubuntu20_gcc9_release/ubuntu20_gcc9_release.tar.gz",
+                    "label": "Hobbits (64-bit Ubuntu 20.04 GCC 9)",
+                    "name": "hobbits-${nextRelease.version}-gcc9.tgz"
+                },
+                {
+                    "path": "hobbits/win_2016_release/win_2016_release.zip",
                     "label": "Hobbits (64-bit Windows 2016 msvc2017)",
-                    "name": "hobbits-${nextRelease.version}-win.zip"
+                    "name": "hobbits-${nextRelease.version}-win2016.zip"
+                },
+                {
+                    "path": "hobbits/win_2019_release/win_2019_release.zip",
+                    "label": "Hobbits (64-bit Windows 2019)",
+                    "name": "hobbits-${nextRelease.version}-win2019.zip"
                 },
                 {
-                    "path": "hobbits/mac_release/mac_release.tar.gz",
+                    "path": "hobbits/mac_1014_release/mac_1014_release.tar.gz",
                     "label": "Hobbits (64-bit Mac OSX 10.14)",
-                    "name": "hobbits-${nextRelease.version}-mac.tgz"
+                    "name": "hobbits-${nextRelease.version}-mac1014.tgz"
+                },
+                {
+                    "path": "hobbits/mac_11_release/mac_11_release.tar.gz",
+                    "label": "Hobbits (64-bit Mac OSX 11)",
+                    "name": "hobbits-${nextRelease.version}-mac11.tgz"
                 }
                 ]
             }

CMakeLists.txt

@@ -104,6 +104,10 @@ else()
 	else()
 		find_package(FFTW COMPONENTS DOUBLE_LIB DOUBLE_THREADS_LIB REQUIRED)
 	endif()
+
+	# Libusb
+	find_package(libusb-1.0 REQUIRED)
+
 endif()
 
 #

azure-pipelines.yml

@@ -8,15 +8,24 @@ pr:
     - develop
 
 jobs:
-- job: UbuntuLinuxGCC7
+- job: UbuntuLinux18GCC7
   pool:
     vmImage: 'ubuntu-18.04'
   steps:
     - template: ci/ubuntu-setup.yml
     - template: ci/linux.yml
       parameters:
         artifactName: ubuntu18_gcc7_release
-        pythonArtifact: python_ubuntu_1804
+
+- job: UbuntuLinux20GCC9
+  pool:
+    vmImage: 'ubuntu-20.04'
+  steps:
+    - template: ci/ubuntu-setup.yml
+    - template: ci/linux.yml
+      parameters:
+        artifactName: ubuntu20_gcc9_release
+
 - job: CentOS74LinuxGCC48
   pool:
     vmImage: 'ubuntu-18.04'
@@ -26,13 +35,35 @@ jobs:
       parameters:
         artifactName: centos7_gcc48_release
         pythonArtifact: python_centos_74
-- job: Windows
+
+- job: Windows2019
+  pool:
+    vmImage: 'windows-2019'
+  steps:
+    - template: ci/windows.yml
+      parameters:
+        artifactName: win_2019_release
+
+- job: Windows2016vs2017
   pool:
     vmImage: 'vs2017-win2016'
   steps:
     - template: ci/windows.yml
-- job: Mac
+      parameters:
+        artifactName: win_2016_release
+
+- job: Mac1014
   pool:
     vmImage: 'macOS-10.14'
   steps:
     - template: ci/mac.yml
+      parameters:
+        artifactName: mac_1014_release
+
+- job: Mac11
+  pool:
+    vmImage: 'macOS-11'
+  steps:
+    - template: ci/mac.yml
+      parameters:
+        artifactName: mac_11_release

ci/linux.yml

@@ -2,9 +2,6 @@ parameters:
   - name: artifactName
     type: string
     default: linux_release
-  - name: pythonArtifact
-    type: string
-    default: python_linux
 
 steps:
   - checkout: self

ci/mac.yml

@@ -1,3 +1,8 @@
+parameters:
+  - name: artifactName
+    type: string
+    default: mac_release
+
 steps:
   - checkout: self
     persistCredentials: true
@@ -58,12 +63,12 @@ steps:
     displayName: 'Run conan package'
 
   - bash: |
-      tar -czf ../mac_release.tar.gz .
-      cp ../mac_release.tar.gz $(Build.ArtifactStagingDirectory)
+      tar -czf ../${{ parameters.artifactName }}.tar.gz .
+      cp ../${{ parameters.artifactName }}.tar.gz $(Build.ArtifactStagingDirectory)
     workingDirectory: $(Build.SourcesDirectory)/build/package
     displayName: 'Collect and zip package files'
 
   - task: PublishBuildArtifacts@1
     inputs:
       pathToPublish: $(Build.ArtifactStagingDirectory)
-      artifactName: mac_release
+      artifactName: ${{ parameters.artifactName }}

ci/windows.yml

@@ -1,3 +1,8 @@
+parameters:
+  - name: artifactName
+    type: string
+    default: win_release
+
 steps:
   - checkout: self
     persistCredentials: true
@@ -49,10 +54,10 @@ steps:
     inputs:
       rootFolderOrFile: $(Build.SourcesDirectory)/build/package
       includeRootFolder: false
-      archiveFile: $(Build.ArtifactStagingDirectory)/windows_release.zip
+      archiveFile: $(Build.ArtifactStagingDirectory)/${{ parameters.artifactName }}.zip
       verbose: true
 
   - task: PublishBuildArtifacts@1
     inputs:
       pathToPublish: $(Build.ArtifactStagingDirectory)
-      artifactName: windows_release
+      artifactName: ${{ parameters.artifactName }}

cmake/Findlibusb-1.0.cmake

@@ -0,0 +1,98 @@
+# - Try to find libusb-1.0
+# Once done this will define
+#
+#  LIBUSB_1_FOUND - system has libusb
+#  LIBUSB_1_INCLUDE_DIRS - the libusb include directory
+#  LIBUSB_1_LIBRARIES - Link these to use libusb
+#  LIBUSB_1_DEFINITIONS - Compiler switches required for using libusb
+#
+#  Adapted from cmake-modules Google Code project
+#
+#  Copyright (c) 2006 Andreas Schneider <[email protected]>
+#
+#  (Changes for libusb) Copyright (c) 2008 Kyle Machulis <[email protected]>
+#
+# Redistribution and use is allowed according to the terms of the New BSD license.
+#
+# CMake-Modules Project New BSD License
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# * Neither the name of the CMake-Modules Project nor the names of its
+#   contributors may be used to endorse or promote products derived from this
+#   software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+#  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+
+if (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
+  # in cache already
+  set(LIBUSB_FOUND TRUE)
+else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
+  find_path(LIBUSB_1_INCLUDE_DIR
+    NAMES
+	libusb.h
+    PATHS
+      /usr/include
+      /usr/local/include
+      /opt/local/include
+      /sw/include
+	PATH_SUFFIXES
+	  libusb-1.0
+  )
+
+  find_library(LIBUSB_1_LIBRARY
+    NAMES
+      usb-1.0 usb
+    PATHS
+      /usr/lib
+      /usr/local/lib
+      /opt/local/lib
+      /sw/lib
+  )
+
+  set(LIBUSB_1_INCLUDE_DIRS
+    ${LIBUSB_1_INCLUDE_DIR}
+  )
+  set(LIBUSB_1_LIBRARIES
+    ${LIBUSB_1_LIBRARY}
+)
+
+  if (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
+     set(LIBUSB_1_FOUND TRUE)
+  endif (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
+
+  if (LIBUSB_1_FOUND)
+    if (NOT libusb_1_FIND_QUIETLY)
+      message(STATUS "Found libusb-1.0:")
+	  message(STATUS " - Includes: ${LIBUSB_1_INCLUDE_DIRS}")
+	  message(STATUS " - Libraries: ${LIBUSB_1_LIBRARIES}")
+    endif (NOT libusb_1_FIND_QUIETLY)
+  else (LIBUSB_1_FOUND)
+    if (libusb_1_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find libusb")
+    endif (libusb_1_FIND_REQUIRED)
+  endif (LIBUSB_1_FOUND)
+
+  # show the LIBUSB_1_INCLUDE_DIRS and LIBUSB_1_LIBRARIES variables only in the advanced view
+  mark_as_advanced(LIBUSB_1_INCLUDE_DIRS LIBUSB_1_LIBRARIES)
+
+endif (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)

conanfile.py

@@ -27,15 +27,16 @@ def set_version(self):
         "libpcap:shared": True,
         "fftw:threads": True,
         "fftw:combinedthreads": True,
-        "icu:shared":True
+        "icu:shared":False
         }
     generators = "cmake"
     exports_sources = "CMakeLists.txt", "cmake*", "src*"
 
     requires = [
         ("qt/5.15.2"),
-        ("hobbits-cpython/3.9.1"),
-        ("fftw/3.3.9")
+        ("hobbits-cpython/3.9.7"),
+        ("fftw/3.3.9"),
+        ("libusb/1.0.24")
     ]
 
     def requirements(self):

src/hobbits-plugins/analyzers/KaitaiStruct/scripts/runner.py

@@ -154,7 +154,7 @@ def parse_data(input_filename, output_filename, action_progress):
     module_file = os.path.basename(scripts[0])
     sys.path.append(os.path.dirname(scripts[0]))
     package_name = os.path.splitext(module_file)[0]
-    class_name = package_name.capitalize()
+    class_name = "".join([s.capitalize() for s in package_name.split("_")])
     try:
         del sys.modules[package_name]
     except KeyError:

src/hobbits-plugins/importerexporters/UsbDevice/CMakeLists.txt

@@ -0,0 +1,9 @@
+if(NOT WIN32)
+	pluginInDir("${pluginType}" "UsbDevice" "${CMAKE_CURRENT_SOURCE_DIR}")
+
+	if (BUILDING_WITH_CONAN)
+		target_link_libraries("hobbits-plugin-importerexporters-UsbDevice" PRIVATE CONAN_PKG::libusb)
+	else()
+		target_link_libraries("hobbits-plugin-importerexporters-UsbDevice" PRIVATE usb-1.0)
+	endif()
+endif()

src/hobbits-plugins/importerexporters/UsbDevice/usb_resources.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/usbresources">
+        <file>usb_resources/usb.ids</file>
+    </qresource>
+</RCC>