Skip to content

Commit

Permalink
Merge pull request #1874 from ndim/parport-build-test
Browse files Browse the repository at this point in the history
Parport build test
  • Loading branch information
stefanrueger committed Aug 24, 2024
2 parents 9e9825c + 16d7d0b commit ca6e079
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 262 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ jobs:
cmake
-D BUILD_DOC=1
-D DEBUG_CMAKE=1
-D HAVE_PARPORT=1
-D HAVE_LINUXGPIO=1
-D HAVE_LINUXSPI=1
-D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
Expand Down Expand Up @@ -169,6 +170,7 @@ jobs:
run: >-
cmake
-D DEBUG_CMAKE=1
-D HAVE_PARPORT=1
-D HAVE_LINUXGPIO=1
-D HAVE_LINUXSPI=1
-D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
Expand Down
8 changes: 8 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,14 @@ if(BUILD_DOC)
add_subdirectory(src/doc)
endif()

if(HAVE_PARPORT)
if(WIN32)
message(FATAL_ERROR "avrdude does not support parallel port on Windows")
elseif(APPLE)
message(FATAL_ERROR "avrdude does not support parallel port on Apple systems")
endif()
endif()

# =====================================
# Configuration
# =====================================
Expand Down
1 change: 0 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ set(SOURCES
pindefs.c
ppi.c
ppi.h
ppiwin.c
serbb.h
serbb_posix.c
serbb_win32.c
Expand Down
1 change: 0 additions & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ libavrdude_la_SOURCES = \
pindefs.c \
ppi.c \
ppi.h \
ppiwin.c \
serbb.h \
serbb_posix.c \
serbb_win32.c \
Expand Down
11 changes: 11 additions & 0 deletions src/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,17 @@ AC_ARG_ENABLE(
esac],
[enabled_parport=no])

AS_IF([test "x$enabled_parport" = xyes], [dnl
case $target in
*-*-mingw32* | *-*-cygwin* | *-*-windows*)
AC_MSG_ERROR([avrdude does not support parallel port on Windows])
;;
*-*-darwin*)
AC_MSG_ERROR([avrdude does not support parallel port on MacOS])
;;
esac
])

AC_ARG_ENABLE(
[linuxgpio],
AS_HELP_STRING([--enable-linuxgpio],
Expand Down
260 changes: 0 additions & 260 deletions src/ppiwin.c

This file was deleted.

0 comments on commit ca6e079

Please sign in to comment.