Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
71 changes: 64 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,60 @@ jobs:
when: always
command: CXX=clang++-21 CC=clang-21 ./sanity-check.sh

build_20_04_mingw64:
working_directory: ~/GNUAspell/aspell
parallelism: 1
#shell: /bin/bash --login
# To see the list of pre-built images that CircleCI provides for most common languages see
# https://circleci.com/docs/2.0/circleci-images/
docker:
- image: cimg/base:2022.12-20.04
steps:
# Machine Setup
# If you break your build into multiple jobs with workflows, you will probably want to do the parts
# of this that are relevant in each
# The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly.
# In 2.0 you can choose where in the course of a job your code should be checked out.
- checkout
#
# note: default gcc version is 8.3
- run: sudo apt-get -y update
- run: sudo apt-get -y install make autopoint texinfo libtool intltool bzip2 gettext g++-multilib mingw-w64
- run: sudo apt-get -y purge aspell
#
- run: ./autogen
- run: ./configure --host=x86_64-w64-mingw32 && make
- run: make dist clean
- run: ./configure --host=i686-w64-mingw32 && make
- run: make dist clean

build_22_04_mingw64:
working_directory: ~/GNUAspell/aspell
parallelism: 1
#shell: /bin/bash --login
# To see the list of pre-built images that CircleCI provides for most common languages see
# https://circleci.com/docs/2.0/circleci-images/
docker:
- image: cimg/base:2022.12-22.04
steps:
# Machine Setup
# If you break your build into multiple jobs with workflows, you will probably want to do the parts
# of this that are relevant in each
# The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly.
# In 2.0 you can choose where in the course of a job your code should be checked out.
- checkout
#
# note: default gcc version is 8.3
- run: sudo apt-get -y update
- run: sudo apt-get -y install make autopoint texinfo libtool intltool bzip2 gettext g++-multilib mingw-w64
- run: sudo apt-get -y purge aspell
#
- run: ./autogen
- run: ./configure --host=x86_64-w64-mingw32 && make
- run: make dist clean
- run: ./configure --host=i686-w64-mingw32 && make
- run: make dist clean


tests_20_04:
working_directory: ~/GNUAspell/aspell
Expand Down Expand Up @@ -361,13 +415,16 @@ workflows:
version: 2
sanity_check:
jobs:
- build_jessie
- build_16_04
- build_18_04
- build_20_04
- build_22_04
- build_24_04
- build_snapshots
#- build_jessie
#- build_16_04
#- build_18_04
#- build_20_04
#- build_22_04
#- build_24_04
#- build_snapshots
- build_20_04_mingw64
- build_22_04_mingw64

tests:
jobs:
- tests_20_04
Expand Down
17 changes: 17 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: 0.60.8.{build}
image: Visual Studio 2017


environment:
matrix:
- MSYSTEM: MINGW64
BASH_PATH: C:\msys64\usr\bin\bash


build_script:
- cmd: '%BASH_PATH% -lc "cd $APPVEYOR_BUILD_FOLDER; ./autogen && ./configure && make && make install && make dist"'

after_build:
- cd "%APPVEYOR_BUILD_FOLDER%"
- ps: >-
Push-AppveyorArtifact "aspell-0.60.9-git.tar.gz" -FileName aspell-0.60.9-git.tar.gz
6 changes: 6 additions & 0 deletions common/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
#include "vararray.hpp"
#include "string_list.hpp"

#if ENABLE_NLS
#define printf printf
#include "libintl.h"
#undef printf
#endif

#include "gettext.h"

#include "iostream.hpp"
Expand Down
6 changes: 6 additions & 0 deletions common/convert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@

#include "iostream.hpp"

#if ENABLE_NLS
#define printf printf
#include "libintl.h"
#undef printf
#endif

#include "gettext.h"

namespace acommon {
Expand Down
1 change: 1 addition & 0 deletions common/file_util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "fstream.hpp"
#include "errors.hpp"
#include "string_list.hpp"
#include "asc_ctype.hpp"

#ifdef USE_FILE_LOCKS
# include <fcntl.h>
Expand Down
6 changes: 6 additions & 0 deletions modules/speller/default/language.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
# include <langinfo.h>
#endif

#if ENABLE_NLS
#define printf printf
#include "libintl.h"
#undef printf
#endif

#include "gettext.h"

namespace aspeller {
Expand Down
6 changes: 6 additions & 0 deletions prog/aspell.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@
#include "hash-t.hpp"
#include "hash_fun.hpp"

#if ENABLE_NLS
#define printf printf
#include "libintl.h"
#undef printf
#endif

#include "gettext.h"

using namespace acommon;
Expand Down