Skip to content

Commit

Permalink
CI fix
Browse files Browse the repository at this point in the history
  • Loading branch information
henrykorir committed Jun 15, 2024
1 parent 610b9c0 commit b777537
Show file tree
Hide file tree
Showing 8,438 changed files with 4,392,453 additions and 46 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
33 changes: 3 additions & 30 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,34 +1,7 @@
cmake_minimum_required(VERSION 3.5)

project(wxMinesweeper LANGUAGES CXX)
find_package(wxWidgets)
if(NOT wxWidgets_FOUND)
if (UNIX)
#file(CHMOD /usr/ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ)
execute_process(COMMAND sudo su)
execute_process(COMMAND sudo apt-get install -y build-essential libgtk2.0-dev libgtk-3-dev)
execute_process(COMMAND ls -al)
endif()
include(ExternalProject)
ExternalProject_Add(
wxWidgets
GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets
GIT_TAG v3.2.4
STEP_TARGETS build
)
if (UNIX)
execute_process(COMMAND sudo ln -sv wx-3.2/wx wx)
endif (UNIX)

if (WIN32)
#execute_process(COMMAND sudo ln -sv wx-2.8/wx wx)
endif (WIN32)

if (MSVC)
# do something
endif (MSVC)

endif()
execute_process(COMMAND wx-config --version)
include(${wxWidgets_USE_FILE})
add_subdirectory(libs/wxWidgets-3.2.4)
add_executable(wxMinesweeper field.cpp field.h minesweeper.cpp minesweeper.h)
target_link_libraries(${PROJECT_NAME} ${wxWidgets_LIBRARIES})
target_link_libraries(wxMinesweeper wx::net wx::core wx::base)
13 changes: 13 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM ubuntu:latest

RUN apt-get update \
&& apt-get install -y cmake apt-utils git wget build-essential libgtk2.0-dev libgtk-3-dev

WORKDIR /wxminesweeper

COPY . .

RUN cmake -DCMAKE_BUILD_TYPE=Release . && \
cmake --build . --parallel 8

CMD ["./wxminesweeper"]
Binary file modified bin/Debug/minesweeper
Binary file not shown.
81 changes: 81 additions & 0 deletions libs/wxWidgets-3.2.4/.circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
# Config file for CI jobs on CircleCI (circleci.com).
version: 2.1

jobs:
build-fedora:
docker:
- image: fedora
steps:
- run:
name: Install Git
command: dnf install -y git

- checkout

- run:
name: Install dependencies
command: |
echo LD_LIBRARY_PATH=`pwd`/lib >> $BASH_ENV
# Do _not_ use the CPU count returned by build/tools/proc_count.sh
# for building, it is too high (36 logical CPUs) and results in
# running out of memory, so limit ourselves to just 2 CPUs we're
# supposed to be using in Docker Medium resource class.
wxPROC_COUNT=2
echo wxBUILD_ARGS=-j$wxPROC_COUNT >> $BASH_ENV
# Get extra conversions for iconv used by the tests and langpacks
# to run the tests using the corresponding locales that would be
# skipped otherwise.
export WX_EXTRA_PACKAGES='ccache glibc-gconv-extra langpacks-core-de langpacks-core-en langpacks-core-fr langpacks-core-sv'
./build/tools/before_install.sh
echo "PATH=/usr/lib64/ccache:$PATH" >> $BASH_ENV
- run:
name: Checkout required submodules
command: |
git submodule update --init 3rdparty/catch 3rdparty/nanosvg
- restore_cache:
name: Restore ccache
keys:
- ccache-v1-{{ arch }}-{{ .Branch }}
- ccache-v1-{{ arch }}

- run:
name: Configure
command: ./configure --disable-debug-info

- run:
name: Build libraries
command: |
make -k $wxBUILD_ARGS CXXFLAGS='-Werror -Wno-error=cpp'
- run:
name: Build tests
command: |
make -k $wxBUILD_ARGS CXXFLAGS='-Werror -Wno-error=cpp' -C tests
- run:
name: Run tests
command: |
cd tests
WX_TEST_WEBREQUEST_URL="0" ./test
- run:
name: Show ccache statistics
when: always
command: ccache -vv -s

- save_cache:
name: Save ccache
when: always
key: ccache-v1-{{ arch }}-{{ .Branch }}-{{ .BuildNum }}
paths:
- ~/.cache/ccache

workflows:
build:
jobs:
- build-fedora
62 changes: 62 additions & 0 deletions libs/wxWidgets-3.2.4/.cirrus.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Continuous integration tasks running on Cirrus CI.
#
# This is currently used for testing under FreeBSD, which is not available at
# the other CI providers used by wx.

env:
CCACHE_SIZE: 1G
CCACHE_DIR: /tmp/ccache

task:
skip: "changesIncludeOnly('appveyor.yml','CMakeLists.txt','.circleci/**','.github/**','docs/**','interface/**','include/wx/{msw,osx,qt}/**','src/{msw,osx,qt}/**','build/{cmake,msw,osx}/**')"
name: Cirrus CI / FreeBSD 13 wxGTK 3
freebsd_instance:
image_family: freebsd-13-0

before_script: |
echo LD_LIBRARY_PATH=`pwd`/lib >> $CIRRUS_ENV
wxPROC_COUNT=`./build/tools/proc_count.sh`
echo wxBUILD_ARGS=-j$wxPROC_COUNT >> $CIRRUS_ENV
WX_EXTRA_PACKAGES='ccache git' ./build/tools/before_install.sh
echo "PATH=/usr/local/libexec/ccache:$PATH" >> $CIRRUS_ENV
# Rather than getting all submodules, get just the ones we need, as we can
# use system libraries instead of the other ones.
update_submodues_script: |
git submodule update --init 3rdparty/catch 3rdparty/nanosvg
ccache_cache:
folder: /tmp/ccache

# We need to pass flags so that libraries under /usr/local are found, because
# configure doesn't look for them there by default (it ought to always use
# pkg-config instead, but it currently doesn't do this either).
configure_script: |
./configure --disable-optimise --disable-debug_info CXXFLAGS=-Werror CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib
build_library_script: |
make -k $wxBUILD_ARGS
build_tests_script: |
make -k -C tests $wxBUILD_ARGS
test_script: |
cd tests
WX_TEST_WEBREQUEST_URL="0" ./test
build_samples_script: |
make -k -C samples $wxBUILD_ARGS
# Building sample requires GNU make, so install it just for this.
install_script: |
make install
pkg install -q -y gmake
gmake -C samples/minimal -f makefile.unx clean
gmake -C samples/minimal -f makefile.unx $wxBUILD_ARGS
# Show cache statistics for information.
end_script: |
ccache -s
16 changes: 16 additions & 0 deletions libs/wxWidgets-3.2.4/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# This is the EditorConfig (http://editorconfig.org/) coding style file for
# wxWidgets.

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[makefile.*]
indent_style = tab
indent_size = 8
49 changes: 49 additions & 0 deletions libs/wxWidgets-3.2.4/.git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# This file can be used with git blame --ignore-revs-file option or used as
# the value of blame.ignoreRevsFile in git config to ignore the changes done by
# the following "not interesting" commits.
#
# It's supported by Git 2.23 or later and to use it by default for all the
# future git-blame invocations, run the following command:
#
# git config blame.ignoreRevsFile misc/git/ignore_revs

# Fix comment typos in sources, 2021-10-02
668a2186cd89fd4576bed224df3624811eebeca1

# Remove all trailing spaces, 2019-01-30
8fbca5cb70c8b647d5bd2cacb1e0a2a00358f351

# Remove (most) occurrences of wxT() macro from the samples, 2018-09-23
f58ea625968953ca93585ea7f93dcc07ad032d8f

# Remove trailing whitespace from several files, 2018-04-11
496da2e550ce1f562f727230babc363da190530e

# Remove all lines containing cvs/svn "$Id$" keyword.
3f66f6a5b3583b02c34854556eb83e3a808524ce

# No changes, just removed hard tabs and trailing white space., 2009-08-21)
03647350fc7cd141953c72e0284e928847d30f44

# Globally replace _T() with wxT()., 2009-07-23
9a83f860948059b0273b5cc6d9e43fadad3ebfca

# set correct EOL style for files added in r58024, 2009-04-26
a3ef8eb50346e04c080ed1711578390080baff8b

# This commit contained some non-trivial changes, but also changed EOLs of the
# files it touchedm so ignore it too even if it's not completely trivial.
#
# pass ApplyEdit() arguments to EndEdit() too for better backwards compatibility (closes #10544), 2009-03-06
78e788120814699ab0a0d2fab1131285f5e0fd7a

# split wxGrid implementation in grideditors.cpp (for wxGridCellEditor-derived
# classes), gridctrl.cpp (for wxGridCellRenderer-derived classes), 2009-01-11
29efc6e4a478652d6f59fb3f5ca7990d78a8ead4

# cleanup - reformatting, 2006-04-20
a9339fe22c1815cfbbf2ed9c300c897256644d18

# Code cleaning: wxID_ANY, wxDefaultSize, wxDefaultPosition, true, false,
# wxEmptyString, tabs and white spaces, 2004-06-17
ca65c0440a7163e4e37e48b1c4329709d722db47
73 changes: 73 additions & 0 deletions libs/wxWidgets-3.2.4/.mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
AliKet <[email protected]>
Anil Kumar <[email protected]> <[email protected]>
ARATA Mizuki <[email protected]>
Artur Sochirca <[email protected]> <[email protected]>
Artur Wieczorek <[email protected]> <[email protected]>
Daniel Kulp <[email protected]> <[email protected]>
Blake Eryx <[email protected]> <[email protected]>
Bogdan Iordanescu <[email protected]>
Cătălin Răceanu <[email protected]>
<[email protected]> <[email protected]>
<[email protected]> <[email protected]>
Danny Scott <[email protected]>
<[email protected]> <[email protected]>
<[email protected]> <[email protected]>
Dimitri Schoolwerth <[email protected]> <[email protected]>
Hashir Ahmad <[email protected]>
Frédéric Bron <[email protected]> <[email protected]>
Hubert Talbot <[email protected]>
Igor Korot <[email protected]>
Ilya Bizyaev <[email protected]>
Jens Göpfert <[email protected]> <[email protected]>
John Roberts <[email protected]> <[email protected]>
Jouk Jansen <[email protected]>
Jose Lorenzo <[email protected]> <[email protected]>
Julian Smart <[email protected]>
Jevgenijs Protopopovs <[email protected]>
Gérard Durand <[email protected]>
Gérard Durand <[email protected]> <[email protected]>
Hartwig Wiesmann <[email protected]>
<[email protected]> <[email protected]>
Kinaou Hervé <[email protected]>
Kolya Kosenko <[email protected]> <[email protected]>
Konstantin S. Matveyev <[email protected]> <[email protected]>
Konstantin S. Matveyev <[email protected]> valid-ptr <[email protected]>
Lauri Nurmi <[email protected]> <[email protected]>
Lynn C. Rees <[email protected]>
Maarten Bent <[email protected]>
Manuel Martin <[email protected]>
Markus Juergens <[email protected]> <[email protected]>
Martin Ettl <[email protected]>
Martin Ettl <[email protected]> <[email protected]>
Martin Ettl <[email protected]> <[email protected]>
Mathew Maidment <[email protected]>
Micha Ahrweiler <[email protected]>
ousnius <[email protected]> <[email protected]>
Paul Kulchenko <[email protected]> <[email protected]>
Pavel O. <[email protected]>
Pavel O. <[email protected]> <[email protected]>
Pavel Tyunin <[email protected]>
PB <[email protected]> <[email protected]>
<[email protected]> <[email protected]>
Prashant Kumar Nirmal <[email protected]> <[email protected]>
René Kijewski <[email protected]> <[email protected]>
Richard Fath <[email protected]>
Richard Powell <[email protected]>
Rick S <[email protected]> <[email protected]>
Roberto Boriotti <[email protected]>
Steffen Olszewski <[email protected]> <[email protected]>
Steve Browne <[email protected]> <sbrowne@unknown>
<[email protected]> <[email protected]>
Tim Kosse <[email protected]> <[email protected]>
Tim Stahlhut <[email protected]>
Tim Stahlhut <[email protected]> <[email protected]>
Tim Stahlhut <[email protected]> <[email protected]>
Tobias Taschner <[email protected]> <[email protected]>
<[email protected]> <[email protected]>
Václav Slavík <[email protected]> <[email protected]>
Václav Slavík <[email protected]>
Vadim Zeitlin <[email protected]> <[email protected]>
<[email protected]> <[email protected]>
Wolfgang Stöggl <[email protected]>
Xlord2 <[email protected]> <[email protected]>
Iwbnwif Yiw <[email protected]>
11 changes: 11 additions & 0 deletions libs/wxWidgets-3.2.4/3rdparty/catch/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This sets the default behaviour, overriding core.autocrlf
* text=auto

# All source files should have unix line-endings in the repository,
# but convert to native line-endings on checkout
*.cpp text
*.h text
*.hpp text

# Windows specific files should retain windows line-endings
*.sln text eol=crlf
29 changes: 29 additions & 0 deletions libs/wxWidgets-3.2.4/3rdparty/catch/.github/issue_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
## Description
<!--
If your issue is a bugreport, this means describing what you did,
what did you want to happen and what actually did happen.
If your issue is a feature request, describe the feature and why do you
want it.
-->


### Steps to reproduce
<!--
This is only relevant for bug reports, but if you do have one,
please provide a minimal set of steps to reproduce the problem.
Usually this means providing a small and self-contained code using Catch
and specifying compiler flags/tools used if relevant.
-->


### Extra information
<!--
Fill in any extra information that might be important for your issue.
If your issue is a bugreport, definitely fill out at least the following.
-->
* Catch version: **v42.42.42**
* Operating System: **Joe's discount operating system**
* Compiler+version: **Hidden Dragon v1.2.3**
Loading

0 comments on commit b777537

Please sign in to comment.