Skip to content

Commit

Permalink
Release 0.1.12-alpha: Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
MrSimbax committed Feb 23, 2019
2 parents 3cbab71 + dd12dbe commit c467bd9
Show file tree
Hide file tree
Showing 242 changed files with 62,024 additions and 41 deletions.
65 changes: 33 additions & 32 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,39 +1,40 @@
#!/usr/bin/env groovy
if (env.BRANCH_NAME.startsWith('PR-')) {
properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactNumToKeepStr: '1']]])
} else {
properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '30', artifactNumToKeepStr: '5']]])
}

if (env.CHANGE_TARGET == 'master') {
error("This pull request targets the wrong branch. Please reopen the pull request targetting the dev branch.")
}

node('master') {
stage('Pull changes') {
checkout scm
pipeline {
agent { label 'colobot-build' }
options {
buildDiscarder(logRotator(artifactDaysToKeepStr: '30', artifactNumToKeepStr: '5'))
}

stage('Build data') {
sh 'mkdir -p build'
dir('build') {
sh '''
cmake -DCMAKE_INSTALL_PREFIX=/install -DCOLOBOT_INSTALL_DATA_DIR=/install/data ..
make
rm -rf install
DESTDIR=. make install
'''
stages {
stage('Check pull request target') {
when { changeRequest() }
steps {
script {
if (env.CHANGE_TARGET == 'master') {
throw "This pull request targets the wrong branch. Please reopen the pull request targetting the dev branch."
}
}
}
}
stage('Build data') {
steps {
sh 'mkdir -p build'
dir('build') {
sh '''
cmake -DCMAKE_INSTALL_PREFIX=/install -DCOLOBOT_INSTALL_DATA_DIR=/install/data ..
make
rm -rf install
DESTDIR=. make install
'''
}
}
}
}

stage('Archive data') {
sh 'rm -f data.zip'
zip zipFile: 'data.zip', archive: true, dir: 'build/install'
}

// Clean workspace after building pull requests
// to save disk space on the Jenkins host
if (env.BRANCH_NAME.startsWith('PR-')) {
cleanWs()
stage('Archive data') {
steps {
sh 'rm -f data.zip'
zip zipFile: 'data.zip', archive: true, dir: 'build/install'
}
}
}
}
1,112 changes: 1,112 additions & 0 deletions help/bots/po/cs.po

Large diffs are not rendered by default.

1,096 changes: 1,096 additions & 0 deletions help/bots/po/pt.po

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion help/cbot/E/goto.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Flight altitude for \l;winged bots\u object\botgj;. The altitude is useful only
This parameter tells the bot how it must reach the goal:
\c;0\n; stops exactly at the goal position
\c;1\n; goes close to the goal position, without stopping.
If no value is given, \c;1\n; (precision) is the default value.
If no value is given, \c;0\n; (precision) is the default value.

\t;Return value: \c;\l;int\u cbot\int;\n;
Normally an error stops the program. You can prevent the program from stopping on errors by using the \c;\l;errmode\u cbot\errmode;(0)\n; instruction. A value different from zero if an error occurred is then returned by \c;goto()\n;.
Expand Down
2 changes: 1 addition & 1 deletion help/cbot/po/cbot.pot
Original file line number Diff line number Diff line change
Expand Up @@ -1547,7 +1547,7 @@ msgid ""
"This parameter tells the bot how it must reach the goal: \n"
"<code>0</code> stops exactly at the goal position\n"
"<code>1</code> goes close to the goal position, without stopping.\n"
"If no value is given, <code>1</code> (precision) is the default value. "
"If no value is given, <code>0</code> (precision) is the default value."
msgstr ""

#. type: Plain text
Expand Down
9,354 changes: 9,354 additions & 0 deletions help/cbot/po/cs.po

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion help/cbot/po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,7 @@ msgid ""
"This parameter tells the bot how it must reach the goal: \n"
"<code>0</code> stops exactly at the goal position\n"
"<code>1</code> goes close to the goal position, without stopping.\n"
"If no value is given, <code>1</code> (precision) is the default value. "
"If no value is given, <code>0</code> (precision) is the default value."
msgstr ""
"Dieser Parameter gibt an, wie der Roboter die angegebene Position erreichen muss: \n"
"<code>0</code> Hält genau an der angegebenen Position an.\n"
Expand Down
2 changes: 1 addition & 1 deletion help/cbot/po/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -1800,7 +1800,7 @@ msgid ""
"This parameter tells the bot how it must reach the goal: \n"
"<code>0</code> stops exactly at the goal position\n"
"<code>1</code> goes close to the goal position, without stopping.\n"
"If no value is given, <code>1</code> (precision) is the default value. "
"If no value is given, <code>0</code> (precision) is the default value."
msgstr ""
"Normalement, une erreur stoppe l'exécution du programme. Si l'instruction <code>goto</code> est précédée de <c/><a cbot|errmode>errmode</a>(0);<n/>, une valeur nulle est retournée si tout est ok, ou valeur non nulle si une erreur est intervenue.\n"
"<code>== 0 </code>position atteinte\n"
Expand Down
4 changes: 2 additions & 2 deletions help/cbot/po/pl.po
Original file line number Diff line number Diff line change
Expand Up @@ -1793,12 +1793,12 @@ msgid ""
"This parameter tells the bot how it must reach the goal: \n"
"<code>0</code> stops exactly at the goal position\n"
"<code>1</code> goes close to the goal position, without stopping.\n"
"If no value is given, <code>1</code> (precision) is the default value. "
"If no value is given, <code>0</code> (precision) is the default value."
msgstr ""
"Określa sposób w jaki robot powinien osiągnąć swoj cel: \n"
"<code>0</code> zatrzymuje się dokładnie w pozycji docelowej\n"
"<code>1</code> zbliża się do pozycji docelowej bez zatrzymywania się.\n"
"Jeśli nie określono wartości, domyślnie przyjmowane jest <code>1</code> (dokładnie). "
"Jeśli nie określono wartości, domyślnie przyjmowane jest <code>0</code> (dokładnie)."

#. type: Plain text
#: ../E/goto.txt:30
Expand Down

0 comments on commit c467bd9

Please sign in to comment.