Skip to content

Xml elementtree port #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcepl wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Xml elementtree port #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
24861ff
WIP: switch XML API to ElementTree bridge
mcepl Mar 2, 2026
29d0081
Fix mock xmlapi typeid argument handling
mcepl Mar 2, 2026
53f30e5
Fix xmlapi arg parsing and build/test paths
mcepl Mar 2, 2026
8e3c47a
Fix XML output for ElementTree parsing
mcepl Mar 2, 2026
81dd657
Remove Travis config and update ElementTree port notes
mcepl Mar 2, 2026
d80cb15
fix: make `make build` work
mcepl Mar 3, 2026
0c6c9a2
fix: restore xmlapi kwarg compatibility
mcepl Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
*.pyc
build/
*.so
*.o
*.a
*.egg-info/
__pycache__/
25 changes: 0 additions & 25 deletions .travis.yml
View file
Open in desktop

This file was deleted.

32 changes: 16 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,21 @@
#. $AutoHeaderSerial::20100225 $
#. ******* AUTOHEADER END v1.2 *******

PY_BIN := python3
PY_BIN ?= python3
VERSION := $(shell cd src;$(PY_BIN) -c "from setup_common import *; print(get_version());")
PACKAGE := python-dmidecode
PY_VER := $(shell $(PY_BIN) -c 'import sys; print("%d.%d"%sys.version_info[0:2])')
PY_MV := $(shell echo $(PY_VER) | cut -b 1)
PY := python$(PY_VER)
SO_PATH := build/lib.linux-$(shell uname -m)-$(PY_VER)
PY_MV := $(shell $(PY_BIN) -c 'import sys; print(sys.version_info[0])')
PY_TAG := $(shell $(PY_BIN) -c 'import sys; print("python%d.%d"%sys.version_info[0:2])')

ifeq ($(PY_MV),2)
SO := $(SO_PATH)/dmidecodemod.so
PLATFORM := $(shell $(PY_BIN) -c 'from distutils.util import get_platform; print(get_platform())')
BUILD_LIB := build/lib.$(PLATFORM)-$(PY_VER)
SO := $(BUILD_LIB)/dmidecodemod.so
else
SOABI := $(shell $(PY_BIN) -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))')
SO := $(SO_PATH)/dmidecodemod.$(SOABI).so
SOABI := $(shell $(PY_BIN) -c 'import sysconfig; print(sysconfig.get_config_var("SOABI") or "")')
BUILD_LIB := $(shell $(PY_BIN) -c 'import sys, sysconfig; print("build/lib.%s-%s" % (sysconfig.get_platform(), sys.implementation.cache_tag))')
SO := $(BUILD_LIB)/dmidecodemod.$(SOABI).so
endif
SHELL := /bin/bash

Expand All @@ -58,23 +61,21 @@ SHELL := /bin/bash

all : build dmidump

build: $(PY)-dmidecodemod.so
$(PY)-dmidecodemod.so: $(SO)
cp $< $@
$(SO):
$(PY) src/setup.py build
build:
$(PY_BIN) src/setup.py build
cp "$(SO)" "$(PY_TAG)-dmidecodemod.so"

dmidump : src/util.o src/efi.o src/dmilog.o
$(CC) -o $@ src/dmidump.c $^ -g -Wall -D_DMIDUMP_MAIN_

install:
$(PY) src/setup.py install
$(PY_BIN) src/setup.py install

uninstall:
$(PY) src/setup.py uninstall
$(PY_BIN) src/setup.py uninstall

clean:
-$(PY) src/setup.py clean --all
-$(PY_BIN) src/setup.py clean --all
-rm -f *.so lib/*.o core dmidump src/*.o
-rm -rf build
-rm -rf rpm
Expand Down Expand Up @@ -111,4 +112,3 @@ conflicts:
@comm -12 \
<(dpkg-deb -c ../../DPKGS/python-dmidecode_$(VERSION)-1_amd64.deb | awk '$$NF!~/\/$$/{print$$NF}'|sort) \
<(dpkg-deb -c ../../DPKGS/python-dmidecode-dbg_$(VERSION)-1_amd64.deb | awk '$$NF!~/\/$$/{print$$NF}'|sort)

Loading