From 212a6a22cdd53af27af79121d8b63a6e8f2cfde9 Mon Sep 17 00:00:00 2001
From: Riccardo Mori <rmori@quarkslab.com>
Date: Wed, 30 Aug 2023 16:09:37 +0200
Subject: [PATCH] Move to pyproject.toml and src dir structure. Add
 python-magic-bin dependency for windows

---
 pyproject.toml                           | 32 +++++++++++++++++++++
 setup.py                                 | 36 ------------------------
 {idascript => src/idascript}/__init__.py |  0
 {idascript => src/idascript}/ida.py      |  0
 {idascript => src/idascript}/utils.py    |  0
 5 files changed, 32 insertions(+), 36 deletions(-)
 create mode 100644 pyproject.toml
 delete mode 100644 setup.py
 rename {idascript => src/idascript}/__init__.py (100%)
 rename {idascript => src/idascript}/ida.py (100%)
 rename {idascript => src/idascript}/utils.py (100%)

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..6d44041
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,32 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "idascript"
+description = "IDA Pro wrapper to launch script on binaries"
+authors = [{ name = "Robin David", email = "rdavid@quarkslab.com" }]
+license = { text = "Apache Software License (Apache License, Version 2)" }
+readme = { file = "README.md", content-type = "text/markdown" }
+version = '0.1.0'
+requires-python = ">=3.8"
+dependencies = [
+    'python-magic',
+    'python-magic-bin; os_name=="nt"',
+    'click',
+    'progressbar2',
+]
+classifiers = [
+    'Topic :: Security',
+    'Environment :: Console',
+    'Operating System :: OS Independent',
+]
+
+[project.urls]
+Homepage = "https://github.com/quarkslab/idascript"
+Repository = "https://github.com/quarkslab/idascript"
+Documentation = "https://quarkslab.github.io/diffing-portal/idascript/README.html"
+"Bug Tracker" = "https://github.com/quarkslab/idascript/issues"
+
+[tools.setuptools]
+script-files = ["bins/idascripter"]
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 89e503b..0000000
--- a/setup.py
+++ /dev/null
@@ -1,36 +0,0 @@
-
-from setuptools import setup
-
-
-with open("README.md") as f:
-    README = f.read()
-
-
-setup(
-    name='idascript',
-    version='0.1.0',
-    description='IDA Pro wrapper to launch script on binaries',
-    author='Robin David',
-    author_email='rdavid@quarkslab.com',
-    url='https://github.com/quarkslab/idascript',
-    long_description_content_type='text/markdown',
-    long_description=README,
-    project_urls={
-        "Documentation": "https://quarkslab.github.io/diffing-portal/idascript/README.html",
-        "Bug Tracker": "https://github.com/quarkslab/idascript/issues",
-        "Source": "https://github.com/quarkslab/idascript"
-    },
-    packages=['idascript'],
-    install_requires=[
-        'python-magic',
-        'click',
-        'progressbar2'
-    ],
-    license="AGPL-3.0",
-    classifiers=[
-        'Topic :: Security',
-        'Environment :: Console',
-        'Operating System :: OS Independent',
-    ],
-    scripts=['bins/idascripter']
-)
diff --git a/idascript/__init__.py b/src/idascript/__init__.py
similarity index 100%
rename from idascript/__init__.py
rename to src/idascript/__init__.py
diff --git a/idascript/ida.py b/src/idascript/ida.py
similarity index 100%
rename from idascript/ida.py
rename to src/idascript/ida.py
diff --git a/idascript/utils.py b/src/idascript/utils.py
similarity index 100%
rename from idascript/utils.py
rename to src/idascript/utils.py