Skip to content

Commit

Permalink
Applied updates and changes for deployment
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Nov 19, 2023
1 parent 832e019 commit 5764671
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 631 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ jobs:
compiler: 'gcc'
configure_options: '--enable-python'
python_version: ''
- architecture: 'x64'
compiler: 'gcc'
configure_options: '--enable-python3'
python_version: '3'
steps:
- uses: actions/checkout@v3
- name: Install build dependencies
Expand Down
2 changes: 0 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ SUBDIRS = \
ewftools \
ewf.net \
pyewf \
pyewf-python2 \
pyewf-python3 \
po \
manuals \
tests \
Expand Down
5 changes: 0 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,6 @@ environment:
BUILD_ENVIRONMENT: cygwin64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
CONFIGURE_OPTIONS: "--enable-python"
- TARGET: cygwin64-gcc-python3
BUILD_ENVIRONMENT: cygwin64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
CONFIGURE_OPTIONS: "--enable-python3"
PYTHON_VERSION: 3
- TARGET: cygwin64-gcc-static-executables
BUILD_ENVIRONMENT: cygwin64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
Expand Down
6 changes: 2 additions & 4 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ([2.71])

AC_INIT(
[libewf],
[20231119],
[20231120],
[[email protected]])

AC_CONFIG_SRCDIR(
Expand Down Expand Up @@ -161,7 +161,7 @@ dnl Check if libewf Python bindings (pyewf) required headers and functions are a
AX_PYTHON_CHECK_ENABLE

AS_IF(
[test "x${ac_cv_enable_python}" != xno || test "x${ac_cv_enable_python2}" != xno || test "x${ac_cv_enable_python3}" != xno],
[test "x${ac_cv_enable_python}" != xno],
[dnl Headers included in pyewf/pyewf_error.c
AC_CHECK_HEADERS([stdarg.h varargs.h])
Expand Down Expand Up @@ -250,8 +250,6 @@ AC_CONFIG_FILES([libhmac/Makefile])
AC_CONFIG_FILES([libcaes/Makefile])
AC_CONFIG_FILES([libewf/Makefile])
AC_CONFIG_FILES([pyewf/Makefile])
AC_CONFIG_FILES([pyewf-python2/Makefile])
AC_CONFIG_FILES([pyewf-python3/Makefile])
AC_CONFIG_FILES([ewf.net/Makefile])
AC_CONFIG_FILES([libodraw/Makefile])
AC_CONFIG_FILES([libsmdev/Makefile])
Expand Down
2 changes: 1 addition & 1 deletion dpkg/rules
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export SKIP_PYTHON_TESTS=1

.PHONY: override_dh_auto_configure
override_dh_auto_configure:
dh_auto_configure -- --enable-python3 CFLAGS="-g"
dh_auto_configure -- --enable-python CFLAGS="-g"

.PHONY: override_dh_install
override_dh_install:
Expand Down
2 changes: 1 addition & 1 deletion libewf.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Several tools for reading and writing EWF files
%setup -q

%build
%configure --prefix=/usr --libdir=%{_libdir} --mandir=%{_mandir} --enable-python3
%configure --prefix=/usr --libdir=%{_libdir} --mandir=%{_mandir} --enable-python
make %{?_smp_mflags}

%install
Expand Down
Loading

0 comments on commit 5764671

Please sign in to comment.