Merge pull request #15 from aboutcode-org/13-detect-go-packages

Detect go packages
aboutcode-org · Sep 5, 2024 · caf16b1 · caf16b1
2 parents 602f60e + 188fa5b
commit caf16b1
Show file tree

Hide file tree

Showing 25 changed files with 18,556 additions and 569 deletions.
diff --git a/configure b/configure
@@ -28,8 +28,8 @@ CLI_ARGS=$1
 ################################
 
 # Requirement arguments passed to pip and used by default or with --dev.
-REQUIREMENTS="--editable . --constraint requirements.txt"
-DEV_REQUIREMENTS="--editable .[testing] --constraint requirements.txt --constraint requirements-dev.txt"
+REQUIREMENTS="--editable . --constraint requirements.txt scancode-toolkit"
+DEV_REQUIREMENTS="--editable .[testing] --constraint requirements.txt --constraint requirements-dev.txt scancode-toolkit"
 DOCS_REQUIREMENTS="--editable .[docs] --constraint requirements.txt"
 
 # where we create a virtualenv

diff --git a/configure.bat b/configure.bat
@@ -26,9 +26,9 @@
 @rem ################################
 
 @rem # Requirement arguments passed to pip and used by default or with --dev.
-set "REQUIREMENTS=--editable . --constraint requirements.txt"
-set "DEV_REQUIREMENTS=--editable .[testing] --constraint requirements.txt --constraint requirements-dev.txt"
-set "DOCS_REQUIREMENTS=--editable .[docs] --constraint requirements.txt"
+set "REQUIREMENTS=--editable . --constraint requirements.txt scancode-toolkit"
+set "DEV_REQUIREMENTS=--editable .[testing] --constraint requirements.txt --constraint requirements-dev.txt scancode-toolkit"
+set "DOCS_REQUIREMENTS=--editable .[docs] --constraint requirements.txt scancode-toolkit"
 
 @rem # where we create a virtualenv
 set "VIRTUALENV_DIR=venv"

diff --git a/setup.cfg b/setup.cfg
@@ -43,7 +43,6 @@ python_requires = >=3.8
 install_requires =
     commoncode
     plugincode
-    scancode-toolkit
     typecode
 
 [options.entry_points]

diff --git a/src/go_inspector/bin/GoReSym_lin b/src/go_inspector/bin/GoReSym_lin
diff --git a/src/go_inspector/bin/GoReSym_lin.ABOUT b/src/go_inspector/bin/GoReSym_lin.ABOUT
@@ -1,10 +1,10 @@
 about_resource: GoReSym_lin
 name: goresym
-version: 2.7.2
-download_url: https://github.com/mandiant/GoReSym/releases/download/v2.7.2/GoReSym.zip
-package_url: pkg:github/mandiant/[email protected]?download_url=https://github.com/mandiant/GoReSym/releases/download/v2.7.2/GoReSym.zip
+version: 011fc7d5c9c2362871dfe88a1295a43ee6b4d273
+download_url: https://github.com/pombredanne/GoReSym/archive/011fc7d5c9c2362871dfe88a1295a43ee6b4d273.zip
+package_url: pkg:github/pombredanne/GoReSym@011fc7d5c9c2362871dfe88a1295a43ee6b4d273
 copyright: Copyright (c) 2022 MANDIANT
-checksum_sha1: d1a3252a3a174c8baacbe16b8d060b3affc9d05b
-checksum_sha256: 24c50fc10f169d36814b43da006bb5cd313baa04fcf94af99c730ef56eee62fe
 license_expression: mit
-license_text_file: GoReSym_lin.LICENSE
+license_text_file: GoReSym_lin.LICENSE
+notes: this is a patched version until https://github.com/mandiant/GoReSym/pull/60 is accepted
+ and merged.
diff --git a/src/go_inspector/bin/GoReSym_lin.results.json b/src/go_inspector/bin/GoReSym_lin.results.json
diff --git a/src/go_inspector/bin/update.sh b/src/go_inspector/bin/update.sh
@@ -22,7 +22,9 @@ sha256sum -c GoReSym.zip.sums
 unzip -qd goresymzip GoReSym.zip
 mv goresymzip/GoReSym_lin .
 chmod u+x GoReSym_lin
+strip GoReSym_lin
 
 rm -rf GoReSym.zip goresymzip
 
-# finally run a binary analysis on this GoReSym executable and update the ABOUT files accordingly 
+# finally run a binary analysis on this GoReSym executable, diff and update the ABOUT files accordingly 
+./GoReSym_lin -p -no-functions ./GoReSym_lin > GoReSym_lin.results.json