From 268687f5b525ce4bdb1becd5a5207bfc2ced8340 Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Tue, 28 Apr 2009 00:55:28 +1000 Subject: Version number fix --- src/setup-dbg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 1a23240..65f7436 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -2,7 +2,7 @@ from distutils.core import setup, Extension setup( name = "python-dmidecode-dbg", - version = "2.10.3", + version = "2.10.5", description = "Python extension module for dmidecode", author = "Nima Talebi", author_email = "nima@autonomy.net.au", -- cgit From ceaf615744b2a1a9cd655abef25e0840de731d01 Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Wed, 20 May 2009 23:18:28 +1000 Subject: Fixed a bug, and preparing to dupload to Debian --- src/setup-dbg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 65f7436..e4b3b37 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -2,7 +2,7 @@ from distutils.core import setup, Extension setup( name = "python-dmidecode-dbg", - version = "2.10.5", + version = "2.10.6", description = "Python extension module for dmidecode", author = "Nima Talebi", author_email = "nima@autonomy.net.au", -- cgit From df5ddd3f51a353d03f2bd6a27c5d9ce14f077f41 Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Thu, 21 May 2009 00:05:58 +1000 Subject: Bringing setup files upto date --- src/setup-dbg.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index e4b3b37..fe05898 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -4,9 +4,9 @@ setup( name = "python-dmidecode-dbg", version = "2.10.6", description = "Python extension module for dmidecode", - author = "Nima Talebi", - author_email = "nima@autonomy.net.au", - url = "http://projects.autonomy.net.au/dmidecode/", + author = "Nima Talebi & David Sommerseth", + author_email = "nima@it.net.au, davids@redhat.com", + url = "http://projects.autonomy.net.au/python-dmidecode/", ext_modules = [ Extension( "dmidecode", @@ -15,10 +15,13 @@ setup( "src/dmihelper.c", "src/util.c", "src/dmioem.c", - "src/dmidecode.c" + "src/dmidecode.c", + "src/dmixml.c", + "src/xmlpythonizer.c" ], - library_dirs = [ "/home/nima/dev-room/projects/dmidecode" ], - libraries = [ "util" ], + include_dirs = [ "/usr/include/libxml2" ], + #library_dirs = [ "/home/nima/dev-room/projects/dmidecode" ], + libraries = [ "util", "xml2" ], #libraries = [ "util", "efence" ], ) ] -- cgit From d06d776adb0fef9504bd7662760e4cd0971fb748 Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Fri, 22 May 2009 23:49:55 +1000 Subject: Reversioned, relicensed, and rejigged The version is of now, v3.10.6. The version major field has been upped due to the newly added XML functionality. The version has been reverted to GPLv2. Some headers have been cleaned up, copyright notices added etc. Credits given where due. --- src/setup-dbg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index fe05898..1caac4d 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -2,7 +2,7 @@ from distutils.core import setup, Extension setup( name = "python-dmidecode-dbg", - version = "2.10.6", + version = "3.10.6", description = "Python extension module for dmidecode", author = "Nima Talebi & David Sommerseth", author_email = "nima@it.net.au, davids@redhat.com", -- cgit From 90c5bac90b3366b897d7c34a4bba2a31e608b62c Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Sat, 23 May 2009 13:53:28 +1000 Subject: Updating Debian-specifics --- src/setup-dbg.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 1caac4d..8b66f21 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -3,6 +3,7 @@ from distutils.core import setup, Extension setup( name = "python-dmidecode-dbg", version = "3.10.6", + license='GPL-2', description = "Python extension module for dmidecode", author = "Nima Talebi & David Sommerseth", author_email = "nima@it.net.au, davids@redhat.com", @@ -20,9 +21,9 @@ setup( "src/xmlpythonizer.c" ], include_dirs = [ "/usr/include/libxml2" ], - #library_dirs = [ "/home/nima/dev-room/projects/dmidecode" ], libraries = [ "util", "xml2" ], - #libraries = [ "util", "efence" ], + #libraries = [ "util", "xml2", "efence" ], + data_files = [ ('share/python-dmidecode', ['src/pythonmap.xml']) ] ) ] ) -- cgit From a18a72fab2a622077d5257003b09be30ab283339 Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Sat, 23 May 2009 14:37:01 +1000 Subject: More cleanup Don't write to stdout unless in debug mode (with respect to writing to memory devices. Added the xml datafile to setup (distutils). Updated test case (incorporating color and cleaning up tests). --- src/setup-dbg.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 8b66f21..0b7a2ed 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -8,6 +8,7 @@ setup( author = "Nima Talebi & David Sommerseth", author_email = "nima@it.net.au, davids@redhat.com", url = "http://projects.autonomy.net.au/python-dmidecode/", + data_files = [ ('share/python-dmidecode-dbg', ['src/pythonmap.xml']) ], ext_modules = [ Extension( "dmidecode", @@ -21,9 +22,7 @@ setup( "src/xmlpythonizer.c" ], include_dirs = [ "/usr/include/libxml2" ], - libraries = [ "util", "xml2" ], - #libraries = [ "util", "xml2", "efence" ], - data_files = [ ('share/python-dmidecode', ['src/pythonmap.xml']) ] + libraries = [ "util", "xml2" ], #[ "util", "xml2", "efence" ], ) ] ) -- cgit From 64d2c31c902439eb0e62471fe97086bf217e7926 Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Sun, 24 May 2009 04:09:58 +1000 Subject: Follow-up on recent XML config file rename --- src/setup-dbg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 0b7a2ed..988c3f3 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -8,7 +8,7 @@ setup( author = "Nima Talebi & David Sommerseth", author_email = "nima@it.net.au, davids@redhat.com", url = "http://projects.autonomy.net.au/python-dmidecode/", - data_files = [ ('share/python-dmidecode-dbg', ['src/pythonmap.xml']) ], + data_files = [ ('share/python-dmidecode-dbg', ['src/py-map.xml', 'src/py-typemap.xml']) ], ext_modules = [ Extension( "dmidecode", -- cgit From 13ff9d7e48ab1574b36473f75701cc7f7c1e461a Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Wed, 27 May 2009 00:11:54 +1000 Subject: WIP commit Merged the two XML files into one, and amended relevant code. I still want to modify the XML tag names, but not yet. The calls to dmidecode.type() not function as expected, but the others are broken - this is next. --- src/setup-dbg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 988c3f3..e0a2358 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -8,7 +8,7 @@ setup( author = "Nima Talebi & David Sommerseth", author_email = "nima@it.net.au, davids@redhat.com", url = "http://projects.autonomy.net.au/python-dmidecode/", - data_files = [ ('share/python-dmidecode-dbg', ['src/py-map.xml', 'src/py-typemap.xml']) ], + data_files = [ ('share/python-dmidecode-dbg', ['src/pymap.xml']) ], ext_modules = [ Extension( "dmidecode", -- cgit From 62ae0e75016b31aa3062f296ed070e0610f0b98f Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Wed, 3 Jun 2009 15:22:23 +0200 Subject: Removed some dead code --- src/setup-dbg.py | 1 - 1 file changed, 1 deletion(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index e0a2358..95292e4 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -14,7 +14,6 @@ setup( "dmidecode", sources = [ "src/dmidecodemodule.c", - "src/dmihelper.c", "src/util.c", "src/dmioem.c", "src/dmidecode.c", -- cgit From 23e77d69afdd720456a88f2ab57c69b240c08b6a Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Tue, 9 Jun 2009 21:19:01 +0200 Subject: Remember to compile in dmierror.c ;-) --- src/setup-dbg.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 95292e4..329c345 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -18,6 +18,7 @@ setup( "src/dmioem.c", "src/dmidecode.c", "src/dmixml.c", + "src/dmierror.c", "src/xmlpythonizer.c" ], include_dirs = [ "/usr/include/libxml2" ], -- cgit From a8257055f3d5f474d601cb3a5cbcbdb44e2b707d Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 11 Jun 2009 13:34:26 +0200 Subject: Made sure copyright is in place and right people get their deserved credit --- src/setup-dbg.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 329c345..8067cad 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -1,3 +1,31 @@ +# +# setup-dbg.py +# Python distutil package setup, with debug features enabled +# +# Copyright 2009 David Sommerseth +# Copyright 2007-2009 Nima Talebi +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# For the avoidance of doubt the "preferred form" of this code is one which +# is in an open unpatent encumbered format. Where cryptographic key signing +# forms part of the process of creating an executable the information +# including keys needed to generate an equivalently functional executable +# are deemed to be part of the source code. +# + from distutils.core import setup, Extension setup( -- cgit From 15463a7100a1d22ff2692f39d3a66f1d42eee3f7 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 11 Jun 2009 13:41:18 +0200 Subject: Updated setup-dbg.py to be in sync with setup.py Also undefined the NDEBUG when building this package --- src/setup-dbg.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 8067cad..9d297b0 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -27,6 +27,9 @@ # from distutils.core import setup, Extension +from distutils.sysconfig import get_python_lib + +libdir = get_python_lib(1) setup( name = "python-dmidecode-dbg", @@ -39,7 +42,7 @@ setup( data_files = [ ('share/python-dmidecode-dbg', ['src/pymap.xml']) ], ext_modules = [ Extension( - "dmidecode", + "dmidecodemod", sources = [ "src/dmidecodemodule.c", "src/util.c", @@ -50,7 +53,10 @@ setup( "src/xmlpythonizer.c" ], include_dirs = [ "/usr/include/libxml2" ], - libraries = [ "util", "xml2" ], #[ "util", "xml2", "efence" ], + library_dirs = [ libdir ], + libraries = [ "xml2", "xml2mod" ], + undef_macros = [ "NDEBUG" ] ) - ] + ], + py_modules = [ "dmidecode" ] ) -- cgit From 1d8478a6437e9eb4cd12c679c8dbd26dc2c344e1 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 11 Jun 2009 15:07:47 +0200 Subject: Improved setup.py/setup-dbg.py even more Get libxml2 compile time info from xml2-config. Retrieve version number from src/version.h --- src/setup-dbg.py | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 9d297b0..30e6754 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -28,12 +28,29 @@ from distutils.core import setup, Extension from distutils.sysconfig import get_python_lib +from setup_common import * -libdir = get_python_lib(1) +# +# Some default values +# +incdir = [] +libdir = [get_python_lib(1)] +libs = [] + +# Get libxml2 info +libxml2_include(incdir) +libxml2_lib(libdir, libs) + +# misc info +dmidec_version = get_version() + +# +# Python setup +# setup( name = "python-dmidecode-dbg", - version = "3.10.6", + version = dmidec_version, license='GPL-2', description = "Python extension module for dmidecode", author = "Nima Talebi & David Sommerseth", @@ -52,9 +69,9 @@ setup( "src/dmierror.c", "src/xmlpythonizer.c" ], - include_dirs = [ "/usr/include/libxml2" ], - library_dirs = [ libdir ], - libraries = [ "xml2", "xml2mod" ], + include_dirs = incdir, + library_dirs = libdir, + libraries = libs, undef_macros = [ "NDEBUG" ] ) ], -- cgit From cb94510ce84cea18a675f1984cc8a3c955e6a2a4 Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Wed, 17 Jun 2009 22:51:25 +1000 Subject: Commented in the Debian workaround for `xml2mod' --- src/setup-dbg.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 30e6754..38ba6df 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -34,6 +34,7 @@ from setup_common import * # Some default values # incdir = [] +#. XXX: Debian Workaound: libdir = [get_python_lib(1), "/usr/lib/pymodules/python%d.%d"%sys.version_info[0:2]] libdir = [get_python_lib(1)] libs = [] -- cgit From 3849ca0a4abf5eb661758e1341a6e595d3013c2c Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 18 Jun 2009 14:53:29 +0200 Subject: Splitted out SMBIOS/DMI dump functions from dmidecode.c to separate files --- src/setup-dbg.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 38ba6df..4077eaf 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -68,7 +68,9 @@ setup( "src/dmidecode.c", "src/dmixml.c", "src/dmierror.c", - "src/xmlpythonizer.c" + "src/xmlpythonizer.c", + "src/efi.c", + "src/dmidump.c" ], include_dirs = incdir, library_dirs = libdir, -- cgit From 392a9976b14d558d4b2f331b5a44ee97912fc5e3 Mon Sep 17 00:00:00 2001 From: Nima Talebi Date: Mon, 3 Aug 2009 20:16:22 +1000 Subject: Moved a OS-specific library settings out to common The libxml2 path is now handled by `setup_common.py', so the actual setup files are clean from any OS-specific (Debian/RedHat) hacks. --- src/setup-dbg.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/setup-dbg.py') diff --git a/src/setup-dbg.py b/src/setup-dbg.py index 4077eaf..9602abc 100644 --- a/src/setup-dbg.py +++ b/src/setup-dbg.py @@ -27,15 +27,13 @@ # from distutils.core import setup, Extension -from distutils.sysconfig import get_python_lib from setup_common import * # # Some default values # incdir = [] -#. XXX: Debian Workaound: libdir = [get_python_lib(1), "/usr/lib/pymodules/python%d.%d"%sys.version_info[0:2]] -libdir = [get_python_lib(1)] +libdir = [] libs = [] # Get libxml2 info -- cgit