[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-858292-military-influence into lp:widelands
Continuous integration builds have changed state: Travis build 4052. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/433622680. Appveyor build 3848. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_858292_military_influence-3848. -- https://code.launchpad.net/~widelands-dev/widelands/bug-858292-military-influence/+merge/353834 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-858292-military-influence 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/ship_scheduling_2 into lp:widelands
>From what I understand, the test suite forces the removal of ports and ships >without running clean-up code. That invalidates the state of transports and >breaks the advanced logic. I'm not sure if it is worthy to change the logic, >instead of changing the tests. -- 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/soldier-capacity-ctrl into lp:widelands
Review: Approve Tested it; and it works as advertised. -- https://code.launchpad.net/~widelands-dev/widelands/soldier-capacity-ctrl/+merge/355002 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/soldier-capacity-ctrl. ___ 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/cmake_errors_WL_VERSION into lp:widelands
Toni Förster has proposed merging
lp:~widelands-dev/widelands/cmake_errors_WL_VERSION into lp:widelands.
Commit message:
explicitly set CMP0054 to fix warning
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/cmake_errors_WL_VERSION/+merge/355728
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/cmake_errors_WL_VERSION into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2018-09-26 08:47:26 +
+++ CMakeLists.txt 2018-09-26 18:57:06 +
@@ -1,6 +1,7 @@
project (widelands)
cmake_minimum_required (VERSION 2.8.7)
+cmake_policy(SET CMP0054 NEW)
include("${CMAKE_SOURCE_DIR}/cmake/WlFunctions.cmake")
___
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/frisian_balancing_2 into lp:widelands
Just 1 nit. Diff comments: > > === modified file > 'data/tribes/scripting/starting_conditions/barbarians/village.lua' > --- data/tribes/scripting/starting_conditions/barbarians/village.lua > 2017-11-21 09:26:16 + > +++ data/tribes/scripting/starting_conditions/barbarians/village.lua > 2018-09-23 20:11:22 + > @@ -60,6 +60,7 @@ > barbarians_geologist = 4, > barbarians_lumberjack = 2, > barbarians_miner = 4, > +barbarians_miner_master = 4, This is a hard-core starting condition, so not having master miners here is better. > barbarians_ranger = 1, > barbarians_stonemason = 2, > barbarians_ox = 5, -- https://code.launchpad.net/~widelands-dev/widelands/frisian_balancing_2/+merge/355358 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian_balancing_2 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/bug-858292-military-influence into lp:widelands
Mhh, why can you remove that code and fix it via that other code?
I must take a complete look at this logic.
I will not try to use this replay, but try to reproduce it,
which will become quite tricky.
Any tips how I can provoke this fast and easy?
One nit inline.
Diff comments:
> === modified file 'src/logic/editor_game_base.cc'
> --- src/logic/editor_game_base.cc 2018-04-27 06:11:05 +
> +++ src/logic/editor_game_base.cc 2018-09-14 13:44:06 +
> @@ -623,8 +603,19 @@
>
> // This must reach one step beyond the conquered area to adjust the
> borders
Well actually two steps now :-)
> // of neighbour players.
> - ++player_area.radius;
> + player_area.radius += 2;
> map_.recalc_for_field_area(world(), player_area);
> +
> + // Deal with player immovables in the lost area
> + // Players are not allowed to have their immovables on their borders.
> + // Therefore the area must be enlarged before calling
> + // cleanup_playerimmovables_area, so that those new border locations
> are
> + // covered.
> + // TODO(SirVer): In the editor, no buildings should burn down when a
> military
> + // building is removed. Check this again though
> + if (is_a(Game, this)) {
> + cleanup_playerimmovables_area(player_area);
> + }
> }
>
> /// Makes sure that buildings cannot exist outside their owner's territory.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-858292-military-influence/+merge/353834
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-858292-military-influence 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 => Merged 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
[Widelands-dev] [Merge] lp:~gunchleoc/widelands/translation_validation_folder_structure into lp:widelands
Continuous integration builds have changed state: Travis build 4046. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/433324366. Appveyor build 3842. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_gunchleoc_widelands_translation_validation_folder_structure-3842. -- 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
The cmake warning is caused by Tino's "Quickfix" at revision 8853 in trunk.
These lines in BzrRevision.cmake trigger it the policy:
string(REGEX REPLACE "\n|\r$" "" WL_VERSION "${WL_VERSION}")
string(STRIP WL_VERSION "${WL_VERSION}")
file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/VERSION "${WL_VERSION}")
See here:
https://cmake.org/cmake/help/v3.10/policy/CMP0054.html
adding this line to CMakeLists.txt solved the error:
cmake_policy(SET CMP0054 NEW)
--
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:~widelands-dev/widelands/remove_duplicate_code into lp:widelands
Sorry for the spam. This line needs to be removed:
WORKING_DIRECTORY ${MAKE_CURRENT_SOURCE_DIR}
--
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:~widelands-dev/widelands/remove_duplicate_code into lp:widelands
The version isn't shown on macOS either: The "RESULT_VARIABLE" says: No such file or directory So the command does not seem to be executed and therefore WL_Version is empty. -- 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/bug-1791426-multiplayer-map-change into lp:widelands
Continuous integration builds have changed state: Travis build 4045. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/433322473. Appveyor build 3841. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1791426_multiplayer_map_change-3841. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1791426-multiplayer-map-change/+merge/355622 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1791426-multiplayer-map-change 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
Um, the compile script no longer works for me on linux in trunk-8854? […] -- Not using AddressSanitizer. -- Version of Widelands Build is (Release) CMake Warning (dev) at /usr/share/cmake-3.10/Modules/CTest.cmake:234 (if): Policy CMP0054 is not set: Only interpret if() arguments as variables or keywords when unquoted. Run "cmake --help-policy CMP0054" for policy details. Use the cmake_policy command to set the policy and suppress this warning. Quoted variables like "" will no longer be dereferenced when the policy is set to NEW. Since the policy is not set the OLD behavior will be used. Call Stack (most recent call first): CMakeLists.txt:254 (include) This warning is for project developers. Use -Wno-dev to suppress it. -- Configuring done -- Generating done -- Build files have been written to: /home/benedikt/widelands-debug/widelands/build [67/68] Linking CXX executable src/scripting/test/WL_VERSIONtest_scripting src/third_party/libthird_party_eris.a(loslib.c.o): In Funktion »os_tmpname«: loslib.c:(.text+0x467): Warnung: the use of `tmpnam' is dangerous, better use `mkstemp' [68/68] cd /home/benedikt/widelands-debug/widelands/build && /usr/bin/ctest --output-on-failure Test project /home/benedikt/widelands-debug/widelands/build Start 1: test_economy 1/4 Test #1: test_economy . Passed0.06 sec Start 2: test_io_filesystem 2/4 Test #2: test_io_filesystem ... Passed0.03 sec Start 3: notifications_test 3/4 Test #3: notifications_test ... Passed0.01 sec Start 4: test_scripting 4/4 Test #4: test_scripting ... Passed0.01 sec 100% tests passed, 0 tests failed out of 4 Total Test time (real) = 0.12 sec mv: Aufruf von stat für 'src/widelands' nicht möglich: Datei oder Verzeichnis nicht gefunden -- 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/bug-1746270-rolling-autosave-file-permissions into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions into lp:widelands has been updated. Status: Needs review => Merged For more details, see: 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove_duplicate_code into lp:widelands
I tested this on Linux and got a correct version detection - maybe it's a Windows issue? -- 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:~widelands-dev/widelands/bug-1746270-rolling-autosave-file-permissions into lp:widelands
Review: Approve testplay on windows OK, tested along the original Bug, works as desigend. @bunnybot merge -- 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/remove_duplicate_code into lp:widelands
OK, the merge was a bit premature: Revision detection is not broken, but does not happen any longer... -- 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/bug1792297_worker_encyclopedia into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug1792297_worker_encyclopedia into lp:widelands has been updated. Status: Needs review => Merged For more details, see: 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/bug-1791426-multiplayer-map-change into lp:widelands
GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1791426-multiplayer-map-change into
lp:widelands.
Commit message:
Execute map changes in Multiplayer UI after the player slots have been set.
This fixes a bug with updating the client dropdowns.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1791426 in widelands: "Client can't select new positions when changing
to larger map"
https://bugs.launchpad.net/widelands/+bug/1791426
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1791426-multiplayer-map-change/+merge/355622
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1791426-multiplayer-map-change into
lp:widelands.
=== modified file 'src/network/gameclient.cc'
--- src/network/gameclient.cc 2018-04-21 10:57:12 +
+++ src/network/gameclient.cc 2018-09-26 06:07:24 +
@@ -584,7 +584,6 @@
// New map was set, so we clean up the buffer of a previously requested file
if (file_)
delete file_;
- Notifications::publish(NoteGameSettings(NoteGameSettings::Action::kMap));
break;
}
@@ -763,8 +762,11 @@
case NETCMD_SETTING_ALLPLAYERS: {
d->settings.players.resize(packet.unsigned_8());
- for (uint8_t i = 0; i < d->settings.players.size(); ++i)
+ for (uint8_t i = 0; i < d->settings.players.size(); ++i) {
receive_one_player(i, packet);
+ }
+ // Map changes are finished here
+ Notifications::publish(NoteGameSettings(NoteGameSettings::Action::kMap));
break;
}
case NETCMD_SETTING_PLAYER: {
=== modified file 'src/network/gamehost.cc'
--- src/network/gamehost.cc 2018-09-14 23:52:30 +
+++ src/network/gamehost.cc 2018-09-26 06:07:24 +
@@ -1472,7 +1472,6 @@
packet.string(d->settings.mapfilename);
packet.unsigned_8(d->settings.savegame ? 1 : 0);
packet.unsigned_8(d->settings.scenario ? 1 : 0);
- Notifications::publish(NoteGameSettings(NoteGameSettings::Action::kMap));
}
void GameHost::write_setting_player(SendPacket& packet, uint8_t const number) {
@@ -1491,8 +1490,11 @@
void GameHost::write_setting_all_players(SendPacket& packet) {
packet.unsigned_8(d->settings.players.size());
- for (uint8_t i = 0; i < d->settings.players.size(); ++i)
+ for (uint8_t i = 0; i < d->settings.players.size(); ++i) {
write_setting_player(packet, i);
+ }
+ // Map changes are finished here
+ Notifications::publish(NoteGameSettings(NoteGameSettings::Action::kMap));
}
void GameHost::write_setting_user(SendPacket& packet, uint32_t const number) {
___
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
Thanks for filing the bugs :) @bunnybot merge -- 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:~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-26 05:55:25 +
@@ -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-26 05:55:25 +
@@ -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
+rmdir
