some more cleanup of the old editor cruft

CMakeLists.txt

@@ -70,7 +70,7 @@ set(FIFO_DIR "/var/run/wesnothd" CACHE STRING "Directory for the wesnothd fifo s
 option(ENABLE_GAME "Enable compilation of the game" ON)
 option(ENABLE_CAMPAIGN_SERVER "Enable compilation of campaign server")
 option(ENABLE_SERVER "Enable compilation of server" ON)
-option(ENABLE_EDITOR2 "Enable compilation of the new map editor into the game executable" ON)
+option(ENABLE_EDITOR "Enable compilation of the new map editor into the game executable" ON)
 option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers")
 option(ENABLE_TESTS "Build unit tests")
 option(ENABLE_NLS "Enable building of tranlations" ON)
@@ -99,9 +99,9 @@ if(NOT WIN32)
   add_definitions(-DWESNOTH_PATH='\"${DATADIR}\"')
 endif(NOT WIN32)
 
-if(NOT ENABLE_EDITOR2)
-  add_definitions(-DDISABLE_EDITOR2)
-endif(NOT ENABLE_EDITOR2)
+if(NOT ENABLE_EDITOR)
+  add_definitions(-DDISABLE_EDITOR)
+endif(NOT ENABLE_EDITOR)
 
 if(X11_FOUND)
   add_definitions(-D_X11)

Makefile.am

@@ -53,14 +53,6 @@ bundle_contents=@PACKAGE_NAME@.app/Contents
 	echo "APPL????" > "$(bundle_contents)/PkgInfo"
 	$(INSTALL_PROGRAM) $< "$(bundle_contents)/MacOS/@PACKAGE_NAME@"
 
-# Create Macintosh app bundle from the editor
-bundle_editor_contents=@PACKAGE_NAME@ Editor.app/Contents
-@PACKAGE@_editor_bundle: src/@PACKAGE@_editor
-	mkdir -p "$(bundle_editor_contents)/MacOS"
-	mkdir -p "$(bundle_editor_contents)/Resources"
-	echo "APPL????" > "$(bundle_editor_contents)/PkgInfo"
-	$(INSTALL_PROGRAM) $< "$(bundle_editor_contents)/MacOS/@PACKAGE_NAME@ Editor"
-
 # Run this before release to check that POTs and data are in good shape
 sanity-check:
 	cd utils; ./sanity_check
@@ -156,7 +148,7 @@ dist-hook:
 	srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	( $(finddata); $(finddocdist); $(findnoinst); $(findnoinst_headers); $(findextrapo); $(findsconscript); $(findsconstruct); $(findsconsdir); $(findcmakelists); $(findcmakedir); $(findcmakeextrafiles) ) | (cd $(top_srcdir) && tar cf - -T -) | (cd $(distdir) && tar xf -)
 
-dist_noinst_DATA = copyright changelog players_changelog campaign_server.dsp editor.dev editor_gcc4.dev map_editor.dsp server.dev server.dsp unit_test.dev wesnothd.dev wesnoth.dev wesnothd_gcc4.dev wesnoth.dsp wesnoth.dsw wesnoth_gcc4.dev wesnoth.kdevelop
+dist_noinst_DATA = copyright changelog players_changelog campaign_server.dsp server.dev server.dsp unit_test.dev wesnothd.dev wesnoth.dev wesnothd_gcc4.dev wesnoth.dsp wesnoth.dsw wesnoth_gcc4.dev wesnoth.kdevelop
 
 uninstall-hook:
 	if test -d $(pkgdatadir) ; then rm -r $(pkgdatadir) ; fi

doc/man/CMakeLists.txt

@@ -2,9 +2,6 @@ SET(MANPAGES)
 if(ENABLE_GAME)
   SET(MANPAGES ${MANPAGES} wesnoth.6)
 endif()
-if(ENABLE_EDITOR)
-  SET(MANPAGES ${MANPAGES} wesnoth_editor.6)
-endif()
 if(ENABLE_SERVER)
   SET(MANPAGES ${MANPAGES} wesnothd.6)
 endif()

doc/man/Makefile.am

@@ -1,5 +1,5 @@
 MAN_LANG = ca_ES@valencia cs da de es fr gl hu it ja lt nl pl sk sr sr@latin sv tr zh_CN zh_TW
-MAN_PAGES = wesnoth.6 wesnothd.6 wesnoth_editor.6
+MAN_PAGES = wesnoth.6 wesnothd.6
 INSTALL_MAN_PAGES =
 
 if GAME

src/CMakeLists.txt

@@ -306,10 +306,10 @@ SET(wesnoth-main_SRC
     widgets/scrollpane.cpp
 )
 
-# used with editor2 option in the wesnoth target
-IF(ENABLE_EDITOR2)
+# used with editor option in the wesnoth target
+IF(ENABLE_EDITOR)
 
-SET(wesnoth-editor2_SRC
+SET(wesnoth-editor_SRC
     gui/dialogs/editor_generate_map.cpp
     gui/dialogs/editor_new_map.cpp
     gui/dialogs/editor_resize_map.cpp
@@ -330,17 +330,17 @@ SET(wesnoth-editor2_SRC
 SET(wesnoth_SRC
     game.cpp
     ${wesnoth-main_SRC}
-    ${wesnoth-editor2_SRC}
+    ${wesnoth-editor_SRC}
 )
 
-ELSE(ENABLE_EDITOR2)
+ELSE(ENABLE_EDITOR)
 
 SET(wesnoth_SRC
     game.cpp
     ${wesnoth-main_SRC}
 )
 
-ENDIF(ENABLE_EDITOR2)
+ENDIF(ENABLE_EDITOR)
 
 add_executable(wesnoth ${wesnoth_SRC})
 target_link_libraries(wesnoth wesnoth-core wesnoth-game ${game-external-libs})