Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…/master/appveyor.yml

- change circleci for mingw64
  • Loading branch information
chcg committed May 18, 2020
1 parent 8d964a0 commit 9c13b11
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 10 deletions.
48 changes: 39 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ jobs:
- run: CXX=clang++-5.0 CC=clang-5.0 ./sanity-check.sh
- run: CXX=clang++-6.0 CC=clang-6.0 ./sanity-check.sh

build_19_04:
build_20_04:
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: circleci/buildpack-deps:19.04
- image: circleci/buildpack-deps:20.04
steps:
# Machine Setup
# If you break your build into multiple jobs with workflows, you will probably want to do the parts
Expand All @@ -110,25 +110,53 @@ jobs:
# 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
g++-6 g++-7 g++-9 clang-6.0 clang-7 clang-8
g++-7 g++-9 g++-10 clang-6.0 clang-7 clang-8 clang-9
- run: sudo apt-get -y purge aspell
#
- run: ./autogen
- run: ./sanity-check.sh
- run: CXX="g++ -m32" CC="gcc -m32" ./sanity-check.sh
- run: CXX=g++-6 CC=gcc-6 ./sanity-check.sh
- run: CXX=g++-7 CC=gcc-7 ./sanity-check.sh
- run: CXX=g++-9 CC=gcc-9 ./sanity-check.sh
- run: CXX=g++-10 CC=gcc-10 ./sanity-check.sh
- run: CXX=clang++-6.0 CC=clang-6.0 ./sanity-check.sh
- run: CXX=clang++-7 CC=clang-7 ./sanity-check.sh
- run: CXX=clang++-8 CC=clang-8 ./sanity-check.sh
- run: CXX=clang++-9 CC=clang-9 ./sanity-check.sh
- run: ./config-opt && make -C build -j2

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: circleci/buildpack-deps: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

tests:
working_directory: ~/GNUAspell/aspell
parallelism: 1
docker:
- image: circleci/buildpack-deps:19.04
- image: circleci/buildpack-deps:20.04
steps:
# Machine Setup
- checkout
Expand All @@ -146,10 +174,12 @@ workflows:
version: 2
sanity_check:
jobs:
- build_jessie
- build_16_04
- build_18_04
- build_19_04
#- build_jessie
#- build_16_04
#- build_18_04
- build_20_04
- build_20_04_mingw64

tests:
jobs:
- tests
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
8 changes: 7 additions & 1 deletion modules/speller/default/language.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,16 @@
#include "getdata.hpp"
#include "file_util.hpp"

#ifdef ENABLE_NLS
#ifdef HAVE_LANGINFO_CODESET
# 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

0 comments on commit 9c13b11

Please sign in to comment.