diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | BCC_MAKEFILE | 13 | ||||
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | EMX_MAKEFILE | 8 | ||||
-rw-r--r-- | Makefile.direct | 40 | ||||
-rw-r--r-- | Makefile.dj | 29 | ||||
-rw-r--r-- | NT_MAKEFILE | 10 | ||||
-rw-r--r-- | NT_STATIC_THREADS_MAKEFILE | 10 | ||||
-rw-r--r-- | NT_X64_STATIC_THREADS_MAKEFILE | 10 | ||||
-rw-r--r-- | NT_X64_THREADS_MAKEFILE | 10 | ||||
-rw-r--r-- | OS2_MAKEFILE | 4 | ||||
-rw-r--r-- | SMakefile.amiga | 4 | ||||
-rw-r--r-- | cord/cord.am | 6 | ||||
-rw-r--r-- | cord/tests/cordtest.c (renamed from cord/cordtest.c) | 0 | ||||
-rw-r--r-- | cord/tests/de.c (renamed from cord/de.c) | 0 | ||||
-rw-r--r-- | cord/tests/de_cmds.h (renamed from cord/de_cmds.h) | 0 | ||||
-rw-r--r-- | cord/tests/de_win.c (renamed from cord/de_win.c) | 0 | ||||
-rw-r--r-- | cord/tests/de_win.h (renamed from cord/de_win.h) | 0 | ||||
-rw-r--r-- | cord/tests/de_win.rc (renamed from cord/de_win.RC) | 0 | ||||
-rw-r--r-- | doc/README.cords | 2 | ||||
-rw-r--r-- | gc.mak | 14 |
21 files changed, 84 insertions, 80 deletions
@@ -22,6 +22,7 @@ /cord/de /cord/de_win.rbj /cord/de_win.res +/cord/tests/de_win.res /cordtest /core /de diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE index b49d6b99..208bb5bc 100644 --- a/BCC_MAKEFILE +++ b/BCC_MAKEFILE @@ -53,16 +53,16 @@ gctest.exe: tests\test.obj gc.lib $(cflags) -W -e$* tests\test.obj gc.lib
|
-cord\de.obj cord\de_win.obj: include\cord.h include\private\cord_pos.h cord\de_win.h \
- cord\de_cmds.h
+cord\tests\de.obj cord\tests\de_win.obj: include\cord.h \
+ include\private\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h
-cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj \
- cord\de_win.res gc.lib
+cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj \
+ cord\tests\de_win.obj cord\tests\de_win.res gc.lib
$(cc) @&&|
$(cflags) -W -e$* cord\cordbscs.obj cord\cordxtra.obj \
- cord\de.obj cord\de_win.obj gc.lib
+ cord\tests\de.obj cord\tests\de_win.obj gc.lib
|
- $(rc) cord\de_win.res cord\de.exe
+ $(rc) cord\tests\de_win.res cord\de.exe
gc_cpp.obj: include\gc_cpp.h include\gc.h
@@ -84,4 +84,3 @@ clean: del gc.lib
del *.obj
del tests\test.obj
-
diff --git a/CMakeLists.txt b/CMakeLists.txt index 356bf5c0..9fedd3c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -220,7 +220,8 @@ SET_TARGET_PROPERTIES(gcmt-lib PROPERTIES ADD_LIBRARY( gcmt-dll SHARED ${SRC}) IF(WIN32) - ADD_EXECUTABLE(cord cord/cordbscs.c cord/cordxtra.c cord/de.c cord/de_win.c) + ADD_EXECUTABLE(cord cord/cordbscs.c cord/cordxtra.c + cord/tests/de.c cord/tests/de_win.c) SET_TARGET_PROPERTIES(cord PROPERTIES WIN32_EXECUTABLE TRUE) SET_TARGET_PROPERTIES(cord PROPERTIES COMPILE_DEFINITIONS GC_NOT_DLL) diff --git a/EMX_MAKEFILE b/EMX_MAKEFILE index 251f7141..0cf80d86 100644 --- a/EMX_MAKEFILE +++ b/EMX_MAKEFILE @@ -112,11 +112,11 @@ cord/cordxtra.o: $(srcdir)/cord/cordxtra.c $(CORD_INCLUDE_FILES) cord/cordprnt.o: $(srcdir)/cord/cordprnt.c $(CORD_INCLUDE_FILES) $(CC) $(CFLAGS) -c $(srcdir)/cord/cordprnt.c -o cord/cordprnt.o -cord/cordtest.exe: $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a - $(CC) $(CFLAGS) -o cord/cordtest.exe $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a +cord/cordtest.exe: $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a + $(CC) $(CFLAGS) -o cord/cordtest.exe $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a -cord/de.exe: $(srcdir)/cord/de.c $(srcdir)/cord/cordbscs.o $(srcdir)/cord/cordxtra.o gc.a - $(CC) $(CFLAGS) -o cord/de.exe $(srcdir)/cord/de.c $(srcdir)/cord/cordbscs.o $(srcdir)/cord/cordxtra.o gc.a $(CURSES) +cord/de.exe: $(srcdir)/cord/tests/de.c $(srcdir)/cord/cordbscs.o $(srcdir)/cord/cordxtra.o gc.a + $(CC) $(CFLAGS) -o cord/de.exe $(srcdir)/cord/tests/de.c $(srcdir)/cord/cordbscs.o $(srcdir)/cord/cordxtra.o gc.a $(CURSES) clean: rm -f gc.a tests/test.o gctest.exe output-local output-diff $(OBJS) \ diff --git a/Makefile.direct b/Makefile.direct index ebe1d2d9..ae778b37 100644 --- a/Makefile.direct +++ b/Makefile.direct @@ -9,6 +9,7 @@ # and runs some tests of collector and cords. Does not add cords or # c++ interface to gc.a # cord/de - builds dumb editor based on cords. + ABI_FLAG= # ABI_FLAG should be the cc flag that specifies the ABI. On most # platforms this will be the empty string. Possible values: @@ -82,9 +83,10 @@ CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c \ typd_mlc.c ptr_chck.c mallocx.c gcj_mlc.c specific.c gc_dlopen.c \ backgraph.c win32_threads.c pthread_start.c thread_local_alloc.c -CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c \ - cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h \ - cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.RC +CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/tests/de.c \ + cord/tests/cordtest.c include/cord.h include/ec.h \ + include/private/cord_pos.h cord/tests/de_win.c cord/tests/de_win.h \ + cord/tests/de_cmds.h cord/tests/de_win.rc CORD_OBJS= cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o @@ -248,7 +250,7 @@ gc_cpp.o: $(srcdir)/gc_cpp.cc $(srcdir)/include/gc_cpp.h $(srcdir)/include/gc.h $(CXX) -c $(CXXFLAGS) $(srcdir)/gc_cpp.cc test_cpp: $(srcdir)/tests/test_cpp.cc $(srcdir)/include/gc_cpp.h gc_cpp.o $(srcdir)/include/gc.h \ -base_lib $(UTILS) + base_lib $(UTILS) rm -f test_cpp ./if_mach HP_PA HPUX $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc gc_cpp.o gc.a -ldld `./threadlibs` ./if_not_there test_cpp $(CXX) $(CXXFLAGS) -o test_cpp $(srcdir)/tests/test_cpp.cc gc_cpp.o gc.a `./threadlibs` @@ -351,24 +353,24 @@ cord/cordprnt.o: cord $(srcdir)/cord/cordprnt.c $(CORD_INCLUDE_FILES) $(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordprnt.c mv cordprnt.o cord/cordprnt.o -cord/cordtest: $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a $(UTILS) +cord/cordtest: $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a $(UTILS) rm -f cord/cordtest - ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -lucb - ./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -ldld `./threadlibs` - ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a `./threadlibs` - ./if_not_there cord/cordtest $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a `./threadlibs` + ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a -lucb + ./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a -ldld `./threadlibs` + ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/cordtest $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a `./threadlibs` + ./if_not_there cord/cordtest $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a `./threadlibs` -cord/de: $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(UTILS) +cord/de: $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(UTILS) rm -f cord/de - ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -lucb `./threadlibs` - ./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -ldld `./threadlibs` - ./if_mach POWERPC AIX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses - ./if_mach POWERPC DARWIN $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a - ./if_mach I386 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs` - ./if_mach ALPHA LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs` - ./if_mach IA64 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs` - ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses - ./if_not_there cord/de $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) `./threadlibs` + ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -lucb `./threadlibs` + ./if_mach HP_PA HPUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -ldld `./threadlibs` + ./if_mach POWERPC AIX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses + ./if_mach POWERPC DARWIN $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a + ./if_mach I386 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs` + ./if_mach ALPHA LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs` + ./if_mach IA64 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs` + ./if_mach M68K AMIGA $(CC) $(CFLAGS) -UGC_AMIGA_MAKINGLIB -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses + ./if_not_there cord/de $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) `./threadlibs` if_mach: $(srcdir)/tools/if_mach.c $(srcdir)/include/private/gcconfig.h $(HOSTCC) $(HOSTCFLAGS) -o if_mach $(srcdir)/tools/if_mach.c diff --git a/Makefile.dj b/Makefile.dj index 323dfa8d..07758490 100644 --- a/Makefile.dj +++ b/Makefile.dj @@ -41,9 +41,10 @@ OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c checksums.c solaris_threads.c typd_mlc.c ptr_chck.c mallocx.c solaris_pthreads.c gcj_mlc.c specific.c -CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c \ - cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h \ - cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.RC +CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/tests/de.c \ + cord/tests/cordtest.c include/cord.h include/ec.h \ + include/private/cord_pos.h cord/tests/de_win.c cord/tests/de_win.h \ + cord/tests/de_cmds.h cord/tests/de_win.rc CORD_OBJS= cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o @@ -190,25 +191,25 @@ cord/cordprnt.o: $(srcdir)/cord/cordprnt.c $(CORD_INCLUDE_FILES) $(CC) $(CFLAGS) -c -I$(srcdir) $(srcdir)/cord/cordprnt.c mv cordprnt.o cord/cordprnt.o -cord/cordtest$(EXE_SUFFIX): $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a $(UTILS) /tmp +cord/cordtest$(EXE_SUFFIX): $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a $(UTILS) /tmp rm -f cord/cordtest$(EXE_SUFFIX) - ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/cordtest$(EXE_SUFFIX) $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -lucb - ./if_mach HP_PA "" $(CC) $(CFLAGS) -o cord/cordtest$(EXE_SUFFIX) $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a -ldld - ./if_not_there cord/cordtest$(EXE_SUFFIX) $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/cordtest.c $(CORD_OBJS) gc.a + ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/cordtest$(EXE_SUFFIX) $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a -lucb + ./if_mach HP_PA "" $(CC) $(CFLAGS) -o cord/cordtest$(EXE_SUFFIX) $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a -ldld + ./if_not_there cord/cordtest$(EXE_SUFFIX) $(CC) $(CFLAGS) -o cord/cordtest $(srcdir)/cord/tests/cordtest.c $(CORD_OBJS) gc.a rm -f cord/cordtest cordtest -mv cordtest$(EXE_SUFFIX) cord/ /tmp: $(UTILS) ./if_not_there /tmp mkdir /tmp -cord/de$(EXE_SUFFIX): $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(UTILS) +cord/de$(EXE_SUFFIX): $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(UTILS) rm -f cord/de cord/de$(EXE_SUFFIX) - ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -lucb `./threadlibs` - ./if_mach HP_PA "" $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -ldld - ./if_mach RS6000 "" $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses - ./if_mach I386 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs` - ./if_mach ALPHA LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses - ./if_not_there cord/de$(EXE_SUFFIX) $(CC) $(CFLAGS) -o cord/de$(EXE_SUFFIX) $(srcdir)/cord/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) + ./if_mach SPARC DRSNX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -lucb `./threadlibs` + ./if_mach HP_PA "" $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) -ldld + ./if_mach RS6000 "" $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses + ./if_mach I386 LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses `./threadlibs` + ./if_mach ALPHA LINUX $(CC) $(CFLAGS) -o cord/de $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a -lcurses + ./if_not_there cord/de$(EXE_SUFFIX) $(CC) $(CFLAGS) -o cord/de$(EXE_SUFFIX) $(srcdir)/cord/tests/de.c cord/cordbscs.o cord/cordxtra.o gc.a $(CURSES) if_mach$(EXE_SUFFIX): $(srcdir)/tools/if_mach.c $(srcdir)/include/private/gcconfig.h rm -f if_mach if_mach$(EXE_SUFFIX) diff --git a/NT_MAKEFILE b/NT_MAKEFILE index 809d9f77..a0ba4bc0 100644 --- a/NT_MAKEFILE +++ b/NT_MAKEFILE @@ -37,14 +37,14 @@ gctest.exe: tests\test.obj gc.lib cord\de_win.rbj: cord\de_win.res cvtres /MACHINE:$(MY_CPU) /OUT:cord\de_win.rbj cord\de_win.res -cord\de.obj cord\de_win.obj: include\cord.h include\private\cord_pos.h cord\de_win.h cord\de_cmds.h +cord\tests\de.obj cord\tests\de_win.obj: include\cord.h include\private\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h -cord\de_win.res: cord\de_win.rc cord\de_win.h cord\de_cmds.h - $(rc) $(rcvars) -r -fo cord\de_win.res cord\de_win.rc +cord\de_win.res: cord\tests\de_win.rc cord\tests\de_win.h cord\tests\de_cmds.h + $(rc) $(rcvars) -r -fo cord\de_win.res cord\tests\de_win.rc # Cord/de is a real win32 gui application. -cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib - $(link) -debug -debugtype:cv $(guiflags) -stack:16384 -out:cord\de.exe cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib $(guilibs) +cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj cord\tests\de_win.obj cord\de_win.rbj gc.lib + $(link) -debug -debugtype:cv $(guiflags) -stack:16384 -out:cord\de.exe cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj cord\tests\de_win.obj cord\de_win.rbj gc.lib $(guilibs) gc_cpp.obj: include\gc_cpp.h include\gc.h diff --git a/NT_STATIC_THREADS_MAKEFILE b/NT_STATIC_THREADS_MAKEFILE index 9a003478..0907a8de 100644 --- a/NT_STATIC_THREADS_MAKEFILE +++ b/NT_STATIC_THREADS_MAKEFILE @@ -44,14 +44,14 @@ gctest.exe: tests\test.obj gc.lib cord\de_win.rbj: cord\de_win.res cvtres /MACHINE:$(MY_CPU) /OUT:cord\de_win.rbj cord\de_win.res -cord\de.obj cord\de_win.obj: include\cord.h include\private\cord_pos.h cord\de_win.h cord\de_cmds.h +cord\tests\de.obj cord\tests\de_win.obj: include\cord.h include\private\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h -cord\de_win.res: cord\de_win.rc cord\de_win.h cord\de_cmds.h - $(rc) $(rcvars) -r -fo cord\de_win.res cord\de_win.rc +cord\de_win.res: cord\tests\de_win.rc cord\tests\de_win.h cord\tests\de_cmds.h + $(rc) $(rcvars) -r -fo cord\de_win.res cord\tests\de_win.rc # Cord/de is a real win32 gui application. -cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib - $(link) -debug -debugtype:cv $(guiflags) -stack:16384 -out:cord\de.exe cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib $(guilibs) +cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj cord\tests\de_win.obj cord\de_win.rbj gc.lib + $(link) -debug -debugtype:cv $(guiflags) -stack:16384 -out:cord\de.exe cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj cord\tests\de_win.obj cord\de_win.rbj gc.lib $(guilibs) gc_cpp.obj: include\gc_cpp.h include\gc.h diff --git a/NT_X64_STATIC_THREADS_MAKEFILE b/NT_X64_STATIC_THREADS_MAKEFILE index 93de9727..70dbd600 100644 --- a/NT_X64_STATIC_THREADS_MAKEFILE +++ b/NT_X64_STATIC_THREADS_MAKEFILE @@ -43,14 +43,14 @@ gctest.exe: tests\test.obj gc.lib cord\de_win.rbj: cord\de_win.res cvtres /MACHINE:$(MY_CPU) /OUT:cord\de_win.rbj cord\de_win.res -cord\de.obj cord\de_win.obj: include\cord.h include\private\cord_pos.h cord\de_win.h cord\de_cmds.h +cord\tests\de.obj cord\tests\de_win.obj: include\cord.h include\private\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h -cord\de_win.res: cord\de_win.rc cord\de_win.h cord\de_cmds.h - $(rc) $(rcvars) -r -fo cord\de_win.res cord\de_win.rc +cord\de_win.res: cord\tests\de_win.rc cord\tests\de_win.h cord\tests\de_cmds.h + $(rc) $(rcvars) -r -fo cord\de_win.res cord\tests\de_win.rc # Cord/de is a real win32 gui application. -cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib - $(link) $(ldebug) $(guiflags) -stack:16384 -out:cord\de.exe cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc.lib $(guilibs) +cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj cord\tests\de_win.obj cord\de_win.rbj gc.lib + $(link) $(ldebug) $(guiflags) -stack:16384 -out:cord\de.exe cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj cord\tests\de_win.obj cord\de_win.rbj gc.lib $(guilibs) gc_cpp.obj: include\gc_cpp.h include\gc.h diff --git a/NT_X64_THREADS_MAKEFILE b/NT_X64_THREADS_MAKEFILE index e0a252b7..49be4dad 100644 --- a/NT_X64_THREADS_MAKEFILE +++ b/NT_X64_THREADS_MAKEFILE @@ -58,14 +58,14 @@ gctest.exe: tests\test.obj gc64_dll.lib cord\de_win.rbj: cord\de_win.res cvtres /MACHINE:$(MY_CPU) /OUT:cord\de_win.rbj cord\de_win.res -cord\de.obj cord\de_win.obj: include\cord.h include\private\cord_pos.h cord\de_win.h cord\de_cmds.h +cord\tests\de.obj cord\tests\de_win.obj: include\cord.h include\private\cord_pos.h cord\tests\de_win.h cord\tests\de_cmds.h -cord\de_win.res: cord\de_win.rc cord\de_win.h cord\de_cmds.h - $(rc) $(rcvars) -r -fo cord\de_win.res cord\de_win.rc +cord\de_win.res: cord\tests\de_win.rc cord\tests\de_win.h cord\tests\de_cmds.h + $(rc) $(rcvars) -r -fo cord\de_win.res cord\tests\de_win.rc # Cord/de is a real win32 gui application. -cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc64_dll.lib - $(link) $(ldebug) $(guiflags) -stack:16384 -out:cord\de.exe cord\cordbscs.obj cord\cordxtra.obj cord\de.obj cord\de_win.obj cord\de_win.rbj gc64_dll.lib $(guilibs) +cord\de.exe: cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj cord\tests\de_win.obj cord\de_win.rbj gc64_dll.lib + $(link) $(ldebug) $(guiflags) -stack:16384 -out:cord\de.exe cord\cordbscs.obj cord\cordxtra.obj cord\tests\de.obj cord\tests\de_win.obj cord\de_win.rbj gc64_dll.lib $(guilibs) gc_cpp.obj: include\gc_cpp.h include\gc.h diff --git a/OS2_MAKEFILE b/OS2_MAKEFILE index c6bad7ab..5c2adbac 100644 --- a/OS2_MAKEFILE +++ b/OS2_MAKEFILE @@ -41,5 +41,5 @@ cord\cordxtra.obj: cord\cordxtra.c include\cord.h include\private\cord_pos.h inc cord\cordprnt.obj: cord\cordprnt.c include\cord.h include\private\cord_pos.h include\ec.h $(CC) $(CFLAGS) /C /Focord\cordprnt cord\cordprnt.c -cord\cordtest.exe: cord\cordtest.c include\cord.h include\private\cord_pos.h include\ec.h $(CORDOBJS) gc.lib - $(CC) $(CFLAGS) /B"/STACK:65536" /Fecord\cordtest cord\cordtest.c gc.lib $(CORDOBJS) +cord\cordtest.exe: cord\tests\cordtest.c include\cord.h include\private\cord_pos.h include\ec.h $(CORDOBJS) gc.lib + $(CC) $(CFLAGS) /B"/STACK:65536" /Fecord\cordtest cord\tests\cordtest.c gc.lib $(CORDOBJS) diff --git a/SMakefile.amiga b/SMakefile.amiga index c6ec4901..ae765125 100644 --- a/SMakefile.amiga +++ b/SMakefile.amiga @@ -171,5 +171,5 @@ cord/cordprnt.o: cord/cordprnt.c cord/cordxtra.o: cord/cordxtra.c sc cord/cordxtra.c $(CSCOPT) -cord/cordtest.o: cord/cordtest.c - sc cord/cordtest.c $(CSCOPT) +cord/cordtest.o: cord/tests/cordtest.c + sc cord/tests/cordtest.c $(CSCOPT) diff --git a/cord/cord.am b/cord/cord.am index 8a911f40..8135dde2 100644 --- a/cord/cord.am +++ b/cord/cord.am @@ -10,8 +10,8 @@ libcord_la_SOURCES = \ cord/cordxtra.c EXTRA_DIST += \ - cord/cordbscs.c cord/cordtest.c cord/de.c \ - cord/cordprnt.c cord/cordxtra.c cord/de_cmds.h \ - cord/de_win.h cord/de_win.c cord/de_win.RC + cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c \ + cord/tests/cordtest.c cord/tests/de.c cord/tests/de_cmds.h \ + cord/tests/de_win.h cord/tests/de_win.c cord/tests/de_win.rc pkginclude_HEADERS += include/cord.h diff --git a/cord/cordtest.c b/cord/tests/cordtest.c index 42c1fe61..42c1fe61 100644 --- a/cord/cordtest.c +++ b/cord/tests/cordtest.c diff --git a/cord/de.c b/cord/tests/de.c index f08167bc..f08167bc 100644 --- a/cord/de.c +++ b/cord/tests/de.c diff --git a/cord/de_cmds.h b/cord/tests/de_cmds.h index 2a69594e..2a69594e 100644 --- a/cord/de_cmds.h +++ b/cord/tests/de_cmds.h diff --git a/cord/de_win.c b/cord/tests/de_win.c index a49f8179..a49f8179 100644 --- a/cord/de_win.c +++ b/cord/tests/de_win.c diff --git a/cord/de_win.h b/cord/tests/de_win.h index a6a02f39..a6a02f39 100644 --- a/cord/de_win.h +++ b/cord/tests/de_win.h diff --git a/cord/de_win.RC b/cord/tests/de_win.rc index be0b925f..be0b925f 100644 --- a/cord/de_win.RC +++ b/cord/tests/de_win.rc diff --git a/doc/README.cords b/doc/README.cords index 1bb67003..5730a7f8 100644 --- a/doc/README.cords +++ b/doc/README.cords @@ -31,7 +31,7 @@ http://www.sgi.com/tech/stl/ropeimpl.html is missing a figure.) All of these are descendents of the "ropes" in Xerox Cedar. -de.c is a very dumb text editor that illustrates the use of cords. +cord/tests/de.c is a very dumb text editor that illustrates the use of cords. It maintains a list of file versions. Each version is simply a cord representing the file contents. Nonetheless, standard editing operations are efficient, even on very large files. @@ -2074,11 +2074,11 @@ NODEP_CPP_TEST_=\ ################################################################################ # Begin Source File -SOURCE=.\cord\de_win.c +SOURCE=.\cord\tests\de_win.c DEP_CPP_DE_WI=\ ".\include\cord.h"\ - ".\cord\de_cmds.h"\ - ".\cord\de_win.h"\ + ".\cord\tests\de_cmds.h"\ + ".\cord\tests\de_win.h"\ ".\include\private\cord_pos.h"\ NODEP_CPP_DE_WI=\ @@ -2105,11 +2105,11 @@ NODEP_CPP_DE_WI=\ ################################################################################ # Begin Source File -SOURCE=.\cord\de.c +SOURCE=.\cord\tests\de.c DEP_CPP_DE_C2e=\ ".\include\cord.h"\ - ".\cord\de_cmds.h"\ - ".\cord\de_win.h"\ + ".\cord\tests\de_cmds.h"\ + ".\cord\tests\de_win.h"\ ".\include\private\cord_pos.h"\ NODEP_CPP_DE_C2e=\ @@ -2195,7 +2195,7 @@ NODEP_CPP_CORDB=\ ################################################################################ # Begin Source File -SOURCE=.\cord\de_win.RC +SOURCE=.\cord\tests\de_win.rc !IF "$(CFG)" == "cord - Win32 Release" |