Overview
| Comment: | A bit of cleanup |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
a4f7828c1da46df61985e0c2d107232f |
| User & Date: | rkeene on 2019-09-17 14:39:27.673 |
| Other Links: | manifest | tags |
Context
|
2019-09-17
| ||
| 16:39 | Limit the stat structure when on Win32 check-in: 3a68a54e44 user: rkeene tags: trunk | |
| 14:39 | A bit of cleanup check-in: a4f7828c1d user: rkeene tags: trunk | |
| 14:34 | Included unistd.h for W_OK, X_OK, etc check-in: d61a265cd6 user: rkeene tags: trunk | |
Changes
Modified Makefile
from [4529931791]
to [4d994959ca].
1 2 3 4 5 6 | CPPFLAGS := -I. -DUSE_TCL_STUBS=1 -DXVFS_DEBUG $(XVFS_ADD_CPPFLAGS) CFLAGS := -fPIC -g3 -ggdb3 -Wall $(XVFS_ADD_CFLAGS) LDFLAGS := $(XVFS_ADD_LDFLAGS) LIBS := -ltclstub8.6 TCLSH := tclsh | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 |
CPPFLAGS := -I. -DUSE_TCL_STUBS=1 -DXVFS_DEBUG $(XVFS_ADD_CPPFLAGS)
CFLAGS := -fPIC -g3 -ggdb3 -Wall $(XVFS_ADD_CFLAGS)
LDFLAGS := $(XVFS_ADD_LDFLAGS)
LIBS := -ltclstub8.6
TCLSH := tclsh
all: example.so example-client.so xvfs.so
example.c: $(shell find example -type f) $(shell find lib -type f) xvfs.c.rvt xvfs-create Makefile
./xvfs-create --directory example --name example > example.c.new
mv example.c.new example.c
example.o: example.c xvfs-core.h xvfs-core.c Makefile
$(CC) $(CPPFLAGS) -DXVFS_MODE_FLEXIBLE $(CFLAGS) -o example.o -c example.c
example.so: example.o Makefile
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o example.so example.o $(LIBS)
example-client.o: example.c xvfs-core.h Makefile
$(CC) $(CPPFLAGS) -DXVFS_MODE_FLEXIBLE $(CFLAGS) -o example-client.o -c example.c
example-client.so: example-client.o Makefile
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o example-client.so example-client.o $(LIBS)
xvfs.o: xvfs-core.h xvfs-core.c Makefile
$(CC) $(CPPFLAGS) -DXVFS_MODE_SERVER $(CFLAGS) -o xvfs.o -c xvfs-core.c
xvfs.so: xvfs.o Makefile
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o xvfs.so xvfs.o $(LIBS)
# xvfs-create-standalone is a standalone (i.e., no external dependencies
# like lib/minirivet, xvfs-core.c, etc) version of "xvfs-create"
xvfs-create-standalone: $(shell find lib -type f) xvfs-create xvfs-core.c xvfs-core.h xvfs.c.rvt Makefile
rm -f xvfs-create-standalone.new xvfs-create-standalone
./xvfs-create --dump-tcl --remove-debug > xvfs-create-standalone.new
chmod +x xvfs-create-standalone.new
mv xvfs-create-standalone.new xvfs-create-standalone
test: example.so xvfs.so example-client.so Makefile
rm -f __test__.tcl
echo 'if {[catch { load ./example.so Xvfs_example; source //xvfs:/example/main.tcl }]} { puts stderr $$::errorInfo; exit 1 }; exit 0' > __test__.tcl
$(GDB) $(TCLSH) __test__.tcl $(TCL_TEST_ARGS)
rm -f __test__.tcl
echo 'if {[catch { load ./xvfs.so; load ./example-client.so Xvfs_example; source //xvfs:/example/main.tcl }]} { puts stderr $$::errorInfo; exit 1 }; exit 0' > __test__.tcl
$(GDB) $(TCLSH) __test__.tcl $(TCL_TEST_ARGS)
rm -f __test__.tcl
coverage:
$(MAKE) clean
$(MAKE) example.so XVFS_ADD_CFLAGS=-coverage XVFS_ADD_LDFLAGS=-coverage
$(MAKE) test XVFS_TEST_EXIT_ON_FAILURE=0
rm -f xvfs-test-coverage.info
lcov --capture --directory . --output-file xvfs-test-coverage.info
rm -rf xvfs-test-coverage
mkdir xvfs-test-coverage
genhtml xvfs-test-coverage.info --output-directory xvfs-test-coverage
rm -f xvfs-test-coverage.info
clean:
rm -f xvfs-create-standalone.new xvfs-create-standalone
rm -f example.c example.c.new
rm -f example.so example.o
rm -f example-client.o example-client.so
rm -f xvfs.o xvfs.so
rm -f example.gcda example.gcno
rm -f __test__.tcl
rm -f xvfs-test-coverage.info
rm -rf xvfs-test-coverage
distclean: clean
.PHONY: all clean distclean test coverage
|
Modified xvfs-core.c
from [b817488d55]
to [0714660302].
| ︙ | ︙ | |||
1111 1112 1113 1114 1115 1116 1117 |
return(xvfs_tclfs_matchInDir(interp, resultPtr, pathPtr, pattern, types, instanceInfo));
}
int Xvfs_Init(Tcl_Interp *interp) {
static int registered = 0;
int tclRet;
| < < < < < < > > > > > > > > | 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 |
return(xvfs_tclfs_matchInDir(interp, resultPtr, pathPtr, pattern, types, instanceInfo));
}
int Xvfs_Init(Tcl_Interp *interp) {
static int registered = 0;
int tclRet;
#ifdef USE_TCL_STUBS
const char *tclInitStubs_ret;
#endif
/* XXX:TODO: Make this thread-safe */
if (registered) {
return(TCL_OK);
}
registered = 1;
#ifdef USE_TCL_STUBS
/* Initialize Stubs */
tclInitStubs_ret = Tcl_InitStubs(interp, TCL_PATCH_LEVEL, 0);
if (!tclInitStubs_ret) {
return(TCL_ERROR);
}
#endif
xvfs_tclfs_dispatch_fs.typeName = "xvfsDispatch";
xvfs_tclfs_dispatch_fs.structureLength = sizeof(xvfs_tclfs_dispatch_fs);
xvfs_tclfs_dispatch_fs.version = TCL_FILESYSTEM_VERSION_1;
xvfs_tclfs_dispatch_fs.pathInFilesystemProc = xvfs_tclfs_dispatch_pathInFS;
xvfs_tclfs_dispatch_fs.dupInternalRepProc = NULL;
xvfs_tclfs_dispatch_fs.freeInternalRepProc = NULL;
|
| ︙ | ︙ |