nyje/medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset 392a85b7b5f6

Browse Source
This commit is contained in:
Yevgen Muntyan 2017-05-25 12:49:27 -07:00
parent 8116a47e51
commit bcf65346b5
26 changed files with 44 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -223,7 +223,7 @@ add_subdirectory(api)
#add_subdirectory(po) #add_subdirectory(po)
#add_subdirectory(po-gsv) #add_subdirectory(po-gsv)
set(MOO_USE_SCI FALSE CACHE BOOL "Use Scintilla") set(MOO_USE_SCI TRUE CACHE BOOL "Use Scintilla")
if(MOO_USE_SCI) if(MOO_USE_SCI)
add_definitions(-DMOO_USE_SCI=1) add_definitions(-DMOO_USE_SCI=1)
add_subdirectory(scintilla) add_subdirectory(scintilla)

16
api/CMakeLists.txt
View File

@ -94,12 +94,12 @@ SET(source_files
../moo/mooedit/moofold.h ../moo/mooedit/moofold.h
../moo/mooedit/mooindenter.c ../moo/mooedit/mooindenter.c
../moo/mooedit/mooindenter.h ../moo/mooedit/mooindenter.h
../moo/mooedit/native/moolang.c ../moo/mooedit/moolang.c
../moo/mooedit/native/moolang.h ../moo/mooedit/moolang.h
../moo/mooedit/native/moolangmgr.c ../moo/mooedit/moolangmgr.c
../moo/mooedit/native/moolangmgr.h ../moo/mooedit/moolangmgr.h
../moo/mooedit/native/moolangmgr-private.h ../moo/mooedit/moolangmgr-private.h
../moo/mooedit/native/moolang-private.h ../moo/mooedit/moolang-private.h
../moo/mooedit/moolinebuffer.c ../moo/mooedit/moolinebuffer.c
../moo/mooedit/moolinebuffer.h ../moo/mooedit/moolinebuffer.h
../moo/mooedit/moolinemark.c ../moo/mooedit/moolinemark.c
@ -122,8 +122,8 @@ SET(source_files
../moo/mooedit/mootextsearch.c ../moo/mooedit/mootextsearch.c
../moo/mooedit/mootextsearch.h ../moo/mooedit/mootextsearch.h
../moo/mooedit/mootextsearch-private.h ../moo/mooedit/mootextsearch-private.h
../moo/mooedit/native/mootextstylescheme.c ../moo/mooedit/mootextstylescheme.c
../moo/mooedit/native/mootextstylescheme.h ../moo/mooedit/mootextstylescheme.h
../moo/mooedit/mootextview.c ../moo/mooedit/mootextview.c
../moo/mooedit/mootextview.h ../moo/mooedit/mootextview.h
../moo/mooedit/mootextview-input.c ../moo/mooedit/mootextview-input.c

2
moo/CMakeLists.txt
View File

@ -57,9 +57,7 @@ include(moocpp/moocpp.cmake)
include(mooutils/mooutils.cmake) include(mooutils/mooutils.cmake)
include(mooedit/mooedit.cmake) include(mooedit/mooedit.cmake)
include(moofileview/moofileview.cmake) include(moofileview/moofileview.cmake)
if(NOT MOO_USE_SCI)
include(gtksourceview/gtksourceview.cmake) include(gtksourceview/gtksourceview.cmake)
endif()
if(NOT MOO_OS_WIN32) if(NOT MOO_OS_WIN32)
include(eggsmclient/eggsmclient.cmake) include(eggsmclient/eggsmclient.cmake)
endif() endif()

28
moo/mooedit/mooedit.cmake
View File

@ -1,19 +1,5 @@
LIST(APPEND moo_edit_enum_headers mooedit/mooedit-enums.h) LIST(APPEND moo_edit_enum_headers mooedit/mooedit-enums.h)
SET(mooedit_gtksourceview_sources
mooedit/native/moolang-private.h
mooedit/native/moolang.cpp
mooedit/native/moolang.h
mooedit/native/moolangmgr-private.h
mooedit/native/moolangmgr.cpp
mooedit/native/moolangmgr.h
mooedit/native/mootextstylescheme.c
mooedit/native/mootextstylescheme.h
)
SET(mooedit_sci_sources
)
SET(mooedit_sources SET(mooedit_sources
mooedit/mooedit.cmake mooedit/mooedit.cmake
${moo_edit_enum_headers} ${moo_edit_enum_headers}
@ -75,6 +61,12 @@ SET(mooedit_sources
mooedit/moofold.h mooedit/moofold.h
mooedit/mooindenter.cpp mooedit/mooindenter.cpp
mooedit/mooindenter.h mooedit/mooindenter.h
mooedit/moolang-private.h
mooedit/moolang.cpp
mooedit/moolang.h
mooedit/moolangmgr-private.h
mooedit/moolangmgr.cpp
mooedit/moolangmgr.h
mooedit/moolinebuffer.c mooedit/moolinebuffer.c
mooedit/moolinebuffer.h mooedit/moolinebuffer.h
mooedit/moolinemark.c mooedit/moolinemark.c
@ -98,18 +90,14 @@ SET(mooedit_sources
mooedit/mootextsearch-private.h mooedit/mootextsearch-private.h
mooedit/mootextsearch.c mooedit/mootextsearch.c
mooedit/mootextsearch.h mooedit/mootextsearch.h
mooedit/mootextstylescheme.c
mooedit/mootextstylescheme.h
mooedit/mootextview-input.c mooedit/mootextview-input.c
mooedit/mootextview-private.h mooedit/mootextview-private.h
mooedit/mootextview.c mooedit/mootextview.c
mooedit/mootextview.h mooedit/mootextview.h
) )
if(MOO_USE_SCI)
list(APPEND mooedit_sources ${mooedit_sci_sources})
else()
list(APPEND mooedit_sources ${mooedit_gtksourceview_sources})
endif()
# SET(built_mooedit_sources mooedit/mooedit-enum-types.h.stamp mooedit/mooedit-enum-types.c.stamp) # SET(built_mooedit_sources mooedit/mooedit-enum-types.h.stamp mooedit/mooedit-enum-types.c.stamp)
# add_custom_command(OUTPUT mooedit/mooedit-enum-types.h.stamp # add_custom_command(OUTPUT mooedit/mooedit-enum-types.h.stamp

4
moo/mooedit/mooedit.cpp
View File

@ -46,9 +46,7 @@
#include "mooedit/mooeditor-impl.h" #include "mooedit/mooeditor-impl.h"
#include "mooedit/mooedittab-impl.h" #include "mooedit/mooedittab-impl.h"
#include "mooedit/mooeditwindow-impl.h" #include "mooedit/mooeditwindow-impl.h"
#ifndef MOO_USE_SCI #include "mooedit/moolangmgr.h"
#include "mooedit/native/moolangmgr.h"
#endif // !MOO_USE_SCI
#include "marshals.h" #include "marshals.h"
#include "mooutils/mooutils-fs.h" #include "mooutils/mooutils-fs.h"
#include "mooutils/mooi18n.h" #include "mooutils/mooi18n.h"

4
moo/mooedit/mooeditconfig.cpp
View File

@ -14,9 +14,7 @@
*/ */
#include "mooedit/mooeditconfig.h" #include "mooedit/mooeditconfig.h"
#ifndef MOO_USE_SCI #include "mooedit/moolang.h"
#include "mooedit/native/moolang.h"
#endif // !MOO_USE_SCI
#include "mooedit/mooeditprefs.h" #include "mooedit/mooeditprefs.h"
#include "mooutils/mooutils-gobject.h" #include "mooutils/mooutils-gobject.h"
#include "mooutils/mooutils-debug.h" #include "mooutils/mooutils-debug.h"

4
moo/mooedit/mooeditfiltersettings.cpp
View File

@ -16,9 +16,7 @@
#include "mooedit/mooeditfiltersettings.h" #include "mooedit/mooeditfiltersettings.h"
#include "mooedit/mooeditprefs.h" #include "mooedit/mooeditprefs.h"
#include "mooedit/mooeditaction.h" #include "mooedit/mooeditaction.h"
#ifndef MOO_USE_SCI #include "mooedit/moolang.h"
#include "mooedit/native/moolang.h"
#endif // !MOO_USE_SCI
#include "mooedit/mooeditconfig.h" #include "mooedit/mooeditconfig.h"
#include "mooedit/mooedit.h" #include "mooedit/mooedit.h"
#include "mooutils/mooprefs.h" #include "mooutils/mooprefs.h"

4
moo/mooedit/mooeditor-private.h
View File

@ -17,9 +17,7 @@
#define MOO_EDITOR_PRIVATE_H #define MOO_EDITOR_PRIVATE_H
#include "mooedit/mooeditor-impl.h" #include "mooedit/mooeditor-impl.h"
#ifndef MOO_USE_SCI #include "mooedit/moolangmgr.h"
#include "mooedit/native/moolangmgr.h"
#endif // !MOO_USE_SCI
G_BEGIN_DECLS G_BEGIN_DECLS

4
moo/mooedit/mooeditprefs.cpp
View File

@ -20,9 +20,7 @@
#include "mooedit/mootextview-private.h" #include "mooedit/mootextview-private.h"
#include "mooedit/mooedit-enums.h" #include "mooedit/mooedit-enums.h"
#include "mooedit/mootextbuffer.h" #include "mooedit/mootextbuffer.h"
#ifndef MOO_USE_SCI #include "mooedit/moolangmgr.h"
#include "mooedit/native/moolangmgr.h"
#endif // !MOO_USE_SCI
#include "mooutils/mooencodings.h" #include "mooutils/mooencodings.h"
#include "mooutils/mooi18n.h" #include "mooutils/mooi18n.h"
#include <string.h> #include <string.h>

4
moo/mooedit/mooeditprefspage.cpp
View File

@ -16,9 +16,7 @@
#include "mooedit/mooedit-impl.h" #include "mooedit/mooedit-impl.h"
#include "mooedit/mooeditor-impl.h" #include "mooedit/mooeditor-impl.h"
#include "mooedit/mooeditprefs.h" #include "mooedit/mooeditprefs.h"
#ifndef MOO_USE_SCI #include "mooedit/moolangmgr.h"
#include "mooedit/native/moolangmgr.h"
#endif // !MOO_USE_SCI
#include "mooedit/mooeditfiltersettings.h" #include "mooedit/mooeditfiltersettings.h"
#include "mooutils/mooprefsdialog.h" #include "mooutils/mooprefsdialog.h"
#include "mooutils/moostock.h" #include "mooutils/moostock.h"

5
moo/mooedit/mooeditwindow.cpp
View File

@ -29,14 +29,13 @@
#include "mooedit/mooeditview-impl.h" #include "mooedit/mooeditview-impl.h"
#include "mooedit/mooedittab-impl.h" #include "mooedit/mooedittab-impl.h"
#include "mooedit/mooeditfiltersettings.h" #include "mooedit/mooeditfiltersettings.h"
#ifndef MOO_USE_SCI #include "mooedit/moolang.h"
#include "mooedit/native/moolangmgr.h"
#endif // !MOO_USE_SCI
#include "mooedit/mootextbuffer.h" #include "mooedit/mootextbuffer.h"
#include "mooedit/mooeditprefs.h" #include "mooedit/mooeditprefs.h"
#include "mooedit/mooplugin.h" #include "mooedit/mooplugin.h"
#include "mooedit/mooeditaction.h" #include "mooedit/mooeditaction.h"
#include "mooedit/mooeditbookmark.h" #include "mooedit/mooeditbookmark.h"
#include "mooedit/moolangmgr.h"
#include "mooutils/moonotebook.h" #include "mooutils/moonotebook.h"
#include "mooutils/moostock.h" #include "mooutils/moostock.h"
#include "marshals.h" #include "marshals.h"

6
moo/mooedit/native/moolang-private.h → moo/mooedit/moolang-private.h
View File

@ -17,10 +17,8 @@
#define MOO_LANG_PRIVATE_H #define MOO_LANG_PRIVATE_H
#include "gtksourceview/gtksourceview-api.h" #include "gtksourceview/gtksourceview-api.h"
#ifndef MOO_USE_SCI #include "mooedit/moolang.h"
#include "mooedit/native/moolang.h" #include "mooedit/moolangmgr.h"
#include "mooedit/native/moolangmgr.h"
#endif // !MOO_USE_SCI
#include "mooedit/mooeditconfig.h" #include "mooedit/mooeditconfig.h"
G_BEGIN_DECLS G_BEGIN_DECLS

4
moo/mooedit/native/moolang.cpp → moo/mooedit/moolang.cpp
View File

@ -16,9 +16,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#ifndef MOO_USE_SCI #include "mooedit/moolang-private.h"
#include "mooedit/native/moolang-private.h"
#endif // !MOO_USE_SCI
#include "mooutils/mooi18n.h" #include "mooutils/mooi18n.h"
#include <mooglib/moo-glib.h> #include <mooglib/moo-glib.h>
#include <sys/stat.h> #include <sys/stat.h>

0
moo/mooedit/native/moolang.h → moo/mooedit/moolang.h
View File

4
moo/mooedit/native/moolangmgr-private.h → moo/mooedit/moolangmgr-private.h
View File

@ -16,9 +16,7 @@
#ifndef MOO_LANG_MGR_PRIVATE_H #ifndef MOO_LANG_MGR_PRIVATE_H
#define MOO_LANG_MGR_PRIVATE_H #define MOO_LANG_MGR_PRIVATE_H
#ifndef MOO_USE_SCI #include "mooedit/moolangmgr.h"
#include "mooedit/native/moolangmgr.h"
#endif // !MOO_USE_SCI
#include "mooedit/mooeditconfig.h" #include "mooedit/mooeditconfig.h"
#include "gtksourceview/gtksourceview-api.h" #include "gtksourceview/gtksourceview-api.h"

6
moo/mooedit/native/moolangmgr.cpp → moo/mooedit/moolangmgr.cpp
View File

@ -16,10 +16,8 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#ifndef MOO_USE_SCI #include "mooedit/moolangmgr-private.h"
#include "mooedit/native/moolang-private.h" #include "mooedit/moolang-private.h"
#include "mooedit/native/moolangmgr-private.h"
#endif // !MOO_USE_SCI
#include "mooedit/mooeditprefs.h" #include "mooedit/mooeditprefs.h"
#include "mooutils/mooutils-misc.h" #include "mooutils/mooutils-misc.h"
#include "mooutils/mooutils-fs.h" #include "mooutils/mooutils-fs.h"

6
moo/mooedit/native/moolangmgr.h → moo/mooedit/moolangmgr.h
View File

@ -16,10 +16,8 @@
#ifndef MOO_LANG_MGR_H #ifndef MOO_LANG_MGR_H
#define MOO_LANG_MGR_H #define MOO_LANG_MGR_H
#ifndef MOO_USE_SCI #include <mooedit/moolang.h>
#include "mooedit/native/moolang.h" #include <mooedit/mootextstylescheme.h>
#include <mooedit/native/mootextstylescheme.h>
#endif // !MOO_USE_SCI
#include <mooedit/mooeditconfig.h> #include <mooedit/mooeditconfig.h>
G_BEGIN_DECLS G_BEGIN_DECLS

4
moo/mooedit/mootext-private.h
View File

@ -18,9 +18,7 @@
#include "mooedit/moofold.h" #include "mooedit/moofold.h"
#include "mooedit/moolinebuffer.h" #include "mooedit/moolinebuffer.h"
#ifndef MOO_USE_SCI #include "mooedit/mootextstylescheme.h"
#include <mooedit/native/mootextstylescheme.h>
#endif // !MOO_USE_SCI
G_BEGIN_DECLS G_BEGIN_DECLS

6
moo/mooedit/mootextbuffer.c
View File

@ -19,10 +19,8 @@
#include "mooedit/mootextiter.h" #include "mooedit/mootextiter.h"
#include "mooedit/mootext-private.h" #include "mooedit/mootext-private.h"
#ifndef MOO_USE_SCI #include "mooedit/moolang-private.h"
#include "mooedit/native/moolang-private.h" #include "mooedit/mootextstylescheme.h"
#include <mooedit/native/mootextstylescheme.h>
#endif // !MOO_USE_SCI
#include "marshals.h" #include "marshals.h"
#include "mooutils/mooundo.h" #include "mooutils/mooundo.h"
#include "mooutils/mooutils-gobject.h" #include "mooutils/mooutils-gobject.h"

4
moo/mooedit/mootextbuffer.h
View File

@ -17,9 +17,7 @@
#define MOO_TEXT_BUFFER_H #define MOO_TEXT_BUFFER_H
#include <gtk/gtk.h> #include <gtk/gtk.h>
#ifndef MOO_USE_SCI #include <mooedit/moolang.h>
#include "mooedit/native/moolang.h"
#endif // !MOO_USE_SCI
#include <mooedit/moolinemark.h> #include <mooedit/moolinemark.h>
G_BEGIN_DECLS G_BEGIN_DECLS

4
moo/mooedit/native/mootextstylescheme.c → moo/mooedit/mootextstylescheme.c
View File

@ -13,9 +13,7 @@
* License along with medit. If not, see <http://www.gnu.org/licenses/>. * License along with medit. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef MOO_USE_SCI #include "mooedit/mootextstylescheme.h"
#include <mooedit/native/mootextstylescheme.h>
#endif // !MOO_USE_SCI
#include "mooedit/mootextview.h" #include "mooedit/mootextview.h"
#include "mooutils/mooi18n.h" #include "mooutils/mooi18n.h"
#include "gtksourceview/gtksourceview-api.h" #include "gtksourceview/gtksourceview-api.h"

0
moo/mooedit/native/mootextstylescheme.h → moo/mooedit/mootextstylescheme.h
View File

4
moo/mooedit/mootextview.c
View File

@ -24,9 +24,7 @@
#include "mooedit/mootextfind.h" #include "mooedit/mootextfind.h"
#include "mooedit/mootext-private.h" #include "mooedit/mootext-private.h"
#include "mooedit/mooeditprefs.h" #include "mooedit/mooeditprefs.h"
#ifndef MOO_USE_SCI #include "mooedit/moolangmgr.h"
#include "mooedit/native/moolangmgr.h"
#endif // !MOO_USE_SCI
#include "mooedit/mooeditwindow.h" #include "mooedit/mooeditwindow.h"
#include "mooedit/mooedit.h" #include "mooedit/mooedit.h"
#include "marshals.h" #include "marshals.h"

6
moo/mooedit/mootextview.h
View File

@ -17,11 +17,9 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <mooedit/mooindenter.h> #include <mooedit/mooindenter.h>
#ifndef MOO_USE_SCI #include <mooedit/moolang.h>
#include "mooedit/native/moolangmgr.h"
#include <mooedit/native/mootextstylescheme.h>
#endif // !MOO_USE_SCI
#include <mooedit/mootextsearch.h> #include <mooedit/mootextsearch.h>
#include <mooedit/mootextstylescheme.h>
#include <mooedit/mooedit-enums.h> #include <mooedit/mooedit-enums.h>
G_BEGIN_DECLS G_BEGIN_DECLS

4
moo/moolua/moo-lua-api.h
View File

@ -35,9 +35,7 @@
#include "mooedit/mooeditaction.h" #include "mooedit/mooeditaction.h"
#include "mooedit/mooeditaction-factory.h" #include "mooedit/mooeditaction-factory.h"
#include "mooedit/mootextbuffer.h" #include "mooedit/mootextbuffer.h"
#ifndef MOO_USE_SCI #include "mooedit/moolangmgr.h"
#include "mooedit/native/moolangmgr.h"
#endif // !MOO_USE_SCI
#include "mooedit/mooeditfileinfo.h" #include "mooedit/mooeditfileinfo.h"
#include "mooedit/mooedit-script.h" #include "mooedit/mooedit-script.h"
#include "mooedit/mooedittab.h" #include "mooedit/mooedittab.h"

4
moo/plugins/usertools/moooutputfilterregex.cpp
View File

@ -17,9 +17,7 @@
#include "moocommand.h" #include "moocommand.h"
#include "../support/moocmdview.h" #include "../support/moocmdview.h"
#include "mooedit/mooeditprefs.h" #include "mooedit/mooeditprefs.h"
#ifndef MOO_USE_SCI #include "mooedit/moolangmgr.h"
#include "mooedit/native/moolangmgr.h"
#endif // !MOO_USE_SCI
#include "mooutils/mooutils-gobject.h" #include "mooutils/mooutils-gobject.h"
#include "mooutils/mooutils-misc.h" #include "mooutils/mooutils-misc.h"
#include "mooutils/moomarkup.h" #include "mooutils/moomarkup.h"