Skip to content

Commit

Permalink
Merge pull request #112 from dag-erling/des/windows-ci
Browse files Browse the repository at this point in the history
Update Windows build and add Windows to the CI lineup
  • Loading branch information
dag-erling authored Sep 13, 2024
2 parents 9c3c093 + fb7216f commit 6af7582
Show file tree
Hide file tree
Showing 22 changed files with 878 additions and 1,286 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,23 @@ jobs:
with:
name: tre-macos-logs
path: ./**/*.log
windows:
name: Windows
runs-on: windows-latest
steps:
- name: Prepare
uses: microsoft/setup-msbuild@v2
- name: Check out
uses: actions/checkout@v4
- name: Build
run: msbuild win32/tre.sln
- name: Run tests
run: |
win32/Debug/retest.exe -o tests/retest.log
win32/Debug/test-str-source.exe -o tests/test-str-source.log
- name: Upload logs
if: ${{ failure() }}
uses: actions/upload-artifact@v4
with:
name: tre-macos-logs
path: ./**/*.log
8 changes: 5 additions & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ SUBDIRS = local_includes lib $(agrep_dirs) tests utils po m4

EXTRA_DIST = \
LICENSE \
win32/tre-config.h win32/config.h \
win32/tre.vcproj \
win32/tre-config.h
win32/config.h \
win32/tre.vcxproj \
win32/tre.sln \
win32/retest.vcproj \
win32/retest.vcxproj \
win32/test-str-source.vcxproj \
python/tre-python.c \
python/setup.py \
python/example.py
Expand Down
32 changes: 10 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,32 +184,20 @@ handler, or in many threads of a multithreaded application.
Portable
--------

TRE is portable across multiple platforms. Here's a table of
platforms and compilers that have been successfully used to compile
and run TRE:
TRE is portable across multiple platforms. Below is a table of
platforms and compilers used to develop and test TRE:

<table>
<tr><th>Platform(s)</th> <th>Compiler(s)</th></tr>
<tr><td>AIX 4.3.2 - 5.3.0</td> <td>GCC, C for AIX compiler version 5</td></tr>
<tr><td>Compaq Tru64 UNIX V5.1A/B</td> <td>Compaq C V6.4-014 - V6.5-011</td></tr>
<tr><td>Cygwin 1.3 - 1.5</td> <td>GCC</td></tr>
<tr><td>Digital UNIX V4.0</td> <td>DEC C V5.9-005</td></tr>
<tr><td>FreeBSD 4 and above</td> <td>GCC</td></tr>
<tr><td>GNU/Linux systems on x86, x86_64, ppc64, s390</td><td>GCC</td></tr>
<tr><td>HP-UX 10.20- 11.00</td> <td>GCC, HP C Compiler</td></tr>
<tr><td>IRIX 6.5</td> <td>GCC, MIPSpro Compilers 7.3.1.3m</td></tr>
<tr><td>Max OS X</td></tr>
<tr><td>NetBSD 1.5 and above</td> <td>GCC, egcs</td></tr>
<tr><td>OpenBSD 3.3 and above</td> <td>GCC</td></tr>
<tr><td>Solaris 2.7-10 sparc/x86</td> <td>GCC, Sun Workshop 6 compilers</td></tr>
<tr><td>Windows 98 - XP</td> <td>Microsoft Visual C++ 6.0</td></tr>
<tr><th>Platform</th> <th>Compiler</th></tr>
<tr><td>FreeBSD 14.1</td> <td>Clang 18</td></tr>
<tr><td>Ubuntu 22.04</td> <td>GCC 11</td></tr>
<tr><td>macOS 14.6</td> <td>Clang 14</td></tr>
<tr><td>Windows 11</td> <td>Microsoft Visual Studio 2022</td></tr>
</table>


TRE 0.7.5 should compile without changes on all of the above
platforms. Tell me if you are using TRE on a platform that is not
listed above, and I'll add it to the list. Also let me know if TRE
does not work on a listed platform.
TRE should compile without changes on most modern POSIX-like
platforms, and be easily portable to any platform with a hosted C
implementation.

Depending on the platform, you may need to install libutf8 to get
wide character and multibyte character set support.
Expand Down
12 changes: 6 additions & 6 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ dnl Checks for programs.
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
AM_PROG_CC_C_O

dnl Checks for compiler characteristics.
AC_USE_SYSTEM_EXTENSIONS
AC_C_CONST
AC_C_INLINE

tre_version_1=`echo $PACKAGE_VERSION | cut -d . -f 1`
tre_version_2=`echo $PACKAGE_VERSION | cut -d . -f 2`
Expand Down Expand Up @@ -96,11 +100,6 @@ else
fi


dnl Checks for compiler characteristics.
AC_C_CONST
AC_C_INLINE
AC_USE_SYSTEM_EXTENSIONS

dnl Make sure locally configured headers are used (this adds the #define to config.h).
AC_DEFINE(USE_LOCAL_TRE_H, 1, [ Define to ensure locally configured headers are used ])

Expand Down Expand Up @@ -536,6 +535,7 @@ tests/agrep/Makefile
tre.pc
tre.spec
utils/Makefile
win32/config.h
win32/tre-config.h
])
AC_OUTPUT
Expand Down
16 changes: 0 additions & 16 deletions contrib/README.txt

This file was deleted.

101 changes: 0 additions & 101 deletions contrib/ps3/Makefile

This file was deleted.

3 changes: 0 additions & 3 deletions contrib/ps3/config.h

This file was deleted.

52 changes: 0 additions & 52 deletions contrib/ps3/tre-config.h

This file was deleted.

Loading

0 comments on commit 6af7582

Please sign in to comment.