forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
- Loading branch information
Showing
507 changed files
with
159,966 additions
and
3,473,565 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,11 +9,9 @@ jobs: | |
| if: github.repository == 'CleverRaven/Cataclysm-DDA' | ||
| runs-on: ubuntu-20.04 | ||
| steps: | ||
| - name: "Install dependencies" | ||
| - name: "Install Transifex CLI" | ||
| run: | | ||
| sudo apt-get update | ||
| sudo apt-get install gettext python3-pip | ||
| sudo pip3 install transifex-client | ||
| curl -s https://github.com/transifex/cli/releases/download/v1.0.0/tx-linux-amd64.tar.gz | sudo tar zxvf - -C /usr/bin tx | ||
| - name: "Checkout" | ||
| uses: actions/checkout@v2 | ||
| - name: "Get current date" | ||
|
|
@@ -23,15 +21,8 @@ jobs: | |
| format: 'DD MMMM YYYY' | ||
| - name: "Pull translations" | ||
| env: | ||
| TOKEN: ${{ secrets.TX_TOKEN }} | ||
| run: | | ||
| export TX_TOKEN=$TOKEN | ||
| rm lang/po/*.po | ||
| until tx pull -a | ||
| do | ||
| echo "Retry in 10 seconds..." | ||
| sleep 10 | ||
| done | ||
| TX_TOKEN: ${{ secrets.TX_TOKEN }} | ||
| run: tx pull | ||
| - name: Create Pull Request | ||
| uses: peter-evans/[email protected] | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,10 @@ | ||
| [main] | ||
| host = https://www.transifex.com | ||
|
|
||
| [cataclysm-dda.master-cataclysm-dda] | ||
| file_filter = lang/po/<lang>.po | ||
| [o:cataclysm-dda-translators:p:cataclysm-dda:r:master-cataclysm-dda] | ||
| file_filter = lang/po/<lang>.po | ||
| source_file = lang/po/cataclysm-dda.pot | ||
| source_lang = en | ||
| type = PO | ||
| minimum_perc = 0 | ||
| source_file = lang/po/cataclysm-dda.pot | ||
| source_lang = en | ||
| type = PO | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| #============================================================================= | ||
| # Copyright 2000-2022 Kitware, Inc. and Contributors | ||
| # All rights reserved. | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without | ||
| # modification, are permitted provided that the following conditions | ||
| # are met: | ||
| # | ||
| # * Redistributions of source code must retain the above copyright | ||
| # notice, this list of conditions and the following disclaimer. | ||
| # | ||
| # * Redistributions in binary form must reproduce the above copyright | ||
| # notice, this list of conditions and the following disclaimer in the | ||
| # documentation and/or other materials provided with the distribution. | ||
| # | ||
| # * Neither the name of Kitware, Inc. nor the names of Contributors | ||
| # may be used to endorse or promote products derived from this | ||
| # software without specific prior written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| # HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| #============================================================================= | ||
|
|
||
| #[=======================================================================[.rst: | ||
| CMakePushCheckState | ||
| ------------------- | ||
| This module defines three macros: ``CMAKE_PUSH_CHECK_STATE()`` | ||
| ``CMAKE_POP_CHECK_STATE()`` and ``CMAKE_RESET_CHECK_STATE()`` These macros can | ||
| be used to save, restore and reset (i.e., clear contents) the state of | ||
| the variables ``CMAKE_REQUIRED_FLAGS``, ``CMAKE_REQUIRED_DEFINITIONS``, | ||
| ``CMAKE_REQUIRED_LINK_OPTIONS``, ``CMAKE_REQUIRED_LIBRARIES``, | ||
| ``CMAKE_REQUIRED_INCLUDES`` and ``CMAKE_EXTRA_INCLUDE_FILES`` used by the | ||
| various Check-files coming with CMake, like e.g. ``check_function_exists()`` | ||
| etc. | ||
| The variable contents are pushed on a stack, pushing multiple times is | ||
| supported. This is useful e.g. when executing such tests in a Find-module, | ||
| where they have to be set, but after the Find-module has been executed they | ||
| should have the same value as they had before. | ||
| ``CMAKE_PUSH_CHECK_STATE()`` macro receives optional argument ``RESET``. | ||
| Whether it's specified, ``CMAKE_PUSH_CHECK_STATE()`` will set all | ||
| ``CMAKE_REQUIRED_*`` variables to empty values, same as | ||
| ``CMAKE_RESET_CHECK_STATE()`` call will do. | ||
| Usage: | ||
| .. code-block:: cmake | ||
| cmake_push_check_state(RESET) | ||
| set(CMAKE_REQUIRED_DEFINITIONS -DSOME_MORE_DEF) | ||
| check_function_exists(...) | ||
| cmake_reset_check_state() | ||
| set(CMAKE_REQUIRED_DEFINITIONS -DANOTHER_DEF) | ||
| check_function_exists(...) | ||
| cmake_pop_check_state() | ||
| #]=======================================================================] | ||
|
|
||
| macro(CMAKE_RESET_CHECK_STATE) | ||
|
|
||
| set(CMAKE_EXTRA_INCLUDE_FILES) | ||
| set(CMAKE_REQUIRED_INCLUDES) | ||
| set(CMAKE_REQUIRED_DEFINITIONS) | ||
| set(CMAKE_REQUIRED_LINK_OPTIONS) | ||
| set(CMAKE_REQUIRED_LIBRARIES) | ||
| set(CMAKE_REQUIRED_FLAGS) | ||
| set(CMAKE_REQUIRED_QUIET) | ||
|
|
||
| endmacro() | ||
|
|
||
| macro(CMAKE_PUSH_CHECK_STATE) | ||
|
|
||
| if(NOT DEFINED _CMAKE_PUSH_CHECK_STATE_COUNTER) | ||
| set(_CMAKE_PUSH_CHECK_STATE_COUNTER 0) | ||
| endif() | ||
|
|
||
| math(EXPR _CMAKE_PUSH_CHECK_STATE_COUNTER "${_CMAKE_PUSH_CHECK_STATE_COUNTER}+1") | ||
|
|
||
| set(_CMAKE_EXTRA_INCLUDE_FILES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_EXTRA_INCLUDE_FILES}) | ||
| set(_CMAKE_REQUIRED_INCLUDES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_REQUIRED_INCLUDES}) | ||
| set(_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_REQUIRED_DEFINITIONS}) | ||
| set(_CMAKE_REQUIRED_LINK_OPTIONS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_REQUIRED_LINK_OPTIONS}) | ||
| set(_CMAKE_REQUIRED_LIBRARIES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_REQUIRED_LIBRARIES}) | ||
| set(_CMAKE_REQUIRED_FLAGS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_REQUIRED_FLAGS}) | ||
| set(_CMAKE_REQUIRED_QUIET_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER} ${CMAKE_REQUIRED_QUIET}) | ||
|
|
||
| if (${ARGC} GREATER 0 AND "${ARGV0}" STREQUAL "RESET") | ||
| cmake_reset_check_state() | ||
| endif() | ||
|
|
||
| endmacro() | ||
|
|
||
| macro(CMAKE_POP_CHECK_STATE) | ||
|
|
||
| # don't pop more than we pushed | ||
| if("${_CMAKE_PUSH_CHECK_STATE_COUNTER}" GREATER "0") | ||
|
|
||
| set(CMAKE_EXTRA_INCLUDE_FILES ${_CMAKE_EXTRA_INCLUDE_FILES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}}) | ||
| set(CMAKE_REQUIRED_INCLUDES ${_CMAKE_REQUIRED_INCLUDES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}}) | ||
| set(CMAKE_REQUIRED_DEFINITIONS ${_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}}) | ||
| set(CMAKE_REQUIRED_LINK_OPTIONS ${_CMAKE_REQUIRED_LINK_OPTIONS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}}) | ||
| set(CMAKE_REQUIRED_LIBRARIES ${_CMAKE_REQUIRED_LIBRARIES_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}}) | ||
| set(CMAKE_REQUIRED_FLAGS ${_CMAKE_REQUIRED_FLAGS_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}}) | ||
| set(CMAKE_REQUIRED_QUIET ${_CMAKE_REQUIRED_QUIET_SAVE_${_CMAKE_PUSH_CHECK_STATE_COUNTER}}) | ||
|
|
||
| math(EXPR _CMAKE_PUSH_CHECK_STATE_COUNTER "${_CMAKE_PUSH_CHECK_STATE_COUNTER}-1") | ||
| endif() | ||
|
|
||
| endmacro() |
Oops, something went wrong.