diff --git a/CMakeLists.txt b/CMakeLists.txt index 94d47f56..d3120943 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,6 +38,39 @@ list(APPEND EXTRA_DIST project(medit) +# keep in sync with po/maintain +SET(MOO_PACKAGE_NAME "medit-1") + +SET(MOO_MAJOR_VERSION 1) +SET(MOO_MINOR_VERSION 2) +SET(MOO_MICRO_VERSION 90) +SET(_moo_version_suffix_ "-devel") +SET(MOO_MODULE_MAJOR_VERSION 2) +SET(MOO_MODULE_MINOR_VERSION 0) +SET(MOO_VERSION "${MOO_MAJOR_VERSION}.${MOO_MINOR_VERSION}.${MOO_MICRO_VERSION}") +SET(MOO_DISPLAY_VERSION "${MOO_VERSION}${_moo_version_suffix_}") + +SET(MOO_WEBSITE "http://mooedit.sourceforge.net/") +SET(MOO_WEB_CONTACT "http://mooedit.sourceforge.net/contact.html") +SET(MOO_EMAIL "emuntyan@users.sourceforge.net") +SET(MOO_COPYRIGHT "2004-2015 Yevgen Muntyan <${MOO_EMAIL}>") + +SET(MOO_PREFS_XML_FILE_NAME "prefs.xml") +SET(MOO_STATE_XML_FILE_NAME "state.xml") +SET(MOO_NAMED_SESSION_XML_FILE_NAME "session-%s.xml") +SET(MOO_SESSION_XML_FILE_NAME "session.xml") +SET(MEDIT_PORTABLE_MAGIC_FILE_NAME "medit-portable") +SET(MEDIT_PORTABLE_DATA_DIR "medit-portable-data") +SET(MEDIT_PORTABLE_CACHE_DIR "medit-portable-cache") + +SET(MOO_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/${MOO_PACKAGE_NAME}") +SET(MOO_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib/${MOO_PACKAGE_NAME}") +SET(MOO_DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${MOO_PACKAGE_NAME}") +SET(MOO_HELP_DIR "${MOO_DOC_DIR}/help") +SET(MOO_TEXT_LANG_FILES_DIR, "${MOO_DATA_DIR}/language-specs") +SET(MOO_PYTHON_PLUGIN_DIR "${MOO_DATA_DIR}/plugins") +SET(MOO_PYTHON_LIB_DIR "${MOO_DATA_DIR}/python") + if(CMAKE_COMPILER_IS_GNUCXX) list(APPEND CMAKE_CXX_FLAGS "-std=c++11") endif() @@ -51,7 +84,36 @@ endif() set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) -find_package(GTK2 2.6 REQUIRED gtk) +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED gtk+-2.0) +pkg_check_modules(GMODULE REQUIRED gmodule-2.0) +execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=glib_genmarshal glib-2.0 + OUTPUT_VARIABLE GLIB_GENMARSHAL + OUTPUT_STRIP_TRAILING_WHITESPACE) +execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=glib_mkenums glib-2.0 + OUTPUT_VARIABLE GLIB_MKENUMS + OUTPUT_STRIP_TRAILING_WHITESPACE) +find_program(GDK_PIXBUF_CSOURCE gdk-pixbuf-csource) + +pkg_check_modules(XLIB x11 xext xrender ice sm) + +pkg_check_modules(LIBXML2 REQUIRED libxml-2.0) + +find_library(LIBM m) + +find_package(Gettext REQUIRED) +SET(GETTEXT_PACKAGE "${MOO_PACKAGE_NAME}") +SET(GETTEXT_PACKAGE_GSV "${MOO_PACKAGE_NAME}-gsv") +# MOO_INTL + +find_package(PythonInterp REQUIRED) +SET(MOO_PYTHON "${PYTHON_EXECUTABLE}") + +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) +add_definitions(-DMOO_COMPILATION=1 -DHAVE_CONFIG_H=1 -DXDG_PREFIX=_moo_edit_xdg -DG_LOG_DOMAIN=\"Moo\") # zzz SUBDIRS = po po-gsv api doc moo +add_subdirectory(api) add_subdirectory(moo) diff --git a/api/CMakeLists.txt b/api/CMakeLists.txt new file mode 100644 index 00000000..c75138d8 --- /dev/null +++ b/api/CMakeLists.txt @@ -0,0 +1,357 @@ +SET(docparser_files + parsedocs.py + mdp/__init__.py + mdp/module.py + mdp/docparser.py + mdp/xmlwriter.py +) + +SET(gendefs_files + gendefs.py + mpi/__init__.py + mpi/module.py + mpi/defswriter.py +) + +SET(genlua_files + genlua.py + mpi/__init__.py + mpi/module.py + mpi/luawriter.py +) + +SET(gendocs_files + gendocs.py + gendocbook.py + mpi/__init__.py + mpi/module.py + mpi/docbookwriter.py +) + +SET(source_files + ../moo/moolua/medit-lua.h + ../moo/moolua/medit-lua.cpp + ../moo/mooapp/mooappabout.c + ../moo/mooapp/mooappabout.h + ../moo/mooapp/mooapp-accels.h + ../moo/mooapp/mooapp.c + ../moo/mooapp/mooapp.h + ../moo/mooapp/mooapp-info.h + ../moo/mooapp/mooapp-private.h + ../moo/mooapp/moohtml.c + ../moo/mooapp/moohtml.h + ../moo/mooapp/moolinklabel.c + ../moo/mooapp/moolinklabel.h + ../moo/mooedit/mooedit-accels.h + ../moo/mooedit/mooeditaction.c + ../moo/mooedit/mooeditaction-factory.c + ../moo/mooedit/mooeditaction-factory.h + ../moo/mooedit/mooeditaction.h + ../moo/mooedit/mooeditbookmark.c + ../moo/mooedit/mooeditbookmark.h + ../moo/mooedit/mooedit.c + ../moo/mooedit/mooeditconfig.c + ../moo/mooedit/mooeditconfig.h + ../moo/mooedit/mooeditdialogs.c + ../moo/mooedit/mooeditdialogs.h + ../moo/mooedit/mooedit-enum-types.c + ../moo/mooedit/mooedit-enum-types.h + ../moo/mooedit/mooedit-enums.h + ../moo/mooedit/mooeditfileinfo.c + ../moo/mooedit/mooeditfileinfo.c + ../moo/mooedit/mooeditfileinfo.h + ../moo/mooedit/mooedit-fileops.c + ../moo/mooedit/mooedit-fileops.h + ../moo/mooedit/mooeditfiltersettings.c + ../moo/mooedit/mooeditfiltersettings.h + ../moo/mooedit/mooedit.h + ../moo/mooedit/mooedithistoryitem.c + ../moo/mooedit/mooedithistoryitem.h + ../moo/mooedit/mooedit-impl.h + ../moo/mooedit/mooeditor.c + ../moo/mooedit/mooeditor.h + ../moo/mooedit/mooeditor-impl.h + ../moo/mooedit/mooeditor-private.h + ../moo/mooedit/mooeditor-tests.c + ../moo/mooedit/mooeditor-tests.h + ../moo/mooedit/mooeditprefs.c + ../moo/mooedit/mooeditprefs.h + ../moo/mooedit/mooeditprefspage.c + ../moo/mooedit/mooedit-private.h + ../moo/mooedit/mooedit-script.c + ../moo/mooedit/mooedit-script.h + ../moo/mooedit/mooedittab.c + ../moo/mooedit/mooedittab.h + ../moo/mooedit/mooedittypes.h + ../moo/mooedit/mooeditview.c + ../moo/mooedit/mooeditview.h + ../moo/mooedit/mooeditview-script.c + ../moo/mooedit/mooeditview-script.h + ../moo/mooedit/mooeditwindow.c + ../moo/mooedit/mooeditwindow.h + ../moo/mooedit/mooeditwindow-impl.h + ../moo/mooedit/moofold.c + ../moo/mooedit/moofold.h + ../moo/mooedit/mooindenter.c + ../moo/mooedit/mooindenter.h + ../moo/mooedit/moolang.c + ../moo/mooedit/moolang.h + ../moo/mooedit/moolangmgr.c + ../moo/mooedit/moolangmgr.h + ../moo/mooedit/moolangmgr-private.h + ../moo/mooedit/moolang-private.h + ../moo/mooedit/moolinebuffer.c + ../moo/mooedit/moolinebuffer.h + ../moo/mooedit/moolinemark.c + ../moo/mooedit/moolinemark.h + ../moo/mooedit/mooplugin.c + ../moo/mooedit/mooplugin.h + ../moo/mooedit/mooplugin-loader.c + ../moo/mooedit/mooplugin-loader.h + ../moo/mooedit/mooplugin-macro.h + ../moo/mooedit/mootextbtree.c + ../moo/mooedit/mootextbtree.h + ../moo/mooedit/mootextbuffer.c + ../moo/mooedit/mootextfind.c + ../moo/mooedit/mootextfind.h + ../moo/mooedit/mootextiter.h + ../moo/mooedit/mootextprint.c + ../moo/mooedit/mootextprint.h + ../moo/mooedit/mootextprint-private.h + ../moo/mooedit/mootext-private.h + ../moo/mooedit/mootextsearch.c + ../moo/mooedit/mootextsearch.h + ../moo/mooedit/mootextsearch-private.h + ../moo/mooedit/mootextstylescheme.c + ../moo/mooedit/mootextstylescheme.h + ../moo/mooedit/mootextview.c + ../moo/mooedit/mootextview.h + ../moo/mooedit/mootextview-input.c + ../moo/mooedit/mootextview-private.h + ../moo/moofileview/moobookmarkmgr.c + ../moo/moofileview/moobookmarkmgr.h + ../moo/moofileview/moobookmarkview.c + ../moo/moofileview/moobookmarkview.h + ../moo/moofileview/moofile.c + ../moo/moofileview/moofileentry.c + ../moo/moofileview/moofileentry.h + ../moo/moofileview/moofile.h + ../moo/moofileview/moofile-private.h + ../moo/moofileview/moofilesystem.c + ../moo/moofileview/moofilesystem.h + ../moo/moofileview/moofileview-accels.h + ../moo/moofileview/moofileview-aux.h + ../moo/moofileview/moofileview.c + ../moo/moofileview/moofileview-dialogs.c + ../moo/moofileview/moofileview-dialogs.h + ../moo/moofileview/moofileview.h + ../moo/moofileview/moofileview-impl.h + ../moo/moofileview/moofileview-private.h + ../moo/moofileview/moofileview-tools.c + ../moo/moofileview/moofileview-tools.h + ../moo/moofileview/moofolder.c + ../moo/moofileview/moofolder.h + ../moo/moofileview/moofoldermodel.c + ../moo/moofileview/moofoldermodel.h + ../moo/moofileview/moofoldermodel-private.h + ../moo/moofileview/moofolder-private.h + ../moo/moofileview/mooiconview.c + ../moo/moofileview/mooiconview.h + ../moo/moofileview/mootreeview.c + ../moo/moofileview/mootreeview.h + ../moo/mooutils/mooaccelbutton.c + ../moo/mooutils/mooaccelbutton.h + ../moo/mooutils/mooaccel.c + ../moo/mooutils/mooaccel.h + ../moo/mooutils/mooaccelprefs.c + ../moo/mooutils/mooaccelprefs.h + ../moo/mooutils/mooactionbase.c + ../moo/mooutils/mooactionbase.h + ../moo/mooutils/mooactionbase-private.h + ../moo/mooutils/mooaction.c + ../moo/mooutils/mooactioncollection.c + ../moo/mooutils/mooactioncollection.h + ../moo/mooutils/mooactionfactory.c + ../moo/mooutils/mooactionfactory.h + ../moo/mooutils/mooactiongroup.c + ../moo/mooutils/mooactiongroup.h + ../moo/mooutils/mooaction.h + ../moo/mooutils/mooaction-private.h + ../moo/mooutils/mooappinput.c + ../moo/mooutils/mooappinput.h + ../moo/mooutils/mooapp-ipc.c + ../moo/mooutils/mooapp-ipc.h + ../moo/mooutils/mooarray.h + ../moo/mooutils/mooatom.h + ../moo/mooutils/moobigpaned.c + ../moo/mooutils/moobigpaned.h + ../moo/mooutils/mooclosure.c + ../moo/mooutils/mooclosure.h + ../moo/mooutils/moocombo.c + ../moo/mooutils/moocombo.h + ../moo/mooutils/moocompat.h + ../moo/mooutils/moodialogs.c + ../moo/mooutils/moodialogs.h + ../moo/mooutils/mooeditops.c + ../moo/mooutils/mooeditops.h + ../moo/mooutils/mooencodings.c + ../moo/mooutils/mooencodings-data.h + ../moo/mooutils/mooencodings.h + ../moo/mooutils/mooentry.c + ../moo/mooutils/mooentry.h + ../moo/mooutils/moo-environ.h + ../moo/mooutils/moofiledialog.c + ../moo/mooutils/moofiledialog.h + ../moo/mooutils/moofileicon.c + ../moo/mooutils/moofileicon.h + ../moo/mooutils/moofilewatch.c + ../moo/mooutils/moofilewatch.h + ../moo/mooutils/moofilewriter.c + ../moo/mooutils/moofilewriter.h + ../moo/mooutils/moofilewriter-private.h + ../moo/mooutils/moofiltermgr.c + ../moo/mooutils/moofiltermgr.h + ../moo/mooutils/moofontsel.c + ../moo/mooutils/moofontsel.h + ../moo/mooutils/mooglade.c + ../moo/mooutils/mooglade.h + ../moo/mooutils/moohelp.c + ../moo/mooutils/moohelp.h + ../moo/mooutils/moohistorycombo.c + ../moo/mooutils/moohistorycombo.h + ../moo/mooutils/moohistorylist.c + ../moo/mooutils/moohistorylist.h + ../moo/mooutils/moohistorymgr.c + ../moo/mooutils/moohistorymgr.h + ../moo/mooutils/mooi18n.c + ../moo/mooutils/mooi18n.h + ../moo/mooutils/moolist.h + ../moo/mooutils/moomarkup.c + ../moo/mooutils/moomarkup.h + ../moo/mooutils/moomenuaction.c + ../moo/mooutils/moomenuaction.h + ../moo/mooutils/moomenu.c + ../moo/mooutils/moomenu.h + ../moo/mooutils/moomenumgr.c + ../moo/mooutils/moomenumgr.h + ../moo/mooutils/moomenutoolbutton.c + ../moo/mooutils/moomenutoolbutton.h + ../moo/mooutils/moo-mime.c + ../moo/mooutils/moo-mime.h + ../moo/mooutils/moonotebook.c + ../moo/mooutils/moonotebook.h + ../moo/mooutils/mooonce.h + ../moo/mooutils/moopane.c + ../moo/mooutils/moopaned.c + ../moo/mooutils/moopaned.h + ../moo/mooutils/moopane.h + ../moo/mooutils/mooprefs.c + ../moo/mooutils/mooprefsdialog.c + ../moo/mooutils/mooprefsdialog.h + ../moo/mooutils/mooprefs.h + ../moo/mooutils/mooprefspage.c + ../moo/mooutils/mooprefspage.h + ../moo/mooutils/moospawn.c + ../moo/mooutils/moospawn.h + ../moo/mooutils/moostat.h + ../moo/mooutils/moostock.c + ../moo/mooutils/moostock.h + ../moo/mooutils/moo-test-macros.h + ../moo/mooutils/moo-test-utils.c + ../moo/mooutils/moo-test-utils.h + ../moo/mooutils/mootypedecl-macros.h + ../moo/mooutils/mootype-macros.h + ../moo/mooutils/moouixml.c + ../moo/mooutils/moouixml.h + ../moo/mooutils/mooundo.c + ../moo/mooutils/mooundo.h + ../moo/mooutils/mooutils-debug.h + ../moo/mooutils/mooutils-enums.c + ../moo/mooutils/mooutils-enums.h + ../moo/mooutils/mooutils-file.c + ../moo/mooutils/mooutils-file.h + ../moo/mooutils/mooutils-fs.c + ../moo/mooutils/mooutils-fs.h + ../moo/mooutils/mooutils-gobject.c + ../moo/mooutils/mooutils-gobject.h + ../moo/mooutils/mooutils-gobject-private.h + ../moo/mooutils/mooutils.h + ../moo/mooutils/mooutils-macros.h + ../moo/mooutils/mooutils-mem.h + ../moo/mooutils/mooutils-messages.h + ../moo/mooutils/mooutils-misc.c + ../moo/mooutils/mooutils-misc.h + ../moo/mooutils/mooutils-script.c + ../moo/mooutils/mooutils-script.h + ../moo/mooutils/mooutils-tests.h + ../moo/mooutils/mooutils-thread.c + ../moo/mooutils/mooutils-thread.h + ../moo/mooutils/mooutils-treeview.c + ../moo/mooutils/mooutils-treeview.h + ../moo/mooutils/mooutils-win32.c + ../moo/mooutils/moowin32/mingw/fnmatch.h + ../moo/mooutils/moowin32/mingw/netinet/in.h + ../moo/mooutils/moowin32/mingw/sys/mman.h + ../moo/mooutils/moowin32/ms/sys/time.h + ../moo/mooutils/moowin32/ms/unistd.h + ../moo/mooutils/moowindow.c + ../moo/mooutils/moowindow.h + ../moo/plugins/support/moocmdview.c + ../moo/plugins/support/moocmdview.h + ../moo/plugins/support/mooeditwindowoutput.c + ../moo/plugins/support/mooeditwindowoutput.h + ../moo/plugins/support/moolineview.c + ../moo/plugins/support/moolineview.h + ../moo/plugins/support/moooutputfilter.c + ../moo/plugins/support/moooutputfilter.h + ../moo/plugins/usertools/moocommand.c + ../moo/plugins/usertools/moocommanddisplay.c + ../moo/plugins/usertools/moocommanddisplay.h + ../moo/plugins/usertools/moocommand.h + ../moo/plugins/usertools/moocommand-private.h + ../moo/plugins/usertools/moooutputfilterregex.c + ../moo/plugins/usertools/moooutputfilterregex.h + ../moo/plugins/usertools/moousertools.c + ../moo/plugins/usertools/moousertools-enums.c + ../moo/plugins/usertools/moousertools-enums.h + ../moo/plugins/usertools/moousertools.h + ../moo/plugins/usertools/moousertools-prefs.c + ../moo/plugins/usertools/moousertools-prefs.h +) + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/genmooxml.cmake +"EXECUTE_PROCESS(COMMAND ${MOO_PYTHON} ${CMAKE_CURRENT_SOURCE_DIR}/parsedocs.py + --source-dir ${CMAKE_SOURCE_DIR}/moo/mooapp + --source-dir ${CMAKE_SOURCE_DIR}/moo/mooedit + --source-dir ${CMAKE_SOURCE_DIR}/moo/moofileview + --source-dir ${CMAKE_SOURCE_DIR}/moo/mooutils + --source-dir ${CMAKE_SOURCE_DIR}/moo/moopython + --source-dir ${CMAKE_SOURCE_DIR}/moo/plugins/usertools + --source-dir ${CMAKE_SOURCE_DIR}/moo/plugins/support + --source-file ${CMAKE_SOURCE_DIR}/moo/moolua/medit-lua.cpp + --source-file ${CMAKE_SOURCE_DIR}/moo/moolua/medit-lua.h + --skip moofontsel.* + --output ${CMAKE_CURRENT_SOURCE_DIR}/moo.xml) +file(WRITE moo.xml.stamp moo.xml.stamp) +") + +add_custom_command(OUTPUT moo.xml.stamp + COMMAND ${CMAKE_COMMAND} -P genmooxml.cmake + DEPENDS ${docparser_files} ${source_files} ${CMAKE_CURRENT_BINARY_DIR}/genmooxml.cmake) +LIST(APPEND built_moo_sources moo.xml.stamp) + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/gengtkxml.cmake +"EXECUTE_PROCESS(COMMAND ${MOO_PYTHON} ${CMAKE_CURRENT_SOURCE_DIR}/parsedocs.py + --source-file ${CMAKE_SOURCE_DIR}/moo/moolua/gtk-api.c + --source-file ${CMAKE_SOURCE_DIR}/moo/moolua/gtk-api.h + --module Gtk + --output ${CMAKE_CURRENT_SOURCE_DIR}/gtk.xml) +file(WRITE gtk.xml.stamp gtk.xml.stamp) +") + +add_custom_command(OUTPUT gtk.xml.stamp + COMMAND ${CMAKE_COMMAND} -P gengtkxml.cmake + DEPENDS ${docparser_files} ${source_files} ${CMAKE_CURRENT_BINARY_DIR}/gengtkxml.cmake) +LIST(APPEND built_moo_sources gtk.xml.stamp) + +add_custom_target(apixml ALL DEPENDS moo.xml.stamp gtk.xml.stamp) diff --git a/api/genlua.py b/api/genlua.py index 1591c26a..42dae35c 100644 --- a/api/genlua.py +++ b/api/genlua.py @@ -1,5 +1,6 @@ #! /usr/bin/env python +import os import sys import optparse @@ -9,6 +10,7 @@ from mpi.luawriter import Writer op = optparse.OptionParser() op.add_option("-i", "--import", action="append", dest="import_modules") op.add_option("--include-header", action="append", dest="include_headers") +op.add_option("--output", dest="output") (opts, args) = op.parse_args() import_modules = [] @@ -16,8 +18,19 @@ if opts.import_modules: for filename in opts.import_modules: import_modules.append(Module.from_xml(filename)) +if opts.output: + out_file = open(opts.output + '.tmp', 'w') +else: + out_file = sys.stdout + assert len(args) == 1 mod = Module.from_xml(args[0]) for im in import_modules: mod.import_module(im) -Writer(sys.stdout).write(mod, opts.include_headers) +Writer(out_file).write(mod, opts.include_headers) + +if opts.output: + out_file.close() + if os.access(opts.output, os.F_OK): + os.remove(opts.output) + os.rename(opts.output + '.tmp', opts.output) diff --git a/api/mpi/luawriter.py b/api/mpi/luawriter.py index 6c8cd6f8..a3239485 100644 --- a/api/mpi/luawriter.py +++ b/api/mpi/luawriter.py @@ -7,7 +7,7 @@ tmpl_file_start = """\ #include #endif %(headers)s -#include "moo-lua-api-util.h" +#include "moolua/moo-lua-api-util.h" extern "C" void moo_test_coverage_record (const char *lang, const char *function); diff --git a/api/parsedocs.py b/api/parsedocs.py index 40127fc6..2c0a5dda 100644 --- a/api/parsedocs.py +++ b/api/parsedocs.py @@ -5,6 +5,7 @@ import re import sys import optparse import fnmatch +import filecmp from mdp.docparser import Parser from mdp.module import Module @@ -51,5 +52,13 @@ def parse_args(): opts, files = parse_args() mod = read_files(files, opts) -with open(opts.output, 'w') as out: +tmp_file = opts.output + '.tmp' +with open(tmp_file, 'w') as out: mdp.xmlwriter.write_xml(mod, out) + +if not filecmp.cmp(tmp_file, opts.output): + if os.path.exists(opts.output): + os.remove(opts.output) + os.rename(tmp_file, opts.output) +else: + os.remove(tmp_file) diff --git a/moo/CMakeLists.txt b/moo/CMakeLists.txt index 87d2fb29..62c1fd9d 100644 --- a/moo/CMakeLists.txt +++ b/moo/CMakeLists.txt @@ -1,40 +1,91 @@ # zzz AM_CPPFLAGS = $(MOO_CPPFLAGS) -I$(top_srcdir)/doc/built -Imooutils/glade -# zzz -# EXTRA_DIST += marshals.list -# built_moo_sources += marshals.h -# marshals.h: marshals.list -# $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=_moo_marshal --header $(srcdir)/marshals.list > marshals.h.tmp \ -# && mv marshals.h.tmp marshals.h +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/genmarshals_h.cmake +"EXECUTE_PROCESS(COMMAND ${GLIB_GENMARSHAL} --prefix=_moo_marshal --header ${CMAKE_CURRENT_SOURCE_DIR}/marshals.list + OUTPUT_FILE marshals.h.tmp) +file(RENAME marshals.h.tmp marshals.h) +") +add_custom_command(OUTPUT marshals.h + COMMAND ${CMAKE_COMMAND} -P genmarshals_h.cmake + MAIN_DEPENDENCY marshals.list) +LIST(APPEND built_moo_sources marshals.h) -# include mooedit/Makefile.incl -# include xdgmime/Makefile.incl -# include mooutils/Makefile.incl -# include moofileview/Makefile.incl -# include gtksourceview/Makefile.incl -# include eggsmclient/Makefile.incl -# include mooapp/Makefile.incl -# include moolua/Makefile.incl +macro(ADD_GXML input) + string(REPLACE ".glade" "-gxml.h" _gxml_output "${input}") + string(REPLACE "/glade/" "/" _gxml_output "${_gxml_output}") + #message(STATUS "_gxml_output: ${_gxml_output}") + add_custom_command(OUTPUT ${_gxml_output} + COMMAND ${MOO_PYTHON} ${CMAKE_SOURCE_DIR}/tools/glade2c.py --output=${_gxml_output} ${CMAKE_CURRENT_SOURCE_DIR}/${input} + MAIN_DEPENDENCY ${input} + DEPENDS ${CMAKE_SOURCE_DIR}/tools/glade2c.py + COMMENT "Generating ${_gxml_output} from ${input}") + list(APPEND built_moo_sources ${_gxml_output}) +endmacro(ADD_GXML) + +macro(XML2H _xml2h_input _xml2h_output _xml2h_variable) + add_custom_command(OUTPUT ${_xml2h_output} + COMMAND ${MOO_PYTHON} ${CMAKE_SOURCE_DIR}/tools/xml2h.py ${CMAKE_CURRENT_SOURCE_DIR}/${_xml2h_input} ${_xml2h_output} ${_xml2h_variable} + MAIN_DEPENDENCY ${_xml2h_input} + DEPENDS ${CMAKE_SOURCE_DIR}/tools/xml2h.py + COMMENT "Generating ${_xml2h_output} from ${_xml2h_input}") + list(APPEND built_moo_sources ${_xml2h_output}) +endmacro(XML2H) + +macro(ADD_UI input) + string(REPLACE ".xml" "-ui.h" _ui_output "${input}") +# message(STATUS "_ui_output: ${_ui_output}") + string(REGEX REPLACE ".*/([^/]*)\\.xml" "\\1" _ui_variable "${input}") + XML2H(${input} ${_ui_output} ${_ui_variable}_ui_xml) +endmacro(ADD_UI) + +file(MAKE_DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/mooapp + ${CMAKE_CURRENT_BINARY_DIR}/mooedit + ${CMAKE_CURRENT_BINARY_DIR}/moofileview + ${CMAKE_CURRENT_BINARY_DIR}/mooutils + ${CMAKE_CURRENT_BINARY_DIR}/moolua + ${CMAKE_CURRENT_BINARY_DIR}/plugins/usertools +) + +include(${CMAKE_CURRENT_SOURCE_DIR}/xdgmime/xdgmime.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/mooutils/mooutils.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/mooedit/mooedit.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/moofileview/moofileview.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/gtksourceview/gtksourceview.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/eggsmclient/eggsmclient.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/mooapp/mooapp.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/moolua/moolua.cmake) # include moopython/Makefile.incl -# include plugins/Makefile.incl +include(${CMAKE_CURRENT_SOURCE_DIR}/plugins/plugins.cmake) SET(MEDIT_SOURCES medit-app/mem-debug.h medit-app/run-tests.h medit-app/parse.h - medit-app/main.cpp - ${MOO_SOURCES} - ${PLUGINS_SOURCES} + medit-app/main.c + ${moo_sources} + ${built_moo_sources} + ${plugins_sources} ) add_executable(medit WIN32 ${MEDIT_SOURCES} ) -include_directories(${GTK2_INCLUDE_DIRS}) +include_directories( + ${PROJECT_BINARY_DIR} + ${GTK_INCLUDE_DIRS} + ${LIBXML2_INCLUDE_DIRS} +) +link_directories(${GTK_LIBRARY_DIRS} ${GMODULE_LIBRARY_DIRS}) target_link_libraries(medit - ${GTK2_LIBRARIES} + ${GTK_LIBRARIES} + ${GMODULE_LIBRARIES} + ${LIBXML2_LIBRARIES} + ${XLIB_LIBRARIES} + ${LIBM} + ${moo_libadd} ${MEDIT_LIBS} ) @@ -66,11 +117,11 @@ target_link_libraries(medit # update_icon_cache = gtk-update-icon-cache -f -t $(DESTDIR)$(datadir)/icons/hicolor # install-data-hook: install-data-hook-gtk-icon-cache # install-data-hook-gtk-icon-cache: -# @if echo "Updating icon cache" && $(update_icon_cache); then \ -# echo "Done."; \ -# else \ +# @if echo "Updating icon cache" && $(update_icon_cache); then +# echo "Done."; +# else # echo "*** GTK icon cache not updated. After install, run this:";\ -# echo $(update_icon_cache); \ +# echo $(update_icon_cache); # fi # uninstall-hook: uninstall-data-hook-gtk-icon-cache # uninstall-data-hook-gtk-icon-cache: @@ -78,36 +129,3 @@ target_link_libraries(medit # endif # zzz include medit-module/Makefile.incl - -# zzz -# mooutils/%-gxml.h: mooutils/glade/%.glade $(top_srcdir)/tools/glade2c.py -# $(AM_V_at) $(MKDIR_P) `dirname $@` -# $(AM_V_GEN)$(MOO_PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ -# -# moofileview/%-gxml.h: moofileview/glade/%.glade $(top_srcdir)/tools/glade2c.py -# $(AM_V_at) $(MKDIR_P) `dirname $@` -# $(AM_V_GEN)$(MOO_PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ -# -# mooedit/%-gxml.h: mooedit/glade/%.glade $(top_srcdir)/tools/glade2c.py -# $(AM_V_at) $(MKDIR_P) `dirname $@` -# $(AM_V_GEN)$(MOO_PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ -# -# mooapp/%-gxml.h: mooapp/glade/%.glade $(top_srcdir)/tools/glade2c.py -# $(AM_V_at) $(MKDIR_P) `dirname $@` -# $(AM_V_GEN)$(MOO_PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ -# -# plugins/%-gxml.h: plugins/glade/%.glade $(top_srcdir)/tools/glade2c.py -# $(AM_V_at) $(MKDIR_P) `dirname $@` -# $(AM_V_GEN)$(MOO_PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ -# -# plugins/usertools/%-gxml.h: plugins/usertools/glade/%.glade $(top_srcdir)/tools/glade2c.py -# $(AM_V_at) $(MKDIR_P) `dirname $@` -# $(AM_V_GEN)$(MOO_PYTHON) $(top_srcdir)/tools/glade2c.py $< > $@.tmp && mv $@.tmp $@ -# -# moofileview/%-ui.h: moofileview/%.xml $(top_srcdir)/tools/xml2h.py -# $(AM_V_at) $(MKDIR_P) `dirname $@` -# $(AM_V_GEN)$(MOO_PYTHON) $(top_srcdir)/tools/xml2h.py $< $@.tmp $*_ui_xml && mv $@.tmp $@ -# -# mooedit/%-ui.h: mooedit/%.xml $(top_srcdir)/tools/xml2h.py -# $(AM_V_at) $(MKDIR_P) `dirname $@` -# $(AM_V_GEN)$(MOO_PYTHON) $(top_srcdir)/tools/xml2h.py $< $@.tmp $*_ui_xml && mv $@.tmp $@ diff --git a/moo/eggsmclient/eggsmclient.cmake b/moo/eggsmclient/eggsmclient.cmake new file mode 100644 index 00000000..79a4e6e4 --- /dev/null +++ b/moo/eggsmclient/eggsmclient.cmake @@ -0,0 +1,17 @@ +LIST(APPEND moo_sources + eggsmclient/eggsmclient.c + eggsmclient/eggsmclient.h + eggsmclient/eggsmclient-mangle.h + eggsmclient/eggsmclient-private.h +) + +if(MOO_OS_WIN32) +LIST(APPEND moo_sources eggsmclient/eggsmclient-win32.c) +elseif(MOO_OS_DARWIN) +LIST(APPEND moo_sources eggsmclient/eggsmclient-dummy.c) +else(MOO_OS_WIN32) +add_definitions(-DEGG_SM_CLIENT_BACKEND_XSMP) +LIST(APPEND moo_sources eggsmclient/eggsmclient-xsmp.c eggsmclient/eggdesktopfile.h eggsmclient/eggdesktopfile.c) +endif(MOO_OS_WIN32) + +# -%- strip:true -%- diff --git a/moo/gtksourceview/gtksourceview.cmake b/moo/gtksourceview/gtksourceview.cmake new file mode 100644 index 00000000..09fa4ec2 --- /dev/null +++ b/moo/gtksourceview/gtksourceview.cmake @@ -0,0 +1,31 @@ +LIST(APPEND moo_sources + gtksourceview/gtksourcecontextengine.c + gtksourceview/gtksourcecontextengine.h + gtksourceview/gtksourceengine.c + gtksourceview/gtksourceengine.h + gtksourceview/gtksourceiter.c + gtksourceview/gtksourceiter.h + gtksourceview/gtksourcelanguage-parser-1.c + gtksourceview/gtksourcelanguage-parser-2.c + gtksourceview/gtksourcelanguage-private.h + gtksourceview/gtksourcelanguage.c + gtksourceview/gtksourcelanguage.h + gtksourceview/gtksourcelanguagemanager.c + gtksourceview/gtksourcelanguagemanager.h + gtksourceview/gtksourcestyle-private.h + gtksourceview/gtksourcestyle.c + gtksourceview/gtksourcestyle.h + gtksourceview/gtksourcestylescheme.c + gtksourceview/gtksourcestylescheme.h + gtksourceview/gtksourcestyleschememanager.c + gtksourceview/gtksourcestyleschememanager.h + gtksourceview/gtksourceview-utils.c + gtksourceview/gtksourceview-utils.h + gtksourceview/gtktextregion.c + gtksourceview/gtktextregion.h + gtksourceview/gtksourceview-i18n.h + gtksourceview/gtksourceview-marshal.h + gtksourceview/gtksourceview-api.h + gtksourceview/gtksourcebuffer.h + gtksourceview/gtksourceview.h +) diff --git a/moo/medit-app/main.cpp b/moo/medit-app/main.c similarity index 100% rename from moo/medit-app/main.cpp rename to moo/medit-app/main.c diff --git a/moo/mooapp/mooapp.cmake b/moo/mooapp/mooapp.cmake new file mode 100644 index 00000000..86306d94 --- /dev/null +++ b/moo/mooapp/mooapp.cmake @@ -0,0 +1,27 @@ +LIST(APPEND moo_sources + mooapp/mooappabout.c + mooapp/mooappabout.h + mooapp/mooapp.c + mooapp/mooapp.h + mooapp/mooapp-accels.h + mooapp/mooapp-info.h + mooapp/mooapp-private.h + mooapp/moohtml.h + mooapp/moohtml.c + mooapp/moolinklabel.h + mooapp/moolinklabel.c +) + +foreach(input_file + mooapp/glade/mooappabout-dialog.glade + mooapp/glade/mooappabout-license.glade + mooapp/glade/mooappabout-credits.glade +) + ADD_GXML(${input_file}) +endforeach(input_file) + +add_custom_command(OUTPUT mooapp-credits.h + COMMAND ${MOO_PYTHON} ${CMAKE_SOURCE_DIR}/tools/xml2h.py ${CMAKE_SOURCE_DIR}/THANKS mooapp-credits.h MOO_APP_CREDITS + MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/THANKS + DEPENDS ${CMAKE_SOURCE_DIR}/tools/xml2h.py) +list(APPEND built_moo_sources mooapp-credits.h) diff --git a/moo/mooapp/mooappabout.c b/moo/mooapp/mooappabout.c index 196e5c8c..8067d10a 100644 --- a/moo/mooapp/mooappabout.c +++ b/moo/mooapp/mooappabout.c @@ -25,7 +25,9 @@ #include "mooutils/mooi18n.h" #include "mooutils/moodialogs.h" #include "mooutils/moohelp.h" +#ifdef MOO_ENABLE_HELP #include "moo-help-sections.h" +#endif #include "mooapp/mooappabout-dialog-gxml.h" #include "mooapp/mooappabout-license-gxml.h" #include "mooapp/mooappabout-credits-gxml.h" @@ -132,7 +134,9 @@ show_credits (void) static void license_clicked (void) { +#ifdef MOO_ENABLE_HELP moo_help_open_id (HELP_SECTION_APP_LICENSE, NULL); +#endif } diff --git a/moo/mooedit/mooedit.cmake b/moo/mooedit/mooedit.cmake new file mode 100644 index 00000000..1f48d17e --- /dev/null +++ b/moo/mooedit/mooedit.cmake @@ -0,0 +1,149 @@ +LIST(APPEND moo_edit_enum_headers mooedit/mooedit-enums.h) + +LIST(APPEND moo_sources + ${moo_edit_enum_headers} + mooedit/mooeditor.h + mooedit/mootextview.h + mooedit/mootextprint.h + mooedit/mooeditview.h + mooedit/mooeditaction.h + mooedit/mooeditbookmark.h + mooedit/mooeditconfig.h + mooedit/mooeditdialogs.h + mooedit/mooeditfiltersettings.h + mooedit/mooedit.h + mooedit/mooedithistoryitem.h + mooedit/mooeditprefs.h + mooedit/mooedittypes.h + mooedit/mooeditwindow.h + mooedit/mooeditfileinfo.h + mooedit/mooplugin.h + mooedit/mootextbuffer.h + mooedit/mootextfind.h + mooedit/mootextiter.h + mooedit/mootextsearch.h + mooedit/mootextstylescheme.h + mooedit/mooeditview.c + mooedit/mooeditview-priv.h + mooedit/mooeditview-impl.h + mooedit/mooeditview-script.c + mooedit/mooeditview-script.h + mooedit/mooedit-accels.h + mooedit/mooeditaction.c + mooedit/mooeditaction-factory.c + mooedit/mooeditaction-factory.h + mooedit/mooeditbookmark.c + mooedit/mooedit.c + mooedit/mooeditconfig.c + mooedit/mooeditdialogs.c + mooedit/mooedit-enum-types.c + mooedit/mooedit-enum-types.h + mooedit/mooedit-enums.h + mooedit/mooedit-fileops.c + mooedit/mooedit-fileops.h + mooedit/mooeditfiltersettings.c + mooedit/mooedithistoryitem.c + mooedit/mooedit-impl.h + mooedit/mooedit-script.c + mooedit/mooedit-script.h + mooedit/mooeditprefs.c + mooedit/mooeditprefspage.c + mooedit/mooedit-private.h + mooedit/mooeditprogress.h + mooedit/mooeditprogress.c + mooedit/mooedittab.c + mooedit/mooedittab.h + mooedit/mooedittab-impl.h + mooedit/mooeditwindow.c + mooedit/mooeditwindow-impl.h + mooedit/mooeditfileinfo-impl.h + mooedit/mooeditfileinfo.c + mooedit/moofold.c + mooedit/moofold.h + mooedit/mooindenter.c + mooedit/mooindenter.h + mooedit/moolang.c + mooedit/moolang.h + mooedit/moolangmgr.c + mooedit/moolangmgr.h + mooedit/moolangmgr-private.h + mooedit/moolang-private.h + mooedit/moolinebuffer.c + mooedit/moolinebuffer.h + mooedit/moolinemark.c + mooedit/moolinemark.h + mooedit/mooplugin.c + mooedit/mooplugin-loader.c + mooedit/mooplugin-loader.h + mooedit/mooplugin-macro.h + mooedit/mootextbtree.c + mooedit/mootextbtree.h + mooedit/mootextbuffer.c + mooedit/mootextfind.c + mooedit/mootextprint.c + mooedit/mootextprint-private.h + mooedit/mootext-private.h + mooedit/mootextsearch.c + mooedit/mootextsearch-private.h + mooedit/mootextstylescheme.c + mooedit/mootextview.c + mooedit/mootextview-input.c + mooedit/mootextview-private.h + mooedit/mooeditor.c + mooedit/mooeditor-impl.h + mooedit/mooeditor-private.h + mooedit/mooeditor-tests.c + mooedit/mooeditor-tests.h + mooedit/mooeditor-tests.h +) + +# LIST(APPEND built_moo_sources mooedit/mooedit-enum-types.h.stamp mooedit/mooedit-enum-types.c.stamp) + +# add_custom_command(OUTPUT mooedit/mooedit-enum-types.h.stamp +# COMMAND ${MOO_PYTHON} ${CMAKE_SOURCE_DIR}/tools/xml2h.py ${CMAKE_CURRENT_SOURCE_DIR}/${input} zzz_ui_xml -o ${_ui_output} +# COMMAND +# $(AM_V_GEN)( cd $(srcdir) && \ +# $(GLIB_MKENUMS) --template mooedit/mooedit-enum-types.h.tmpl $(moo_edit_enum_headers) ) > mooedit/mooedit-enum-types.h.tmp +# $(AM_V_at)cmp -s mooedit/mooedit-enum-types.h.tmp $(srcdir)/mooedit/mooedit-enum-types.h || \ +# mv mooedit/mooedit-enum-types.h.tmp $(srcdir)/mooedit/mooedit-enum-types.h +# $(AM_V_at)rm -f mooedit/mooedit-enum-types.h.tmp +# $(AM_V_at)echo stamp > mooedit/mooedit-enum-types.h.stamp +# MAIN_DEPENDENCY mooedit/mooedit-enum-types.h.tmpl +# DEPENDS ${moo_edit_enum_headers} +# COMMENT "Generating ${_ui_output} from ${input}") + +# : Makefile +# mooedit/mooedit-enum-types.c.stamp: $(moo_edit_enum_headers) Makefile mooedit/mooedit-enum-types.c.tmpl +# $(AM_V_at)$(MKDIR_P) mooedit +# $(AM_V_GEN)( cd $(srcdir) && \ +# $(GLIB_MKENUMS) --template mooedit/mooedit-enum-types.c.tmpl $(moo_edit_enum_headers) ) > mooedit/mooedit-enum-types.c.tmp +# $(AM_V_at)cmp -s mooedit/mooedit-enum-types.c.tmp $(srcdir)/mooedit/mooedit-enum-types.c || \ +# mv mooedit/mooedit-enum-types.c.tmp $(srcdir)/mooedit/mooedit-enum-types.c +# $(AM_V_at)rm -f mooedit/mooedit-enum-types.c.tmp +# $(AM_V_at)echo stamp > mooedit/mooedit-enum-types.c.stamp + +# zzz +# include mooedit/langs/Makefile.incl + +foreach(input_file + mooedit/glade/moopluginprefs.glade + mooedit/glade/mooeditprefs-view.glade + mooedit/glade/mooeditprefs-file.glade + mooedit/glade/mooeditprefs-filters.glade + mooedit/glade/mooeditprefs-general.glade + mooedit/glade/mooeditprefs-langs.glade + mooedit/glade/mooeditprogress.glade + mooedit/glade/mooeditsavemult.glade + mooedit/glade/mootryencoding.glade + mooedit/glade/mooprint.glade + mooedit/glade/mootextfind.glade + mooedit/glade/mootextfind-prompt.glade + mooedit/glade/mootextgotoline.glade + mooedit/glade/mooquicksearch.glade + mooedit/glade/moostatusbar.glade +) + ADD_GXML(${input_file}) +endforeach(input_file) + +ADD_UI(mooedit/medit.xml) +ADD_UI(mooedit/mooedit.xml) diff --git a/moo/mooedit/mooeditprefspage.c b/moo/mooedit/mooeditprefspage.c index 05c1c2bc..607f02a2 100644 --- a/moo/mooedit/mooeditprefspage.c +++ b/moo/mooedit/mooeditprefspage.c @@ -32,7 +32,9 @@ #include "mooedit/mooeditprefs-general-gxml.h" #include "mooedit/mooeditprefs-langs-gxml.h" #include "mooedit/mooeditprefs-view-gxml.h" +#ifdef MOO_ENABLE_HELP #include "moo-help-sections.h" +#endif #include @@ -113,7 +115,9 @@ page_general_init_ui (MooPrefsPage *page) BIND_SETTING (indent_width, MOO_EDIT_PREFS_INDENT_WIDTH); BIND_SETTING (fontbutton, MOO_EDIT_PREFS_FONT); +#ifdef MOO_ENABLE_HELP moo_help_set_id (GTK_WIDGET (page), HELP_SECTION_PREFS_GENERAL); +#endif } static void @@ -179,7 +183,9 @@ page_filters_init_ui (MooPrefsPage *page) PrefsFiltersXml *gxml; gxml = prefs_filters_xml_new_with_root (GTK_WIDGET (page)); g_object_set_data (G_OBJECT (page), "moo-edit-prefs-page-xml", gxml); +#ifdef MOO_ENABLE_HELP moo_help_set_id (GTK_WIDGET (page), HELP_SECTION_PREFS_FILTERS); +#endif } static void @@ -232,7 +238,9 @@ page_view_init_ui (MooPrefsPage *page) BIND_SETTING (draw_rigth_margin, MOO_EDIT_PREFS_DRAW_RIGHT_MARGIN); BIND_SETTING (spin_right_margin_offset, MOO_EDIT_PREFS_RIGHT_MARGIN_OFFSET); +#ifdef MOO_ENABLE_HELP moo_help_set_id (GTK_WIDGET (page), HELP_SECTION_PREFS_VIEW); +#endif } static void @@ -278,7 +286,9 @@ page_file_init_ui (MooPrefsPage *page) BIND_SETTING (check_open_dialog_follows_doc, MOO_EDIT_PREFS_DIALOGS_OPEN_FOLLOWS_DOC); BIND_SETTING (check_auto_sync, MOO_EDIT_PREFS_AUTO_SYNC); +#ifdef MOO_ENABLE_HELP moo_help_set_id (GTK_WIDGET (page), HELP_SECTION_PREFS_FILE); +#endif } static void @@ -316,7 +326,9 @@ page_langs_init_ui (MooPrefsPage *page) PrefsLangsXml *gxml; gxml = prefs_langs_xml_new_with_root (GTK_WIDGET (page)); g_object_set_data (G_OBJECT (page), "moo-edit-prefs-page-xml", gxml); +#ifdef MOO_ENABLE_HELP moo_help_set_id (GTK_WIDGET (page), HELP_SECTION_PREFS_LANGS); +#endif } static void diff --git a/moo/mooedit/mooplugin.c b/moo/mooedit/mooplugin.c index 9144e677..e706f114 100644 --- a/moo/mooedit/mooplugin.c +++ b/moo/mooedit/mooplugin.c @@ -46,7 +46,9 @@ #include "mooutils/mooutils-debug.h" #include "mooutils/moohelp.h" #include "mooutils/mootype-macros.h" +#ifdef MOO_ENABLE_HELP #include "moo-help-sections.h" +#endif #include #include #include @@ -1429,7 +1431,9 @@ moo_plugin_attach_prefs (GtkWidget *dialog) g_signal_connect (page, "init", G_CALLBACK (prefs_page_init), gxml); g_signal_connect (page, "apply", G_CALLBACK (prefs_page_apply), gxml); +#ifdef MOO_ENABLE_HELP moo_help_set_id (GTK_WIDGET (page), HELP_SECTION_PREFS_PLUGINS); +#endif selection = gtk_tree_view_get_selection (gxml->treeview); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); diff --git a/moo/mooedit/mootextfind.c b/moo/mooedit/mootextfind.c index 20327c2c..47332347 100644 --- a/moo/mooedit/mootextfind.c +++ b/moo/mooedit/mootextfind.c @@ -27,7 +27,9 @@ #include "mooutils/moocompat.h" #include "mooedit/mootextfind-gxml.h" #include "mooedit/mootextgotoline-gxml.h" +#ifdef MOO_ENABLE_HELP #include "moo-help-sections.h" +#endif #include #include @@ -186,8 +188,10 @@ moo_find_constructor (GType type, -1); gtk_dialog_set_default_response (GTK_DIALOG (find), GTK_RESPONSE_OK); +#ifdef MOO_ENABLE_HELP moo_help_set_id (GTK_WIDGET (find), find->replace ? HELP_SECTION_DIALOG_REPLACE : HELP_SECTION_DIALOG_FIND); +#endif moo_help_connect_keys (GTK_WIDGET (find)); return object; diff --git a/moo/moofileview/moofileview.cmake b/moo/moofileview/moofileview.cmake new file mode 100644 index 00000000..644f8e58 --- /dev/null +++ b/moo/moofileview/moofileview.cmake @@ -0,0 +1,44 @@ +LIST(APPEND moo_sources + moofileview/moobookmarkmgr.c + moofileview/moobookmarkmgr.h + moofileview/moobookmarkview.c + moofileview/moobookmarkview.h + moofileview/moofile.c + moofileview/moofile.h + moofileview/moofile-private.h + moofileview/moofileentry.c + moofileview/moofileentry.h + moofileview/moofilesystem.c + moofileview/moofilesystem.h + moofileview/moofileview.c + moofileview/moofileview.h + moofileview/moofileview-accels.h + moofileview/moofileview-aux.h + moofileview/moofileview-dialogs.c + moofileview/moofileview-dialogs.h + moofileview/moofileview-impl.h + moofileview/moofileview-private.h + moofileview/moofileview-tools.c + moofileview/moofileview-tools.h + moofileview/moofolder-private.h + moofileview/moofolder.c + moofileview/moofolder.h + moofileview/moofoldermodel.c + moofileview/moofoldermodel.h + moofileview/moofoldermodel-private.h + moofileview/mooiconview.c + moofileview/mooiconview.h + moofileview/mootreeview.c + moofileview/mootreeview.h +) + +foreach(input_file + moofileview/glade/moofileview-drop.glade + moofileview/glade/moofileprops.glade + moofileview/glade/moocreatefolder.glade + moofileview/glade/moobookmark-editor.glade +) + ADD_GXML(${input_file}) +endforeach(input_file) + +ADD_UI(moofileview/moofileview.xml) diff --git a/moo/moolua/lua/lua.cmake b/moo/moolua/lua/lua.cmake new file mode 100644 index 00000000..c37d5622 --- /dev/null +++ b/moo/moolua/lua/lua.cmake @@ -0,0 +1,86 @@ +add_definitions(-DLUA_USE_APICHECK) + +if(MOO_OS_DARWIN) +add_definitions(-DLUA_USE_MACOSX) +elseif(MOO_OS_WIN32) +else(MOO_OS_DARWIN) +add_definitions(-DLUA_USE_POSIX -DLUA_USE_DLOPEN) +LIST(APPEND moo_libadd -ldl) +endif(MOO_OS_DARWIN) + +LIST(APPEND moo_sources + moolua/lua/lfs.h + moolua/lua/lfs.cpp + moolua/lua/moolua.h + moolua/lua/moolua.cpp + moolua/lua/luaall.cpp +) + +# EXTRA_DIST += \ +# moolua/lua/COPYRIGHT \ +# moolua/lua/lapi.c \ +# moolua/lua/lapi.h \ +# moolua/lua/lauxlib.c \ +# moolua/lua/lauxlib.h \ +# moolua/lua/lbaselib.c \ +# moolua/lua/lcode.c \ +# moolua/lua/lcode.h \ +# moolua/lua/ldblib.c \ +# moolua/lua/ldebug.c \ +# moolua/lua/ldebug.h \ +# moolua/lua/ldo.c \ +# moolua/lua/ldo.h \ +# moolua/lua/ldump.c \ +# moolua/lua/lfunc.c \ +# moolua/lua/lfunc.h \ +# moolua/lua/lgc.c \ +# moolua/lua/lgc.h \ +# moolua/lua/linit.c \ +# moolua/lua/liolib.c \ +# moolua/lua/llex.c \ +# moolua/lua/llex.h \ +# moolua/lua/llimits.h \ +# moolua/lua/lmathlib.c \ +# moolua/lua/lmem.c \ +# moolua/lua/lmem.h \ +# moolua/lua/loadlib.c \ +# moolua/lua/lobject.c \ +# moolua/lua/lobject.h \ +# moolua/lua/lopcodes.c \ +# moolua/lua/lopcodes.h \ +# moolua/lua/loslib.c \ +# moolua/lua/lparser.c \ +# moolua/lua/lparser.h \ +# moolua/lua/lstate.c \ +# moolua/lua/lstate.h \ +# moolua/lua/lstring.c \ +# moolua/lua/lstring.h \ +# moolua/lua/ltable.c \ +# moolua/lua/ltable.h \ +# moolua/lua/ltablib.c \ +# moolua/lua/ltm.c \ +# moolua/lua/ltm.h \ +# moolua/lua/lua.h \ +# moolua/lua/luaall.cpp \ +# moolua/lua/luaconf.h \ +# moolua/lua/lualib.h \ +# moolua/lua/lundump.c \ +# moolua/lua/lundump.h \ +# moolua/lua/lvm.c \ +# moolua/lua/lvm.h \ +# moolua/lua/lzio.c \ +# moolua/lua/lzio.h \ +# moolua/lua/README \ +# moolua/lua/slnudata.c \ +# moolua/lua/slnunico.c + +# zzz +# luadir = $(MOO_DATA_DIR)/lua +# EXTRA_DIST += moolua/lua/_moo +# install-data-local: install-lua-moo +# uninstall-local: uninstall-lua-moo +# install-lua-moo: +# $(MKDIR_P) $(DESTDIR)$(luadir)/_moo +# cd $(srcdir) && $(INSTALL_DATA) moolua/lua/_moo/*.lua $(DESTDIR)$(luadir)/_moo/ +# uninstall-lua-moo: +# rm -f $(DESTDIR)$(luadir)/_moo/*.lua diff --git a/moo/moolua/moolua.cmake b/moo/moolua/moolua.cmake new file mode 100644 index 00000000..b1bdb6a6 --- /dev/null +++ b/moo/moolua/moolua.cmake @@ -0,0 +1,45 @@ +LIST(APPEND moo_sources + moolua/medit-lua.h + moolua/medit-lua.cpp + moolua/mooluaplugin.cpp + moolua/moolua-tests.h + moolua/moolua-tests.cpp + moolua/moo-lua-api-util.h + moolua/moo-lua-api-util.cpp + moolua/moo-lua-api.cpp + moolua/moo-lua-api.h + moolua/gtk-lua-api.cpp + moolua/gtk-lua-api.h +) + +SET(genlua_files + ${CMAKE_SOURCE_DIR}/api/genlua.py + ${CMAKE_SOURCE_DIR}/api/mpi/__init__.py + ${CMAKE_SOURCE_DIR}/api/mpi/module.py + ${CMAKE_SOURCE_DIR}/api/mpi/luawriter.py +) + +include(moolua/lua/lua.cmake) + +XML2H(moolua/lua-default-init.lua moolua/lua-default-init.h LUA_DEFAULT_INIT) +XML2H(moolua/lua-module-init.lua moolua/lua-module-init.h LUA_MODULE_INIT) +XML2H(moolua/lua-plugin-init.lua moolua/lua-plugin-init.h LUA_PLUGIN_INIT) + +add_custom_command(OUTPUT moolua/moo-lua-api.cpp + COMMAND ${MOO_PYTHON} ${CMAKE_SOURCE_DIR}/api/genlua.py + --include-header moolua/moo-lua-api.h + --import ${CMAKE_SOURCE_DIR}/api/gtk.xml + --output moolua/moo-lua-api.cpp + ${CMAKE_SOURCE_DIR}/api/moo.xml + MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/api/moo.xml + DEPENDS ${genlua_files} ${CMAKE_SOURCE_DIR}/api/gtk.xml) +list(APPEND built_moo_sources moolua/moo-lua-api.cpp) + +add_custom_command(OUTPUT moolua/gtk-lua-api.cpp + COMMAND ${MOO_PYTHON} ${CMAKE_SOURCE_DIR}/api/genlua.py + --include-header moolua/gtk-lua-api.h + --output moolua/gtk-lua-api.cpp + ${CMAKE_SOURCE_DIR}/api/gtk.xml + MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/api/gtk.xml + DEPENDS ${genlua_files}) +list(APPEND built_moo_sources moolua/gtk-lua-api.cpp) diff --git a/moo/mooutils/mooaccelprefs.c b/moo/mooutils/mooaccelprefs.c index ef8dbf65..22fbcb63 100644 --- a/moo/mooutils/mooaccelprefs.c +++ b/moo/mooutils/mooaccelprefs.c @@ -27,7 +27,9 @@ #include "mooutils/moohelp.h" #include "mooutils/moocompat.h" #include "mooutils/mooaccelprefs-gxml.h" +#ifdef MOO_ENABLE_HELP #include "moo-help-sections.h" +#endif #include #include #include @@ -817,7 +819,9 @@ _moo_accel_prefs_dialog_new (MooActionCollection *collection) gtk_widget_show (GTK_WIDGET (page)); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), GTK_WIDGET (page), TRUE, TRUE, 0); +#ifdef MOO_ENABLE_HELP moo_help_set_id (dialog, HELP_SECTION_PREFS_ACCELS); +#endif moo_help_connect_keys (dialog); g_signal_connect_swapped (dialog, "response", diff --git a/moo/mooutils/moofileicon.c b/moo/mooutils/moofileicon.c index ac324f7b..85d218cc 100644 --- a/moo/mooutils/moofileicon.c +++ b/moo/mooutils/moofileicon.c @@ -19,7 +19,7 @@ #include "mooutils/mooutils-misc.h" #include "mooutils/mooutils-debug.h" #include "mooutils/moostock.h" -#include "moofileicon-symlink.h" +#include "moo-pixbufs.h" #include #include #include diff --git a/moo/mooutils/moopane.c b/moo/mooutils/moopane.c index 4d28fb96..ff72b12e 100644 --- a/moo/mooutils/moopane.c +++ b/moo/mooutils/moopane.c @@ -23,7 +23,7 @@ #include "marshals.h" #include "moopaned.h" -#include "stock-moo.h" +#include "moo-pixbufs.h" #include #include diff --git a/moo/mooutils/mooprefsdialog.c b/moo/mooutils/mooprefsdialog.c index 9ba5c3ce..cf0cfcef 100644 --- a/moo/mooutils/mooprefsdialog.c +++ b/moo/mooutils/mooprefsdialog.c @@ -24,7 +24,9 @@ #include "mooutils/moohelp.h" #include "mooutils/mooutils-treeview.h" #include "mooutils/moocompat.h" +#ifdef MOO_ENABLE_HELP #include "moo-help-sections.h" +#endif enum { @@ -554,7 +556,11 @@ moo_prefs_dialog_help (GtkWidget *widget) current_page = gtk_notebook_get_nth_page (dialog->notebook, index); if (!current_page || !moo_help_open (current_page)) + { +#ifdef MOO_ENABLE_HELP moo_help_open_id (HELP_SECTION_PREFS_DIALOG, widget); +#endif + } return TRUE; } diff --git a/moo/mooutils/moostock.c b/moo/mooutils/moostock.c index e5da2739..cef3fef7 100644 --- a/moo/mooutils/moostock.c +++ b/moo/mooutils/moostock.c @@ -17,7 +17,7 @@ #include "mooutils/stock-terminal-24.h" #include "mooutils/stock-file-selector-24.h" #include "mooutils/stock-file-24.h" -#include "stock-moo.h" +#include "moo-pixbufs.h" #include "mooutils/mooi18n.h" #include #include diff --git a/moo/mooutils/mooutils.cmake b/moo/mooutils/mooutils.cmake new file mode 100644 index 00000000..6a18e12f --- /dev/null +++ b/moo/mooutils/mooutils.cmake @@ -0,0 +1,238 @@ +SET(moo_utils_enum_headers + mooutils/moodialogs.h + mooutils/moofiledialog.h + mooutils/moouixml.h + mooutils/moowindow.h +) + +LIST(APPEND moo_sources + ${moo_utils_enum_headers} + mooutils/mooarray.h + mooutils/mooutils-thread.c + mooutils/mooutils-thread.h + mooutils/moohistorymgr.c + mooutils/moohistorymgr.h + mooutils/moo-environ.h + mooutils/mooaccel.c + mooutils/mooaccel.h + mooutils/mooaccelbutton.c + mooutils/mooaccelbutton.h + mooutils/mooaccelprefs.c + mooutils/mooaccelprefs.h + mooutils/mooaction-private.h + mooutils/mooaction.c + mooutils/mooaction.h + mooutils/mooactionbase-private.h + mooutils/mooactionbase.c + mooutils/mooactionbase.h + mooutils/mooactioncollection.c + mooutils/mooactioncollection.h + mooutils/mooactionfactory.c + mooutils/mooactionfactory.h + mooutils/mooactiongroup.c + mooutils/mooactiongroup.h + mooutils/mooapp-ipc.c + mooutils/mooapp-ipc.h + mooutils/mooappinput.c + mooutils/mooappinput.h + mooutils/mooatom.h + mooutils/moobigpaned.c + mooutils/moobigpaned.h + mooutils/mooclosure.c + mooutils/mooclosure.h + mooutils/moocombo.c + mooutils/moocombo.h + mooutils/moocompat.h + mooutils/moodialogs.c + mooutils/mooeditops.c + mooutils/mooeditops.h + mooutils/mooencodings-data.h + mooutils/mooencodings.c + mooutils/mooencodings.h + mooutils/mooentry.c + mooutils/mooentry.h + mooutils/moofiledialog.c + mooutils/moofileicon.c + mooutils/moofileicon.h + mooutils/moofilewatch.c + mooutils/moofilewatch.h + mooutils/moofilewriter.c + mooutils/moofilewriter.h + mooutils/moofilewriter-private.h + mooutils/moofiltermgr.c + mooutils/moofiltermgr.h + mooutils/moofontsel.c + mooutils/moofontsel.h + mooutils/mooglade.c + mooutils/mooglade.h + mooutils/moohelp.c + mooutils/moohelp.h + mooutils/moohistorycombo.c + mooutils/moohistorycombo.h + mooutils/moohistorylist.c + mooutils/moohistorylist.h + mooutils/mooi18n.c + mooutils/mooi18n.h + mooutils/moolist.h + mooutils/moomarkup.c + mooutils/moomarkup.h + mooutils/moomenu.c + mooutils/moomenu.h + mooutils/moomenuaction.c + mooutils/moomenuaction.h + mooutils/moomenumgr.c + mooutils/moomenumgr.h + mooutils/moomenutoolbutton.c + mooutils/moomenutoolbutton.h + mooutils/moo-mime.c + mooutils/moo-mime.h + mooutils/moonotebook.c + mooutils/moonotebook.h + mooutils/mooonce.h + mooutils/moopane.c + mooutils/moopane.h + mooutils/moopaned.c + mooutils/moopaned.h + mooutils/mooprefs.c + mooutils/mooprefs.h + mooutils/mooprefsdialog.c + mooutils/mooprefsdialog.h + mooutils/mooprefspage.c + mooutils/mooprefspage.h + mooutils/moospawn.c + mooutils/moospawn.h + mooutils/moostat.h + mooutils/moostock.c + mooutils/moostock.h + mooutils/mootype-macros.h + mooutils/moouixml.c + mooutils/mooundo.c + mooutils/mooundo.h + mooutils/mooutils.h + mooutils/mooutils-debug.h + mooutils/mooutils-enums.c + mooutils/mooutils-enums.h + mooutils/mooutils-file.c + mooutils/mooutils-file.h + mooutils/mooutils-fs.c + mooutils/mooutils-fs.h + mooutils/mooutils-gobject-private.h + mooutils/mooutils-gobject.c + mooutils/mooutils-gobject.h + mooutils/mooutils-macros.h + mooutils/mooutils-mem.h + mooutils/mooutils-messages.h + mooutils/mooutils-misc.c + mooutils/mooutils-misc.h + mooutils/mooutils-script.c + mooutils/mooutils-script.h + mooutils/mooutils-tests.h + mooutils/mooutils-treeview.c + mooutils/mooutils-treeview.h + mooutils/moowindow.c + mooutils/stock-file-24.h + mooutils/stock-file-selector-24.h + mooutils/stock-terminal-24.h +) + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/genmarshals_c.cmake +"FILE(WRITE marshals.c.tmp \"#include \\\"marshals.h\\\"\") +EXECUTE_PROCESS(COMMAND ${GLIB_GENMARSHAL} --prefix=_moo_marshal --body ${CMAKE_CURRENT_SOURCE_DIR}/marshals.list + OUTPUT_VARIABLE _marshals_body) +FILE(APPEND marshals.c.tmp \"\${_marshals_body}\") +file(RENAME marshals.c.tmp marshals.c) +") +add_custom_command(OUTPUT marshals.c + COMMAND ${CMAKE_COMMAND} -P genmarshals_c.cmake + MAIN_DEPENDENCY marshals.list) +LIST(APPEND built_moo_sources marshals.c) + + +# if MOO_DEV_MODE +# built_moo_sources += mooutils/mooutils-enums.h.stamp mooutils/mooutils-enums.c.stamp +# mooutils/mooutils-enums.h.stamp: $(moo_utils_enum_headers) Makefile mooutils/mooutils-enums.tmpl.h +# $(AM_V_at)$(MKDIR_P) mooutils +# $(AM_V_GEN)( cd $(srcdir) && \ +# $(GLIB_MKENUMS) --template mooutils/mooutils-enums.tmpl.h $(moo_utils_enum_headers) ) > mooutils/mooutils-enums.h.tmp +# $(AM_V_at)cmp -s mooutils/mooutils-enums.h.tmp $(srcdir)/mooutils/mooutils-enums.h || \ +# mv mooutils/mooutils-enums.h.tmp $(srcdir)/mooutils/mooutils-enums.h +# $(AM_V_at)rm -f mooutils/mooutils-enums.h.tmp +# $(AM_V_at)echo stamp > mooutils/mooutils-enums.h.stamp +# mooutils/mooutils-enums.c.stamp: $(moo_utils_enum_headers) Makefile mooutils/mooutils-enums.tmpl.c +# $(AM_V_at)$(MKDIR_P) mooutils +# $(AM_V_GEN)( cd $(srcdir) && \ +# $(GLIB_MKENUMS) --template mooutils/mooutils-enums.tmpl.c $(moo_utils_enum_headers) ) > mooutils/mooutils-enums.c.tmp +# $(AM_V_at)cmp -s mooutils/mooutils-enums.c.tmp $(srcdir)/mooutils/mooutils-enums.c || \ +# mv mooutils/mooutils-enums.c.tmp $(srcdir)/mooutils/mooutils-enums.c +# $(AM_V_at)rm -f mooutils/mooutils-enums.c.tmp +# $(AM_V_at)echo stamp > mooutils/mooutils-enums.c.stamp +# endif + +# mooutils_win32_sources = mooutils/mooutils-win32.c +SET(mooutils_unittest_sources + mooutils/moo-test-utils.c + mooutils/moo-test-utils.h + mooutils/moo-test-macros.h +) +# EXTRA_DIST += $(mooutils_win32_sources) $(mooutils_unittest_sources) + +# if MOO_OS_WIN32 +# moo_sources += $(mooutils_win32_sources) +# endif + +LIST(APPEND moo_sources ${mooutils_unittest_sources}) + +foreach(input_file + mooutils/glade/mooaccelprefs.glade + mooutils/glade/mooaccelbutton.glade + mooutils/glade/moologwindow.glade +) + ADD_GXML(${input_file}) +endforeach(input_file) + +SET(PIXMAPS + mooutils/pixmaps/hide.png + mooutils/pixmaps/close.png + mooutils/pixmaps/sticky.png + mooutils/pixmaps/detach.png + mooutils/pixmaps/attach.png + mooutils/pixmaps/keepontop.png + mooutils/pixmaps/medit.png +) + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/genpixbufs.cmake +"EXECUTE_PROCESS(COMMAND ${GDK_PIXBUF_CSOURCE} --static --build-list + MOO_HIDE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/mooutils/pixmaps/hide.png + MOO_CLOSE_ICON ${CMAKE_CURRENT_SOURCE_DIR}/mooutils/pixmaps/close.png + MOO_STICKY_ICON ${CMAKE_CURRENT_SOURCE_DIR}/mooutils/pixmaps/sticky.png + MOO_DETACH_ICON ${CMAKE_CURRENT_SOURCE_DIR}/mooutils/pixmaps/detach.png + MOO_ATTACH_ICON ${CMAKE_CURRENT_SOURCE_DIR}/mooutils/pixmaps/attach.png + MOO_KEEP_ON_TOP_ICON ${CMAKE_CURRENT_SOURCE_DIR}/mooutils/pixmaps/keepontop.png + MEDIT_ICON ${CMAKE_CURRENT_SOURCE_DIR}/mooutils/pixmaps/medit.png + SYMLINK_ARROW ${CMAKE_CURRENT_SOURCE_DIR}/mooutils/pixmaps/symlink.png + SYMLINK_ARROW_SMALL ${CMAKE_CURRENT_SOURCE_DIR}/mooutils/pixmaps/symlink-small.png + OUTPUT_FILE moo-pixbufs.h.tmp) +file(RENAME moo-pixbufs.h.tmp moo-pixbufs.h) +") +add_custom_command(OUTPUT moo-pixbufs.h + COMMAND ${CMAKE_COMMAND} -P genpixbufs.cmake + DEPENDS ) +LIST(APPEND built_moo_sources moo-pixbufs.h) + +# built_moo_sources += stock-moo.h moofileicon-symlink.h +# EXTRA_DIST += $(PIXMAPS) +# stock-moo.h: $(PIXMAPS) +# $(AM_V_GEN)$(GDK_PIXBUF_CSOURCE) --static --build-list \ +# MOO_HIDE_ICON $(moo_srcdir)/mooutils/pixmaps/hide.png \ +# MOO_CLOSE_ICON $(moo_srcdir)/mooutils/pixmaps/close.png \ +# MOO_STICKY_ICON $(moo_srcdir)/mooutils/pixmaps/sticky.png \ +# MOO_DETACH_ICON $(moo_srcdir)/mooutils/pixmaps/detach.png \ +# MOO_ATTACH_ICON $(moo_srcdir)/mooutils/pixmaps/attach.png \ +# MOO_KEEP_ON_TOP_ICON $(moo_srcdir)/mooutils/pixmaps/keepontop.png \ +# MEDIT_ICON $(moo_srcdir)/mooutils/pixmaps/medit.png \ +# > $@.tmp && mv $@.tmp $@ +# +# EXTRA_DIST += mooutils/pixmaps/symlink.png mooutils/pixmaps/symlink-small.png +# moofileicon-symlink.h: mooutils/pixmaps/symlink.png mooutils/pixmaps/symlink-small.png +# $(AM_V_GEN)$(GDK_PIXBUF_CSOURCE) --static --build-list \ +# > $@.tmp && mv $@.tmp $@ diff --git a/moo/plugins/moofileselector-prefs.c b/moo/plugins/moofileselector-prefs.c index 3573aafb..751e941f 100644 --- a/moo/plugins/moofileselector-prefs.c +++ b/moo/plugins/moofileselector-prefs.c @@ -20,7 +20,9 @@ #include "mooutils/mooi18n.h" #include "mooutils/moostock.h" #include "mooutils/moohelp.h" +#ifdef MOO_ENABLE_HELP #include "moo-help-sections.h" +#endif #include "plugins/moofileselector-prefs-gxml.h" #include #include @@ -74,7 +76,9 @@ _moo_file_selector_prefs_page (MooPlugin *plugin) g_signal_connect_swapped (page, "apply", G_CALLBACK (prefs_page_apply), gxml); g_signal_connect_swapped (page, "init", G_CALLBACK (prefs_page_init), gxml); +#ifdef MOO_ENABLE_HELP moo_help_set_id (page, HELP_SECTION_PREFS_FILE_SELECTOR); +#endif column = gtk_tree_view_column_new (); gtk_tree_view_append_column (gxml->treeview, column); diff --git a/moo/plugins/moofileselector.c b/moo/plugins/moofileselector.c index b7095537..3a00a704 100644 --- a/moo/plugins/moofileselector.c +++ b/moo/plugins/moofileselector.c @@ -39,7 +39,9 @@ #include "plugins/moofileselector-gxml.h" #include "mooutils/moohelp.h" #include "mooutils/mooatom.h" +#ifdef MOO_ENABLE_HELP #include "moo-help-sections.h" +#endif #include #include #include @@ -175,7 +177,9 @@ _moo_file_selector_init (MooFileSelector *filesel) _moo_file_view_add_target (MOO_FILE_VIEW (filesel), MOO_EDIT_TAB_ATOM, GTK_TARGET_SAME_APP, TARGET_MOO_EDIT_TAB); +#ifdef MOO_ENABLE_HELP moo_help_set_id (GTK_WIDGET (filesel), HELP_SECTION_FILE_SELECTOR); +#endif moo_help_connect_keys (GTK_WIDGET (filesel)); } diff --git a/moo/plugins/moofind.c b/moo/plugins/moofind.c index f580138a..e4f7f4b8 100644 --- a/moo/plugins/moofind.c +++ b/moo/plugins/moofind.c @@ -21,7 +21,7 @@ #include "mooedit/mooedit-script.h" #include "plugins/mooplugin-builtin.h" #include "moofileview/moofileentry.h" -#include "moocmdview.h" +#include "support/moocmdview.h" #include "mooedit/mooedit-accels.h" #include "mooedit/mootextbuffer.h" #include "mooutils/moostock.h" @@ -33,7 +33,9 @@ #include "mooutils/mooutils-misc.h" #include "plugins/moofind-gxml.h" #include "plugins/moogrep-gxml.h" +#ifdef MOO_ENABLE_HELP #include "moo-help-sections.h" +#endif #include #include #ifndef __WIN32__ @@ -371,7 +373,9 @@ create_grep_dialog (MooEditWindow *window, GTK_RESPONSE_CANCEL, -1); +#ifdef MOO_ENABLE_HELP moo_help_set_id (stuff->grep_dialog, HELP_SECTION_DIALOG_FIND_IN_FILES); +#endif moo_help_connect_keys (stuff->grep_dialog); g_signal_connect (stuff->grep_dialog, "delete-event", @@ -413,7 +417,9 @@ create_find_dialog (MooEditWindow *window, -1); moo_window_set_parent (stuff->find_dialog, GTK_WIDGET (window)); +#ifdef MOO_ENABLE_HELP moo_help_set_id (stuff->find_dialog, HELP_SECTION_DIALOG_FIND_FILE); +#endif moo_help_connect_keys (stuff->find_dialog); g_signal_connect (stuff->find_dialog, "delete-event", diff --git a/moo/plugins/plugins.cmake b/moo/plugins/plugins.cmake new file mode 100644 index 00000000..a843c5ca --- /dev/null +++ b/moo/plugins/plugins.cmake @@ -0,0 +1,22 @@ +SET(plugins_sources + plugins/moofileselector-prefs.c + plugins/moofileselector.c + plugins/moofileselector.h + plugins/mooplugin-builtin.h + plugins/mooplugin-builtin.c + plugins/moofilelist.c + plugins/moofind.c +) + +foreach(input_file + plugins/glade/moofileselector-prefs.glade + plugins/glade/moofileselector.glade + plugins/glade/moofind.glade + plugins/glade/moogrep.glade +) + ADD_GXML(${input_file}) +endforeach(input_file) + +# zzz include plugins/ctags/Makefile.incl +include(${CMAKE_CURRENT_SOURCE_DIR}/plugins/usertools/usertools.cmake) +include(${CMAKE_CURRENT_SOURCE_DIR}/plugins/support/support.cmake) diff --git a/moo/plugins/support/support.cmake b/moo/plugins/support/support.cmake new file mode 100644 index 00000000..b21ae65c --- /dev/null +++ b/moo/plugins/support/support.cmake @@ -0,0 +1,10 @@ +LIST(APPEND plugins_sources + plugins/support/moocmdview.h + plugins/support/moocmdview.c + plugins/support/mooeditwindowoutput.h + plugins/support/mooeditwindowoutput.c + plugins/support/moolineview.c + plugins/support/moolineview.h + plugins/support/moooutputfilter.c + plugins/support/moooutputfilter.h +) diff --git a/moo/plugins/usertools/moocommand-exe.c b/moo/plugins/usertools/moocommand-exe.c index 8e7a7b40..35784f2c 100644 --- a/moo/plugins/usertools/moocommand-exe.c +++ b/moo/plugins/usertools/moocommand-exe.c @@ -19,8 +19,8 @@ #include "moocommand-exe.h" #include "mooedit/mooeditor.h" #include "mooedit/mooedit-script.h" -#include "moocmdview.h" -#include "mooeditwindowoutput.h" +#include "../support/moocmdview.h" +#include "../support/mooeditwindowoutput.h" #include "mooutils/mooi18n.h" #include "mooutils/mooutils-fs.h" #include "mooutils/mooutils-misc.h" diff --git a/moo/plugins/usertools/moocommand.h b/moo/plugins/usertools/moocommand.h index 2727b84b..04bd8daa 100644 --- a/moo/plugins/usertools/moocommand.h +++ b/moo/plugins/usertools/moocommand.h @@ -17,7 +17,7 @@ #define MOO_COMMAND_H #include -#include "moooutputfilter.h" +#include "../support/moooutputfilter.h" #include "moousertools-enums.h" G_BEGIN_DECLS diff --git a/moo/plugins/usertools/moooutputfilterregex.c b/moo/plugins/usertools/moooutputfilterregex.c index 0eb59c16..235ddf84 100644 --- a/moo/plugins/usertools/moooutputfilterregex.c +++ b/moo/plugins/usertools/moooutputfilterregex.c @@ -15,7 +15,7 @@ #include "moooutputfilterregex.h" #include "moocommand.h" -#include "moocmdview.h" +#include "../support/moocmdview.h" #include "mooedit/mooeditprefs.h" #include "mooedit/moolangmgr.h" #include "mooutils/mooutils-gobject.h" diff --git a/moo/plugins/usertools/moooutputfilterregex.h b/moo/plugins/usertools/moooutputfilterregex.h index 687c5823..43f163b7 100644 --- a/moo/plugins/usertools/moooutputfilterregex.h +++ b/moo/plugins/usertools/moooutputfilterregex.h @@ -16,7 +16,7 @@ #ifndef MOO_OUTPUT_FILTER_REGEX_H #define MOO_OUTPUT_FILTER_REGEX_H -#include "moooutputfilter.h" +#include "../support/moooutputfilter.h" G_BEGIN_DECLS diff --git a/moo/plugins/usertools/moousertools-prefs.c b/moo/plugins/usertools/moousertools-prefs.c index 758c447d..cd5606df 100644 --- a/moo/plugins/usertools/moousertools-prefs.c +++ b/moo/plugins/usertools/moousertools-prefs.c @@ -23,7 +23,9 @@ #include "mooutils/mooutils.h" #include "mooutils/moohelp.h" #include "plugins/usertools/moousertools-gxml.h" +#ifdef MOO_ENABLE_HELP #include "moo-help-sections.h" +#endif #include enum { @@ -561,7 +563,9 @@ moo_user_tools_prefs_page_new (void) g_signal_connect_swapped (page, "init", G_CALLBACK (main_page_init), gxml); g_signal_connect_swapped (page, "apply", G_CALLBACK (main_page_apply), gxml); +#ifdef MOO_ENABLE_HELP moo_help_set_id (page, HELP_SECTION_PREFS_USER_TOOLS); +#endif cxml = command_xml_new_with_root (GTK_WIDGET (gxml->page_menu)); g_object_set_data (G_OBJECT (gxml->page_menu), "moo-user-tools-prefs-xml", cxml); diff --git a/moo/plugins/usertools/usertools.cmake b/moo/plugins/usertools/usertools.cmake new file mode 100644 index 00000000..88979b09 --- /dev/null +++ b/moo/plugins/usertools/usertools.cmake @@ -0,0 +1,69 @@ +LIST(APPEND plugins_sources + plugins/usertools/moousertools.c + plugins/usertools/moousertools.h + plugins/usertools/moousertools-prefs.c + plugins/usertools/moousertools-prefs.h + plugins/usertools/moocommand.c + plugins/usertools/moocommand.h + plugins/usertools/moocommand-private.h + plugins/usertools/moocommanddisplay.c + plugins/usertools/moocommanddisplay.h + plugins/usertools/moooutputfilterregex.c + plugins/usertools/moooutputfilterregex.h + plugins/usertools/moousertools-enums.h + plugins/usertools/moousertools-enums.c + plugins/usertools/moocommand-exe.c + plugins/usertools/moocommand-exe.h + plugins/usertools/moocommand-script.cpp + plugins/usertools/moocommand-script.h +) + +foreach(input_file + plugins/usertools/glade/mooedittools-exe.glade + plugins/usertools/glade/mooedittools-script.glade + plugins/usertools/glade/moousertools.glade +) + ADD_GXML(${input_file}) +endforeach(input_file) + +XML2H(plugins/usertools/lua-tool-setup.lua plugins/usertools/lua-tool-setup.h LUA_TOOL_SETUP_LUA) + +# EXTRA_DIST += \ +# plugins/usertools/python-tool-setup.py +# if MOO_ENABLE_PYTHON +# built_plugins_sources += plugins/usertools/python-tool-setup.h +# plugins/usertools/python-tool-setup.h: plugins/usertools/python-tool-setup.py $(top_srcdir)/tools/xml2h.py +# $(AM_V_at)$(MKDIR_P) plugins/usertools +# $(AM_V_GEN)$(MOO_PYTHON) $(top_srcdir)/tools/xml2h.py $(srcdir)/plugins/usertools/python-tool-setup.py \ +# plugins/usertools/python-tool-setup.h.tmp PYTHON_TOOL_SETUP_PY \ +# && mv plugins/usertools/python-tool-setup.h.tmp plugins/usertools/python-tool-setup.h +# endif + +# cfgdir = $(MOO_DATA_DIR) +# cfg_DATA = \ +# plugins/usertools/filters.xml \ +# plugins/usertools/menu.xml \ +# plugins/usertools/context.xml +# EXTRA_DIST += \ +# plugins/usertools/filters.xml \ +# plugins/usertools/menu-tmpl.xml \ +# plugins/usertools/context-tmpl.xml \ +# plugins/usertools/genplatxml.py +# +# genplatxml_args = +# +# if MOO_OS_WIN32 +# genplatxml_args += --enable=win32 +# else !MOO_OS_WIN32 +# genplatxml_args += --enable=unix +# endif !MOO_OS_WIN32 +# +# if MOO_ENABLE_PYTHON +# genplatxml_args += --enable=python +# endif +# +# built_plugins_sources += plugins/usertools/menu.xml plugins/usertools/context.xml +# plugins/usertools/%.xml: plugins/usertools/%-tmpl.xml plugins/usertools/genplatxml.py +# $(AM_V_at)$(MKDIR_P) plugins/usertools +# $(AM_V_GEN)$(MOO_PYTHON) $(srcdir)/plugins/usertools/genplatxml.py $(genplatxml_args) \ +# $(srcdir)/plugins/usertools/$*-tmpl.xml > $@.tmp && mv $@.tmp $@ diff --git a/moo/xdgmime/xdgmime.cmake b/moo/xdgmime/xdgmime.cmake new file mode 100644 index 00000000..bf786cf9 --- /dev/null +++ b/moo/xdgmime/xdgmime.cmake @@ -0,0 +1,17 @@ +LIST(APPEND moo_sources + xdgmime/xdgmimealias.c + xdgmime/xdgmimealias.h + xdgmime/xdgmime.c + xdgmime/xdgmimecache.c + xdgmime/xdgmimecache.h + xdgmime/xdgmimeglob.c + xdgmime/xdgmimeglob.h + xdgmime/xdgmime.h + xdgmime/xdgmimeint.h + xdgmime/xdgmimeicon.c + xdgmime/xdgmimeicon.h + xdgmime/xdgmimemagic.c + xdgmime/xdgmimemagic.h + xdgmime/xdgmimeparent.c + xdgmime/xdgmimeparent.h +)