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 Dec 3, 2023
1 parent 96576a5 commit dcc73dd
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 630 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
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Files to ignore by git
#
# Version: 20230926
# Version: 20231119

# Generic auto-generated build files
*~
Expand Down Expand Up @@ -127,7 +127,6 @@ stamp-h[1-9]
/libewf.spec
/libewf/libewf.rc
/libewf/libewf_definitions.h
/pyewf-python[23]/*.[ch]
/setup.cfg
/ewf.net/ewf.net.rc
/ewftools/*.exe
Expand Down
2 changes: 0 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ SUBDIRS = \
ewftools \
ewf.net \
pyewf \
pyewf-python2 \
pyewf-python3 \
po \
documents \
manuals \
Expand Down
5 changes: 0 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,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],
[20140815],
[20140816],
[[email protected]])

AC_CONFIG_SRCDIR(
Expand Down Expand Up @@ -159,7 +159,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 @@ -245,8 +245,6 @@ AC_CONFIG_FILES([libmfdata/Makefile])
AC_CONFIG_FILES([libhmac/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
4 changes: 2 additions & 2 deletions libewf.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<package >
<metadata>
<id>libewf</id>
<version>20140815</version>
<version>20140816</version>
<authors>Joachim Metz</authors>
<owners>joachimmetz</owners>
<license type="expression">LGPL-3.0-or-later</license>
<projectUrl>https://github.com/libyal/libewf</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<title>libewf</title>
<description>Library to access the Expert Witness Compression Format (EWF) format</description>
<releaseNotes>Release of libewf 20140815</releaseNotes>
<releaseNotes>Release of libewf 20140816</releaseNotes>
<copyright>Copyright (C) 2006-2023</copyright>
<tags>native</tags>
</metadata>
Expand Down
4 changes: 2 additions & 2 deletions libewf.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Header files and libraries for developing applications for libewf.
Summary: Python 3 bindings for libewf
Group: System Environment/Libraries
Requires: libewf = %{version}-%{release} python3
BuildRequires: python3-devel
BuildRequires: python3-devel python3-setuptools

%description -n libewf-python3
Python 3 bindings for libewf
Expand All @@ -53,7 +53,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 dcc73dd

Please sign in to comment.