[Widelands-dev] [Merge] lp:~widelands-dev/widelands/per-level-soldier-anims into lp:widelands
Continuous integration builds have changed state: Travis build 4040. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/432869398. Appveyor build 3836. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_per_level_soldier_anims-3836. -- https://code.launchpad.net/~widelands-dev/widelands/per-level-soldier-anims/+merge/354929 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/per-level-soldier-anims into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove_duplicate_code into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/remove_duplicate_code into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/remove_duplicate_code/+merge/355586 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_duplicate_code. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove_duplicate_code into lp:widelands
Continuous integration builds have changed state: Travis build 4039. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/432862269. Appveyor build 3835. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_remove_duplicate_code-3835. -- https://code.launchpad.net/~widelands-dev/widelands/remove_duplicate_code/+merge/355586 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_duplicate_code. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/detect_revision_update into lp:widelands
Continuous integration builds have changed state: Travis build 4038. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/432860634. Appveyor build 3834. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_detect_revision_update-3834. -- https://code.launchpad.net/~widelands-dev/widelands/detect_revision_update/+merge/355590 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/detect_revision_update. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Continuous integration builds have changed state: Travis build 4036. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/432827924. Appveyor build 3832. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug1792297_worker_encyclopedia-3832. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions into lp:widelands
Review: Approve review, compile, debug Tested this on OSX, but found the original Problem was on Windows. The code works as expected but I did not trigger the original Problem. e.g. when I make the complete save dir unreadable the save completly fails, well. OSX and *nixes behave differnt compared Windows when it comes to open files. Alas I approve this I will do another round of testing on Windows, tomorrow. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions/+merge/353758 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/remove-broken-splashscreen-skip/+merge/355529 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~gunchleoc/widelands/translation_validation_folder_structure into lp:widelands
The proposal to merge lp:~gunchleoc/widelands/translation_validation_folder_structure into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~gunchleoc/widelands/translation_validation_folder_structure/+merge/355599 -- Your team Widelands Developers is requested to review the proposed merge of lp:~gunchleoc/widelands/translation_validation_folder_structure into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove_duplicate_code into lp:widelands
Review: Approve LGTM :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/remove_duplicate_code/+merge/355586 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/remove_duplicate_code. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~gunchleoc/widelands/translation_validation_folder_structure into lp:widelands
This doesn't affect Widelands itself, so it can go straight in @bunnybot merge -- https://code.launchpad.net/~gunchleoc/widelands/translation_validation_folder_structure/+merge/355599 Your team Widelands Developers is requested to review the proposed merge of lp:~gunchleoc/widelands/translation_validation_folder_structure into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~gunchleoc/widelands/translation_validation_folder_structure into lp:widelands
GunChleoc has proposed merging
lp:~gunchleoc/widelands/translation_validation_folder_structure into
lp:widelands.
Commit message:
Copy translation validation results into maintainers' and translators' views to
make them easier for translators to navigate.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~gunchleoc/widelands/translation_validation_folder_structure/+merge/355599
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~gunchleoc/widelands/translation_validation_folder_structure into
lp:widelands.
=== modified file 'utils/glossary_checks.py'
--- utils/glossary_checks.py 2017-08-17 14:06:54 +
+++ utils/glossary_checks.py 2018-09-25 13:26:19 +
@@ -512,8 +512,8 @@
hit.term, hit.translation, hit.source, hit.target, hit.po_file, hit.location)
locale_result = locale_result + row
counter = counter + 1
-dest_filepath = output_path + '/glossary_check_' + locale + '.csv'
-with open(dest_filepath, 'wt') as dest_file:
+dest_filepath = make_path(output_path + '/' + locale)
+with open(dest_filepath + '/glossary_check.csv', 'wt') as dest_file:
dest_file.write(locale_result)
# Uncomment this line to print a statistic of the number of hits for each locale
# print("%s\t%d"%(locale, counter))
@@ -547,7 +547,7 @@
input_path = os.path.abspath(os.path.join(
os.path.dirname(__file__), '../po'))
-output_path = make_path(os.path.dirname(__file__), '../po_validation')
+output_path = make_path(os.path.dirname(__file__), '../po_validation/translators')
result = check_translations_with_glossary(
input_path, output_path, glossary_file, locale)
print('Current time: %s' % time.ctime())
=== modified file 'utils/validate_translations.sh'
--- utils/validate_translations.sh 2018-09-10 07:00:08 +
+++ utils/validate_translations.sh 2018-09-25 13:26:19 +
@@ -18,36 +18,46 @@
exit 1;
fi
-# Make sure that the output directory is there
+# Make sure that the output directories are there and empty
+echo "Creating directories in 'po_validation'"
if [ ! -d "po_validation" ]; then
- echo "Creating directory 'po_validation'"
mkdir po_validation
fi
+if [ ! -d "po_validation/maintainers" ]; then
+ mkdir po_validation/maintainers
+else
+ rm -rf po_validation/maintainers/*
+fi
+if [ ! -d "po_validation/translators" ]; then
+ mkdir po_validation/translators
+else
+ rm -rf po_validation/translators/*
+fi
echo "Running i18nspector. This can take a while."
# We want a log of all errors.
i18nspector po/*/*.po \
| grep "E:" \
- > po_validation/i18nspector-errors.log
+ > po_validation/maintainers/i18nspector-errors.log
# We don't care about all warnings, so we filter some out.
i18nspector po/*/*.po \
| grep "W:" \
| grep -v "invalid-last-translator" \
| grep -v boilerplate \
- > po_validation/i18nspector-warnings.log
+ > po_validation/maintainers/i18nspector-warnings.log
# Takes type of check as an argument.
# Makes a subdirectory for the argument if necessary,
# then runs pofilter with the check.
function run_pofilter() {
- if [ ! -d "po_validation/$1/" ]; then
-mkdir po_validation/$1/
+ if [ ! -d "po_validation/maintainers/$1/" ]; then
+mkdir po_validation/maintainers/$1/
fi
echo "Running pofilter for '$1'"
- pofilter -t $1 -i po/ -o po_validation/$1/
+ pofilter -t $1 -i po/ -o po_validation/maintainers/$1/
}
# These checks are critical
@@ -72,30 +82,44 @@
run_pofilter "numbers"
# We only run the options check on the command line help
-if [ ! -d "po_validation/options/" ]; then
+if [ ! -d "po_validation/maintainers/options/" ]; then
echo "Creating directory 'options'"
- mkdir po_validation/options/
+ mkdir po_validation/maintainers/options/
fi
echo "Running pofilter for 'options'"
-pofilter -t options -i po/widelands_console/ -o po_validation/options/
+pofilter -t options -i po/widelands_console/ -o po_validation/maintainers/options/
-echo "Cleaning up empty directories"
-for dir in po_validation/*/
+echo "Processing directories"
+for dir in po_validation/maintainers/*/
do
dir=${dir%*/}
- echo "- Cleaning up ${dir##*/}"
-if [ ! "$(find po_validation/${dir##*/}/ -mindepth 1 -maxdepth 1 -type d -printf . | wc -c)" -eq 0 ]; then
-for subdir in po_validation/${dir##*/}/*/
+ echo "- ${dir##*/}"
+if [ ! "$(find po_validation/maintainers/${dir##*/}/ -mindepth 1 -maxdepth 1 -type d -printf . | wc -c)" -eq 0 ]; then
+for subdir in po_validation/maintainers/${dir##*/}/*/
do
subdir=${subdir%*/}
- if [ ! "$(ls -A po_validation/${dir##*/}/${subdir##*/})" ]; then
-rmdir po_validation/${dir##*/}/${subdir##*/}
+ if [ ! "$(ls -A po_validation/maintainers/${dir##*/}/${subdir##*/})" ]; then
+# Delete empty directories
+
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/detect_revision_update into lp:widelands
Review: Approve Code LGTM. Not tested. -- https://code.launchpad.net/~widelands-dev/widelands/detect_revision_update/+merge/355590 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/detect_revision_update. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands
Transient failure on Travis @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/remove-broken-splashscreen-skip/+merge/355529 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/sphinx_1_8_1 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/sphinx_1_8_1 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/sphinx_1_8_1/+merge/355531 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/sphinx_1_8_1. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/empire-string-fix into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/empire-string-fix into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/empire-string-fix/+merge/355562 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/empire-string-fix. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/empire-string-fix into lp:widelands
Continuous integration builds have changed state: Travis build 4034. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/432687258. Appveyor build 3830. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_empire_string_fix-3830. -- https://code.launchpad.net/~widelands-dev/widelands/empire-string-fix/+merge/355562 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/empire-string-fix. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/resis-have-no-owner into lp:widelands
Yes, I accidentally tested with a slightly older version of trunk. -- https://code.launchpad.net/~widelands-dev/widelands/resis-have-no-owner/+merge/355591 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/resis-have-no-owner into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/resis-have-no-owner into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/resis-have-no-owner into lp:widelands has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~widelands-dev/widelands/resis-have-no-owner/+merge/355591 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/resis-have-no-owner into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/sphinx_1_8_1 into lp:widelands
Review: Approve CI builds look good. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/sphinx_1_8_1/+merge/355531 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/sphinx_1_8_1. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/sphinx_1_8_1 into lp:widelands
Continuous integration builds have changed state: Travis build 4030. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/432427285. Appveyor build 3826. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_sphinx_1_8_1-3826. -- https://code.launchpad.net/~widelands-dev/widelands/sphinx_1_8_1/+merge/355531 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/sphinx_1_8_1 into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/resis-have-no-owner into lp:widelands
But I already fixed this in one go with the geologist-message branch, so this isn´t needed? -- https://code.launchpad.net/~widelands-dev/widelands/resis-have-no-owner/+merge/355591 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/resis-have-no-owner into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/resis-have-no-owner into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/resis-have-no-owner into lp:widelands. Commit message: Resource indicators now have an owner Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1790804 in widelands: "Some Tribe immovables have no owner" https://bugs.launchpad.net/widelands/+bug/1790804 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/resis-have-no-owner/+merge/355591 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/resis-have-no-owner into lp:widelands. === modified file 'src/logic/map_objects/tribes/worker.cc' ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/detect_revision_update into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/detect_revision_update
into lp:widelands.
Commit message:
use git rev-parse instead of show with head
remove use of deprecated os.open
avoid leaking of stderr into cmake output on windows
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/detect_revision_update/+merge/355590
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/detect_revision_update into lp:widelands.
=== modified file 'utils/detect_revision.py'
--- utils/detect_revision.py 2016-12-04 07:02:25 +
+++ utils/detect_revision.py 2018-09-25 08:31:49 +
@@ -44,17 +44,19 @@
def detect_git_revision():
if not sys.platform.startswith('linux') and \
not sys.platform.startswith('darwin'):
-git_revnum = os.popen(
-'git show --pretty=format:%h | head -n 1').read().rstrip()
-if git_revnum:
-return 'unofficial-git-%s' % (git_revnum,)
-else:
-return None
+try:
+git_revnum = subprocess.Popen(
+'git rev-parse --short HEAD',stdout=subprocess.PIPE).stdout.read().rstrip()
+if git_revnum:
+return 'unofficial-git-%s' % (git_revnum,)
+except:
+pass
+return None
-is_git_workdir = os.system('git show >/dev/null 2>&1') == 0
+is_git_workdir = subprocess.Popen('git show >/dev/null 2>&1',stdout=subprocess.PIPE).returncode == 0
if is_git_workdir:
-git_revnum = os.popen(
-'git show --pretty=format:%h | head -n 1').read().rstrip()
+git_revnum = subprocess.Popen(
+'git rev-parse --short HEAD',stdout=subprocess.PIPE).stdout.read().rstrip()
return 'unofficial-git-%s' % (git_revnum,)
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
2 bug s filed for that -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands
Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways. Travis build 4029. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/432395438. -- https://code.launchpad.net/~widelands-dev/widelands/remove-broken-splashscreen-skip/+merge/355529 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove_duplicate_code into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/remove_duplicate_code
into lp:widelands.
Commit message:
Remove duplicate code for revision detection task (code already in
BzrRevision.cmake)
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/remove_duplicate_code/+merge/355586
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/remove_duplicate_code into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2018-08-21 08:14:38 +
+++ CMakeLists.txt 2018-09-25 07:48:30 +
@@ -246,17 +246,6 @@
BzrRevision ALL
COMMAND ${CMAKE_COMMAND} -DWL_INSTALL_BASEDIR=${WL_INSTALL_BASEDIR} -DWL_INSTALL_DATADIR=${WL_INSTALL_DATADIR} -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/BzrRevision.cmake
)
-
- # Detect version now
- execute_process (
-COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/detect_revision.py
-OUTPUT_VARIABLE WL_VERSION
-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/VERSION "${WL_VERSION}")
- configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/build_info.cc.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/build_info.cc)
- message (STATUS "Version of Widelands Build is ${WL_VERSION}(${CMAKE_BUILD_TYPE})")
else (NOT DEFINED WL_VERSION)
add_custom_target (
InputRevision ALL
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands
Continuous integration builds have changed state: Travis build 4029. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/432395438. Appveyor build 3825. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_remove_broken_splashscreen_skip-3825. -- https://code.launchpad.net/~widelands-dev/widelands/remove-broken-splashscreen-skip/+merge/355529 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
although I don't understand the problem fully we should have a bug filed for b21 to fix the ngettext issue. In this special case I don't see this corner case arriving as currently there is no list that has more than 10 entries I think (this is for the barbarians miner). And another one to revert the commenting. I believe we have to rethink the code properly then. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands
Review: Approve I have added a special case for the number 1, since ngettext for 1 also matches 11 in my language, which is inappropriate for a heading. We should fix this in the future for all headings. I have commented out the strings to be activated after Build 20. -- https://code.launchpad.net/~widelands-dev/widelands/bug1792297_worker_encyclopedia/+merge/354986 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/empire-string-fix into lp:widelands
Review: Approve @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/empire-string-fix/+merge/355562 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/empire-string-fix. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ship_scheduling_2 into lp:widelands
There are still failures in the test suite. Instructions on how to run it manually: https://wl.widelands.org/wiki/RegressionTests/#test-scenarios -- https://code.launchpad.net/~widelands-dev/widelands/ship_scheduling_2/+merge/355510 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ship_scheduling_2. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands
Transient failure on Travis @bunnybot merge force -- https://code.launchpad.net/~widelands-dev/widelands/remove-broken-splashscreen-skip/+merge/355529 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1480927-building-texts into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1480927-building-texts into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1480927-building-texts/+merge/353728 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1480927-building-texts. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions into lp:widelands
Looks like Its time to switch on the debugger. Will compile this and think about all kind of nasty ways to break this :-) Could we inform the player if this finally failes? Code LGTM. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions/+merge/353758 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
