* Split libfiletype & libedittext form drcc.(Complete)

diff --git a/drcc/Makefile b/drcc/Makefile
index 307adda..d663d21 100644 (file)
--- a/drcc/Makefile
+++ b/drcc/Makefile
@@ -55,12 +55,6 @@ DRCC_OBJS = \
                drcc_menubar.o \
                drcc_statusbar.o \
                drcc_cmdbar.o \
-               drcc_filetype.o \
-               drcc_edittext_system.o \
-               drcc_edittext_file.o \
-               drcc_edittext_line.o \
-               drcc_edittext_section.o \
-               drcc_edittext_debug.o \
                drcc_winctrl.o
 DRCC_HEADER = \
                drcc.h \
@@ -72,24 +66,13 @@ DRCC_HEADER = \
                drcc_statusbar.h \
                drcc_cmdbar.h \
                drcc_winctrl.h \
-               drcc_filetype.h \
-               drcc_edittext_types.h \
-               drcc_edittext_system.h \
-               drcc_edittext_file.h \
-               drcc_edittext_line.h \
-               drcc_edittext_section.h \
-               drcc_edittext_debug.h \
                $(SUPER_HEADER)
 
 TEST_FLAGS_COMPILE = -I/usr/local/include
 TEST_FLAGS_LINKER = -L/usr/local/lib
 TEST_DRCC_TARGET = test_drcc
 TEST_DRCC_OBJS = \
-               test_main_drcc.o \
-               test_drcc_edittext_system.o \
-               test_drcc_edittext_file.o \
-               test_drcc_edittext_line.o \
-               test_drcc_filetype.o
+               test_main_drcc.o
 TEST_DRCC_HEADER = \
                test_drcc.h
 
@@ -97,8 +80,6 @@ all:  $(DRCC_TARGET) test
 test:  $(TEST_DRCC_TARGET)
        ./$(TEST_DRCC_TARGET)
 
-#$(DRCC_TARGET): $(DRCC_OBJS)
-#      cp $(DRCC_TARGET) ..
 
 drcc_main.o: drcc_main.c $(DRCC_HEADER)
        $(CC) -c -o drcc_main.o $(FLAGS_DEBUG) $(FLAGS_COMPILE) \
@@ -121,24 +102,6 @@ drcc_cmdbar.o: drcc_cmdbar.c $(DRCC_HEADER)
 drcc_winctrl.o: drcc_winctrl.c $(DRCC_HEADER)
        $(CC) -c -o drcc_winctrl.o $(FLAGS_DEBUG) $(FLAGS_COMPILE) \
                                drcc_winctrl.c
-drcc_edittext_system.o: drcc_edittext_system.c $(DRCC_HEADER)
-       $(CC) -c -o drcc_edittext_system.o $(FLAGS_DEBUG) $(FLAGS_COMPILE) \
-                               drcc_edittext_system.c
-drcc_edittext_file.o: drcc_edittext_file.c $(DRCC_HEADER)
-       $(CC) -c -o drcc_edittext_file.o $(FLAGS_DEBUG) $(FLAGS_COMPILE) \
-                               drcc_edittext_file.c
-drcc_edittext_line.o: drcc_edittext_line.c $(DRCC_HEADER)
-       $(CC) -c -o drcc_edittext_line.o $(FLAGS_DEBUG) $(FLAGS_COMPILE) \
-                               drcc_edittext_line.c
-drcc_edittext_section.o: drcc_edittext_section.c $(DRCC_HEADER)
-       $(CC) -c -o drcc_edittext_section.o $(FLAGS_DEBUG) $(FLAGS_COMPILE) \
-                               drcc_edittext_section.c
-drcc_edittext_debug.o: drcc_edittext_debug.c $(DRCC_HEADER)
-       $(CC) -c -o drcc_edittext_debug.o $(FLAGS_DEBUG) $(FLAGS_COMPILE) \
-                               drcc_edittext_debug.c
-drcc_filetype.o: drcc_filetype.c
-       $(CC) -c -o drcc_filetype.o $(FLAGS_DEBUG) $(FLAGS_COMPILE) \
-                               drcc_filetype.c
 
 $(DRCC_TARGET): $(DRCC_OBJS) drcc_main.o
        $(CC) -o $(DRCC_TARGET) $(FLAGS_DEBUG) $(DRCC_OBJS) drcc_main.o -lncurses
@@ -148,22 +111,6 @@ test_main_drcc.o: test_main_drcc.c $(DRCC_HEADER) $(TEST_DRCC_HEADER)
        $(CC) -c -o test_main_drcc.o \
                                $(FLAGS_DEBUG) $(FLAGS_COMPILE) $(TEST_FLAGS_COMPILE) \
                                test_main_drcc.c
-test_drcc_edittext_system.o: test_drcc_edittext_system.c $(DRCC_HEADER) $(TEST_DRCC_HEADER)
-       $(CC) -c -o test_drcc_edittext_system.o \
-                               $(FLAGS_DEBUG) $(FLAGS_COMPILE) $(TEST_FLAGS_COMPILE) \
-                               test_drcc_edittext_system.c
-test_drcc_edittext_file.o: test_drcc_edittext_file.c $(DRCC_HEADER) $(TEST_DRCC_HEADER)
-       $(CC) -c -o test_drcc_edittext_file.o \
-                               $(FLAGS_DEBUG) $(FLAGS_COMPILE) $(TEST_FLAGS_COMPILE) \
-                               test_drcc_edittext_file.c
-test_drcc_edittext_line.o: test_drcc_edittext_line.c $(DRCC_HEADER) $(TEST_DRCC_HEADER)
-       $(CC) -c -o test_drcc_edittext_line.o \
-                               $(FLAGS_DEBUG) $(FLAGS_COMPILE) $(TEST_FLAGS_COMPILE) \
-                               test_drcc_edittext_line.c
-test_drcc_filetype.o: test_drcc_filetype.c $(DRCC_HEADER) $(TEST_DRCC_HEADER)
-       $(CC) -c -o test_drcc_filetype.o \
-                               $(FLAGS_DEBUG) $(FLAGS_COMPILE) $(TEST_FLAGS_COMPILE) \
-                               test_drcc_filetype.c
        
 $(TEST_DRCC_TARGET): $(TEST_DRCC_OBJS) $(DRCC_OBJS)
        $(CC) -o $(TEST_DRCC_TARGET) $(FLAGS_DEBUG) $(DRCC_OBJS) $(TEST_DRCC_OBJS) \

diff --git a/drcc/drcc.h b/drcc/drcc.h
index 473cbcc..7f15425 100644 (file)
--- a/drcc/drcc.h
+++ b/drcc/drcc.h
@@ -53,8 +53,6 @@ Comment:
 #include"../include/drd64_conf.h"
 
 #include"drcc_config.h"
-#include"drcc_edittext_types.h"
-
 #include"drcc_main.h"
 #include"drcc_init.h"
 #include"drcc_term.h"
@@ -62,12 +60,6 @@ Comment:
 #include"drcc_menubar.h"
 #include"drcc_statusbar.h"
 #include"drcc_cmdbar.h"
-#include"drcc_filetype.h"
-#include"drcc_edittext_system.h"
-#include"drcc_edittext_file.h"
-#include"drcc_edittext_line.h"
-#include"drcc_edittext_section.h"
-#include"drcc_edittext_debug.h"
 #include"drcc_window.h"
 
 #endif /* DRD64_HEADER_DRCC_INCLUDE */

diff --git a/drcc/drcc_config.h b/drcc/drcc_config.h
index a9cfaa0..a56ebc6 100644 (file)
--- a/drcc/drcc_config.h
+++ b/drcc/drcc_config.h
@@ -37,27 +37,6 @@ Comment:
 #ifndef DRD64_HEADER_DRCC_CONFIG
 #define DRD64_HEADER_DRCC_CONFIG
 
-#define DEBUG_TEXTINFO_OUTPUT                                          0x01
-       /* Output TextData for Console if this value isn't 0x00 when run test_drcc program.*/
-
-
-
-#define DRD64_DRCC_DEFAULT_ALLOC_TEXTINFO                      256
-#define DRD64_DRCC_DEFAULT_LINES_SAFETY_FACTOR         1.5
-#define DRD64_DRCC_DEFAULT_RESERVEBUF_INLINE           20
-#define DRD64_DRCC_DEFAULT_BUFSIZE_RESERVELINE         80
-#define        DRD64_DRCC_DEFAULT_BUFSIZE_EXPANDFACTOR         0.5
-
-#define DRD64_DRCC_DEFAULT_CREATETEXTFILE_LINES                1024
-#define DRD64_DRCC_DEFAULT_READBUF                                     1024
-
-#define DRD64_DRCC_DEFAULT_LINESORT_ARRAYS                     128
-#define DRD64_DRCC_DEFAULT_LINESORT_STEP1MAX           100
-#define DRD64_DRCC_DEFAULT_LINESORT_STEP2SCALE         5
-
-#define        DRD64_DRCC_DEFAULT_ALLOCSECTIONS                        512
-#define        DRD64_DRCC_DEFAULT_LINESECTIONS                         64
-#define        DRD64_DRCC_DEFAULT_SECTIONSTEPS                         16
 
 #endif /* DRD64_HEADER_XXX */
 

diff --git a/drcc/test_drcc.h b/drcc/test_drcc.h
index 55d8c90..d4d84f0 100644 (file)
--- a/drcc/test_drcc.h
+++ b/drcc/test_drcc.h
@@ -41,37 +41,6 @@ Comment:
 #include"CUnit/Basic.h"
 
 
-/*---------------------------------------------------------------------*/
-#ifdef DRD64_SRC_TEST_DRCC_EDITTEXT_LINE
-       #define DRD64_TEST_DRCC_EDITTEXT_LINE_EXTERN
-#else
-       #define DRD64_TEST_DRCC_EDITTEXT_LINE_EXTERN    extern
-#endif
-DRD64_TEST_DRCC_EDITTEXT_LINE_EXTERN int Test_DrCC_EditText_Line( void );
-
-/*---------------------------------------------------------------------*/
-#ifdef DRD64_SRC_TEST_DRCC_EDITTEXT_SYSTEM
-       #define DRD64_TEST_DRCC_EDITTEXT_SYSTEM_EXTERN
-#else
-       #define DRD64_TEST_DRCC_EDITTEXT_SYSTEM_EXTERN  extern
-#endif
-DRD64_TEST_DRCC_EDITTEXT_SYSTEM_EXTERN int Test_DrCC_EditText_System( void );
-
-/*---------------------------------------------------------------------*/
-#ifdef DRD64_SRC_TEST_DRCC_EDITTEXT_FILE
-       #define DRD64_TEST_DRCC_EDITTEXT_FILE_EXTERN
-#else
-       #define DRD64_TEST_DRCC_EDITTEXT_FILE_EXTERN    extern
-#endif
-DRD64_TEST_DRCC_EDITTEXT_FILE_EXTERN int Test_DrCC_EditText_File( void );
-
-/*---------------------------------------------------------------------*/
-#ifdef DRD64_SRC_TEST_DRCC_FILETYPE
-       #define DRD64_TEST_DRCC_FILETYPE_EXTERN
-#else
-       #define DRD64_TEST_DRCC_FILETYPE_EXTERN extern
-#endif
-DRD64_TEST_DRCC_FILETYPE_EXTERN int Test_DrCC_FileType( void );
 
 #endif /* DRD64_HEADER_XXX */
 

diff --git a/drcc/test_main_drcc.c b/drcc/test_main_drcc.c
index 12caee6..5f6b6d7 100644 (file)
--- a/drcc/test_main_drcc.c
+++ b/drcc/test_main_drcc.c
@@ -48,10 +48,6 @@ int
 {
        CU_initialize_registry();
        
-       Test_DrCC_FileType();
-       Test_DrCC_EditText_System();
-       Test_DrCC_EditText_File();
-       Test_DrCC_EditText_Line();
 
        CU_basic_run_tests();
        CU_cleanup_registry();