From 3d34ea9173bf564da0d8f6c0e55829d5e2167338 Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Sat, 4 Oct 2008 13:22:57 +0000 Subject: [PATCH] Editor cleanups. * Remove the now obsolete manual. * Rename to editor in autotools and document it's enable by default. --- configure.ac | 14 +++--- doc/man/Makefile.am | 4 -- doc/man/wesnoth_editor.6 | 94 ---------------------------------------- src/Makefile.am | 8 ++-- 4 files changed, 11 insertions(+), 109 deletions(-) delete mode 100644 doc/man/wesnoth_editor.6 diff --git a/configure.ac b/configure.ac index 6eb88149f9d..6b8f35bad20 100644 --- a/configure.ac +++ b/configure.ac @@ -222,10 +222,10 @@ AC_ARG_ENABLE([campaign_server], [campaignserver=$enableval], [campaignserver=no]) -AC_ARG_ENABLE([editor2], - AS_HELP_STRING([--enable-editor2], [build the new map editor in the game executable]), - [editor2=$enableval], - [editor2=yes]) +AC_ARG_ENABLE([editor], + AS_HELP_STRING([--disable-editor], [disable the map editor in the game executable]), + [editor=$enableval], + [editor=yes]) AC_ARG_ENABLE([tools], AS_HELP_STRING([--enable-tools], [enable building and installation of tools for artists and WML maintainers]), @@ -288,15 +288,15 @@ AM_CONDITIONAL([GAME], [test x$game = xyes]) AM_CONDITIONAL([SERVER], [test x$server = xyes]) AM_CONDITIONAL([CAMPAIGNSERVER], [test x$campaignserver = xyes]) AM_CONDITIONAL([TESTS], [test x$tests = xyes]) -AM_CONDITIONAL([EDITOR2], [test x$editor2 = xyes]) +AM_CONDITIONAL([EDITOR], [test x$editor = xyes]) AM_CONDITIONAL([BANDWIDTH_MONITOR], [test x$bandwidth_monitor = xyes]) AM_CONDITIONAL([TOOLS], [test x$tools = xyes]) AM_CONDITIONAL([GCC], [test x$GXX = xyes]) AM_CONDITIONAL([INCLUDEDINTL], [test x$nls_cv_use_gnu_gettext = xyes]) -AM_CONDITIONAL([INSTALLDATA], [test [ x$game = xyes || test x$editor2 = xyes ]]) +AM_CONDITIONAL([INSTALLDATA], [test [ x$game = xyes || test x$editor = xyes ]]) AM_CONDITIONAL([DUMMYLOCALES], [test x$dummylocales = xyes]) -if test x$editor2 = xno +if test x$editor = xno then CXXFLAGS="$CXXFLAGS -DDISABLE_EDITOR2" fi diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 5384ae5c7f3..38f2254d74e 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -10,10 +10,6 @@ if SERVER INSTALL_MAN_PAGES += wesnothd.6 endif -if EDITOR -INSTALL_MAN_PAGES += wesnoth_editor.6 -endif - install-data-hook: mkdir -p $(DESTDIR)$(mandir)/man6 ; \ for j in $(INSTALL_MAN_PAGES); do \ diff --git a/doc/man/wesnoth_editor.6 b/doc/man/wesnoth_editor.6 deleted file mode 100644 index b4509f5c0a7..00000000000 --- a/doc/man/wesnoth_editor.6 +++ /dev/null @@ -1,94 +0,0 @@ -.\" This program is free software; you can redistribute it and/or modify -.\" it under the terms of the GNU General Public License as published by -.\" the Free Software Foundation; either version 2 of the License, or -.\" (at your option) any later version. -.\" -.\" This program is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License -.\" along with this program; if not, write to the Free Software -.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -.\" -. -.TH WESNOTH_EDITOR 6 "2007" "wesnoth_editor" "Battle for Wesnoth map editor" -. -.SH NAME -wesnoth_editor \- Battle for Wesnoth map editor -. -.SH SYNOPSIS -. -.B wesnoth_editor -[\fIOPTIONS\fR] -[\fIMAP\fR] -. -.SH DESCRIPTION -Battle for -.B Wesnoth -map editor. -. -.SH OPTIONS -. -.TP -.BR --bpp \ number -sets BitsPerPixel value. Example: -.B --bpp 32 -.TP -.B --datadir -selects the data directory to use. -.TP -.BR -f , \ --fullscreen -runs the editor in full screen mode. -.TP -.BR -h , \ --help -tells you what the command line options do. -.TP -.BR --log- level = domain1 , domain2 , ... -sets the severity level of the log domains. -.B all -can be used to match any log domain. Available levels: -.BR error ,\ warning ,\ info ,\ debug . -By default the -.B error -level is used. -.TP -.B --logdomains -Dumps a list of all log domains and exits. -.TP -.B --path -prints the name of the game data directory and exits. -.TP -.BI -r\ X x Y ,\ --resolution\ X x Y -sets screen resolution. Example: -.B -r 800x600 -.TP -.BR -v , \ --version -prints version number and exits. -.TP -.BR -w , \ --windowed -runs the editor in windowed mode. - -. -.SH AUTHOR -. -Written by David White . -.br -Edited by Nils Kneuper and ott . -.br -This manual page was originally written by Cyril Bouthors . -.br -Visit the official homepage: http://www.wesnoth.org/ -. -.SH COPYRIGHT -. -Copyright \(co 2003-2007 David White -.br -This is Free Software; this software is licensed under the GPL version 2, as published by the Free Software Foundation. -There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -. -.SH SEE ALSO -. -.BR wesnoth (6), -.BR wesnothd (6) diff --git a/src/Makefile.am b/src/Makefile.am index 0d01f30f198..910b8780d68 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -155,8 +155,8 @@ wesnoth_source = \ widgets/drop_target.cpp \ widgets/scrollpane.cpp -# used with editor2 option in the wesnoth target -wesnoth_editor2_SOURCES = \ +# used with editor option in the wesnoth target +wesnoth_editor_SOURCES = \ gui/dialogs/editor_generate_map.cpp \ gui/dialogs/editor_new_map.cpp \ gui/dialogs/editor_resize_map.cpp \ @@ -173,8 +173,8 @@ wesnoth_editor2_SOURCES = \ editor2/map_fragment.cpp \ editor2/mouse_action.cpp -if EDITOR2 -wesnoth_source += $(wesnoth_editor2_SOURCES) +if EDITOR +wesnoth_source += $(wesnoth_editor_SOURCES) endif