widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #12783
[Merge] lp:~widelands-dev/widelands/unlink_test_richtext into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/unlink_test_richtext into lp:widelands.
Commit message:
Reactivated the rich text testing project, as it's currently unmaintained.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1338203 in widelands: "[richtext_testing] failures detected in test suite "RichTextRendering"
https://bugs.launchpad.net/widelands/+bug/1338203
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/unlink_test_richtext/+merge/340264
Reactivated the rich text testing project, as it's currently unmaintained.
I'm tired of waiting for this think to be linked, and it has been on hold for many years now. We need to work out the remaining kinks in the new font renderer first anyway.
--
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/unlink_test_richtext into lp:widelands.
=== modified file 'debian/rules'
--- debian/rules 2017-11-27 17:35:31 +0000
+++ debian/rules 2018-03-02 06:23:51 +0000
@@ -67,7 +67,8 @@
mkdir debian/tmp/usr/games
# ... but we want to place them in the right location so that the .install files work
# mv debian/tmp/usr/widelands debian/tmp/usr/games
- for b in wl_map_info wl_map_object_info wl_render_richtext widelands ; do \
+ # TODO(GunChleoc): wl_render_richtext is currently unmaintained
+ for b in wl_map_info wl_map_object_info widelands ; do \
mv debian/tmp/usr/$${b} debian/tmp/usr/games ;\
done
# appdata
=== modified file 'src/graphic/text/CMakeLists.txt'
--- src/graphic/text/CMakeLists.txt 2017-05-21 16:53:25 +0000
+++ src/graphic/text/CMakeLists.txt 2018-03-02 06:23:51 +0000
@@ -1,4 +1,6 @@
-add_subdirectory(test)
+# TODO(GunChleoc): This unit testing project is currently unmaintained
+# Reactivate in debian/rules too once work resumes on this
+# add_subdirectory(test)
wl_library(graphic_text
SRCS
=== modified file 'src/graphic/text/test/CMakeLists.txt'
--- src/graphic/text/test/CMakeLists.txt 2017-05-21 16:53:25 +0000
+++ src/graphic/text/test/CMakeLists.txt 2018-03-02 06:23:51 +0000
@@ -1,3 +1,6 @@
+# TODO(GunChleoc): This unit testing project is currently unmaintained
+# Reactivate in parent directory once work resumes on this
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/paths.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/paths.h)
# Simple binary that renders a text into an image for manual
Follow ups