From 231298a5e897512ff2994e33d02eef37291bba61 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Wed, 31 Aug 2011 00:24:07 -0700 Subject: [PATCH] move eio stuff into src/unix --- config-unix.mk | 20 +++++++++++--------- src/{ => unix}/eio/Changes | 0 src/{ => unix}/eio/LICENSE | 0 src/{ => unix}/eio/Makefile.am | 0 src/{ => unix}/eio/aclocal.m4 | 0 src/{ => unix}/eio/autogen.sh | 0 src/{ => unix}/eio/config.h.in | 0 src/{ => unix}/eio/config_cygwin.h | 0 src/{ => unix}/eio/config_darwin.h | 0 src/{ => unix}/eio/config_freebsd.h | 0 src/{ => unix}/eio/config_linux.h | 0 src/{ => unix}/eio/config_sunos.h | 0 src/{ => unix}/eio/configure.ac | 0 src/{ => unix}/eio/demo.c | 0 src/{ => unix}/eio/ecb.h | 0 src/{ => unix}/eio/eio.3 | 0 src/{ => unix}/eio/eio.c | 0 src/{ => unix}/eio/eio.pod | 0 src/{ => unix}/eio/libeio.m4 | 0 src/{ => unix}/eio/xthread.h | 0 src/{ => unix}/uv-eio.c | 0 src/{ => unix}/uv-eio.h | 0 uv.gyp | 20 ++++++++++---------- 23 files changed, 21 insertions(+), 19 deletions(-) rename src/{ => unix}/eio/Changes (100%) rename src/{ => unix}/eio/LICENSE (100%) rename src/{ => unix}/eio/Makefile.am (100%) rename src/{ => unix}/eio/aclocal.m4 (100%) rename src/{ => unix}/eio/autogen.sh (100%) rename src/{ => unix}/eio/config.h.in (100%) rename src/{ => unix}/eio/config_cygwin.h (100%) rename src/{ => unix}/eio/config_darwin.h (100%) rename src/{ => unix}/eio/config_freebsd.h (100%) rename src/{ => unix}/eio/config_linux.h (100%) rename src/{ => unix}/eio/config_sunos.h (100%) rename src/{ => unix}/eio/configure.ac (100%) rename src/{ => unix}/eio/demo.c (100%) rename src/{ => unix}/eio/ecb.h (100%) rename src/{ => unix}/eio/eio.3 (100%) rename src/{ => unix}/eio/eio.c (100%) rename src/{ => unix}/eio/eio.pod (100%) rename src/{ => unix}/eio/libeio.m4 (100%) rename src/{ => unix}/eio/xthread.h (100%) rename src/{ => unix}/uv-eio.c (100%) rename src/{ => unix}/uv-eio.h (100%) diff --git a/config-unix.mk b/config-unix.mk index 24e8f2dc..2f58acf5 100644 --- a/config-unix.mk +++ b/config-unix.mk @@ -85,9 +85,9 @@ endif RUNNER_LIBS= RUNNER_SRC=test/runner-unix.c -uv.a: src/uv-unix.o src/unix/fs.o src/uv-common.o src/uv-platform.o src/ev/ev.o src/uv-eio.o src/eio/eio.o $(CARES_OBJS) - $(AR) rcs uv.a src/uv-unix.o src/unix/fs.o src/uv-platform.o src/uv-common.o src/uv-eio.o src/ev/ev.o \ - src/eio/eio.o $(CARES_OBJS) +uv.a: src/uv-unix.o src/unix/fs.o src/uv-common.o src/uv-platform.o src/ev/ev.o src/unix/uv-eio.o src/unix/eio/eio.o $(CARES_OBJS) + $(AR) rcs uv.a src/uv-unix.o src/unix/fs.o src/uv-platform.o src/uv-common.o src/unix/uv-eio.o src/ev/ev.o \ + src/unix/eio/eio.o $(CARES_OBJS) src/uv-platform.o: src/$(UV_OS_FILE) include/uv.h include/uv-unix.h $(CC) $(CSTDFLAG) $(CPPFLAGS) $(CFLAGS) -c src/$(UV_OS_FILE) -o src/uv-platform.o @@ -110,21 +110,23 @@ EIO_CPPFLAGS += -DEIO_CONFIG_H=\"$(EIO_CONFIG)\" EIO_CPPFLAGS += -DEIO_STACKSIZE=262144 EIO_CPPFLAGS += -D_GNU_SOURCE -src/eio/eio.o: src/eio/eio.c - $(CC) $(EIO_CPPFLAGS) $(CFLAGS) -c src/eio/eio.c -o src/eio/eio.o +src/unix/eio/eio.o: src/unix/eio/eio.c + $(CC) $(EIO_CPPFLAGS) $(CFLAGS) -c src/unix/eio/eio.c -o src/unix/eio/eio.o -src/uv-eio.o: src/uv-eio.c - $(CC) $(CPPFLAGS) -Isrc/eio/ $(CSTDFLAG) $(CFLAGS) -c src/uv-eio.c -o src/uv-eio.o +src/unix/uv-eio.o: src/unix/uv-eio.c + $(CC) $(CPPFLAGS) -Isrc/unix/eio/ $(CSTDFLAG) $(CFLAGS) -c src/unix/uv-eio.c -o src/unix/uv-eio.o clean-platform: -rm -f src/ares/*.o -rm -f src/ev/*.o - -rm -f src/eio/*.o + -rm -f src/unix/eio/*.o + -rm -f src/unix/*.o -rm -rf test/run-tests.dSYM run-benchmarks.dSYM distclean-platform: -rm -f src/ares/*.o -rm -f src/ev/*.o - -rm -f src/eio/*.o + -rm -f src/unix/*.o + -rm -f src/unix/eio/*.o -rm -rf test/run-tests.dSYM run-benchmarks.dSYM diff --git a/src/eio/Changes b/src/unix/eio/Changes similarity index 100% rename from src/eio/Changes rename to src/unix/eio/Changes diff --git a/src/eio/LICENSE b/src/unix/eio/LICENSE similarity index 100% rename from src/eio/LICENSE rename to src/unix/eio/LICENSE diff --git a/src/eio/Makefile.am b/src/unix/eio/Makefile.am similarity index 100% rename from src/eio/Makefile.am rename to src/unix/eio/Makefile.am diff --git a/src/eio/aclocal.m4 b/src/unix/eio/aclocal.m4 similarity index 100% rename from src/eio/aclocal.m4 rename to src/unix/eio/aclocal.m4 diff --git a/src/eio/autogen.sh b/src/unix/eio/autogen.sh similarity index 100% rename from src/eio/autogen.sh rename to src/unix/eio/autogen.sh diff --git a/src/eio/config.h.in b/src/unix/eio/config.h.in similarity index 100% rename from src/eio/config.h.in rename to src/unix/eio/config.h.in diff --git a/src/eio/config_cygwin.h b/src/unix/eio/config_cygwin.h similarity index 100% rename from src/eio/config_cygwin.h rename to src/unix/eio/config_cygwin.h diff --git a/src/eio/config_darwin.h b/src/unix/eio/config_darwin.h similarity index 100% rename from src/eio/config_darwin.h rename to src/unix/eio/config_darwin.h diff --git a/src/eio/config_freebsd.h b/src/unix/eio/config_freebsd.h similarity index 100% rename from src/eio/config_freebsd.h rename to src/unix/eio/config_freebsd.h diff --git a/src/eio/config_linux.h b/src/unix/eio/config_linux.h similarity index 100% rename from src/eio/config_linux.h rename to src/unix/eio/config_linux.h diff --git a/src/eio/config_sunos.h b/src/unix/eio/config_sunos.h similarity index 100% rename from src/eio/config_sunos.h rename to src/unix/eio/config_sunos.h diff --git a/src/eio/configure.ac b/src/unix/eio/configure.ac similarity index 100% rename from src/eio/configure.ac rename to src/unix/eio/configure.ac diff --git a/src/eio/demo.c b/src/unix/eio/demo.c similarity index 100% rename from src/eio/demo.c rename to src/unix/eio/demo.c diff --git a/src/eio/ecb.h b/src/unix/eio/ecb.h similarity index 100% rename from src/eio/ecb.h rename to src/unix/eio/ecb.h diff --git a/src/eio/eio.3 b/src/unix/eio/eio.3 similarity index 100% rename from src/eio/eio.3 rename to src/unix/eio/eio.3 diff --git a/src/eio/eio.c b/src/unix/eio/eio.c similarity index 100% rename from src/eio/eio.c rename to src/unix/eio/eio.c diff --git a/src/eio/eio.pod b/src/unix/eio/eio.pod similarity index 100% rename from src/eio/eio.pod rename to src/unix/eio/eio.pod diff --git a/src/eio/libeio.m4 b/src/unix/eio/libeio.m4 similarity index 100% rename from src/eio/libeio.m4 rename to src/unix/eio/libeio.m4 diff --git a/src/eio/xthread.h b/src/unix/eio/xthread.h similarity index 100% rename from src/eio/xthread.h rename to src/unix/eio/xthread.h diff --git a/src/uv-eio.c b/src/unix/uv-eio.c similarity index 100% rename from src/uv-eio.c rename to src/unix/uv-eio.c diff --git a/src/uv-eio.h b/src/unix/uv-eio.h similarity index 100% rename from src/uv-eio.h rename to src/unix/uv-eio.h diff --git a/uv.gyp b/uv.gyp index ab93f1d9..1723f695 100644 --- a/uv.gyp +++ b/uv.gyp @@ -140,14 +140,14 @@ 'include/ev.h', 'include/ngx-queue.h', 'include/uv-unix.h', - 'src/uv-eio.c', - 'src/uv-eio.h', 'src/uv-unix.c', + 'src/unix/uv-eio.c', + 'src/unix/uv-eio.h', 'src/unix/fs.c', 'src/unix/internal.h', - 'src/eio/ecb.h', - 'src/eio/eio.c', - 'src/eio/xthread.h', + 'src/unix/eio/ecb.h', + 'src/unix/eio/eio.c', + 'src/unix/eio/xthread.h', 'src/ev/ev.c', 'src/ev/ev_vars.h', 'src/ev/ev_wrap.h', @@ -159,11 +159,11 @@ 'src/ares/config_linux/ares_config.h', 'src/ares/config_openbsd/ares_config.h', 'src/ares/config_sunos/ares_config.h', - 'src/eio/config_cygwin.h', - 'src/eio/config_darwin.h', - 'src/eio/config_freebsd.h', - 'src/eio/config_linux.h', - 'src/eio/config_sunos.h', + 'src/unix/eio/config_cygwin.h', + 'src/unix/eio/config_darwin.h', + 'src/unix/eio/config_freebsd.h', + 'src/unix/eio/config_linux.h', + 'src/unix/eio/config_sunos.h', 'src/ev/config_cygwin.h', 'src/ev/config_darwin.h', 'src/ev/config_freebsd.h',