From 293a2d1b82b1933731b50b1653d26325e6c3a730 Mon Sep 17 00:00:00 2001 From: Ben Newman Date: Tue, 11 May 2010 10:44:42 -0700 Subject: [PATCH] Bug 565078 - Move js/src/ipc to js/ipc. r=bsmedberg --HG-- rename : js/src/ipc/CPOWTypes.h => js/ipc/CPOWTypes.h rename : js/src/ipc/ContextWrapperChild.h => js/ipc/ContextWrapperChild.h rename : js/src/ipc/ContextWrapperParent.h => js/ipc/ContextWrapperParent.h rename : js/src/ipc/Makefile.in => js/ipc/Makefile.in rename : js/src/ipc/ObjectWrapperChild.cpp => js/ipc/ObjectWrapperChild.cpp rename : js/src/ipc/ObjectWrapperChild.h => js/ipc/ObjectWrapperChild.h rename : js/src/ipc/ObjectWrapperParent.cpp => js/ipc/ObjectWrapperParent.cpp rename : js/src/ipc/ObjectWrapperParent.h => js/ipc/ObjectWrapperParent.h rename : js/src/ipc/PContextWrapper.ipdl => js/ipc/PContextWrapper.ipdl rename : js/src/ipc/PObjectWrapper.ipdl => js/ipc/PObjectWrapper.ipdl rename : js/src/ipc/ipdl.mk => js/ipc/ipdl.mk rename : js/src/ipc/jar.mn => js/ipc/jar.mn rename : js/src/ipc/tests/Makefile.in => js/ipc/tests/Makefile.in rename : js/src/ipc/tests/adhoc/child.html => js/ipc/tests/adhoc/child.html rename : js/src/ipc/tests/adhoc/test.xul => js/ipc/tests/adhoc/test.xul rename : js/src/ipc/tests/unit/cpow_child.js => js/ipc/tests/unit/cpow_child.js rename : js/src/ipc/tests/unit/test_cpow.js => js/ipc/tests/unit/test_cpow.js --- ipc/ipdl/Makefile.in | 2 +- js/{src => }/ipc/CPOWTypes.h | 0 js/{src => }/ipc/ContextWrapperChild.h | 0 js/{src => }/ipc/ContextWrapperParent.h | 0 js/{src => }/ipc/Makefile.in | 2 +- js/{src => }/ipc/ObjectWrapperChild.cpp | 0 js/{src => }/ipc/ObjectWrapperChild.h | 0 js/{src => }/ipc/ObjectWrapperParent.cpp | 0 js/{src => }/ipc/ObjectWrapperParent.h | 0 js/{src => }/ipc/PContextWrapper.ipdl | 0 js/{src => }/ipc/PObjectWrapper.ipdl | 0 js/{src => }/ipc/ipdl.mk | 0 js/{src => }/ipc/jar.mn | 0 js/{src => }/ipc/tests/Makefile.in | 2 +- js/{src => }/ipc/tests/adhoc/child.html | 0 js/{src => }/ipc/tests/adhoc/test.xul | 0 js/{src => }/ipc/tests/unit/cpow_child.js | 0 js/{src => }/ipc/tests/unit/test_cpow.js | 0 toolkit/toolkit-makefiles.sh | 2 +- toolkit/toolkit-tiers.mk | 2 +- 20 files changed, 5 insertions(+), 5 deletions(-) rename js/{src => }/ipc/CPOWTypes.h (100%) rename js/{src => }/ipc/ContextWrapperChild.h (100%) rename js/{src => }/ipc/ContextWrapperParent.h (100%) rename js/{src => }/ipc/Makefile.in (99%) rename js/{src => }/ipc/ObjectWrapperChild.cpp (100%) rename js/{src => }/ipc/ObjectWrapperChild.h (100%) rename js/{src => }/ipc/ObjectWrapperParent.cpp (100%) rename js/{src => }/ipc/ObjectWrapperParent.h (100%) rename js/{src => }/ipc/PContextWrapper.ipdl (100%) rename js/{src => }/ipc/PObjectWrapper.ipdl (100%) rename js/{src => }/ipc/ipdl.mk (100%) rename js/{src => }/ipc/jar.mn (100%) rename js/{src => }/ipc/tests/Makefile.in (98%) rename js/{src => }/ipc/tests/adhoc/child.html (100%) rename js/{src => }/ipc/tests/adhoc/test.xul (100%) rename js/{src => }/ipc/tests/unit/cpow_child.js (100%) rename js/{src => }/ipc/tests/unit/test_cpow.js (100%) diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in index 76fa83f074f1..06792b58f803 100644 --- a/ipc/ipdl/Makefile.in +++ b/ipc/ipdl/Makefile.in @@ -61,7 +61,7 @@ IPDLDIRS = \ netwerk/cookie/src \ ipc/ipdl/test/cxx \ ipc/testshell \ - js/src/ipc \ + js/ipc \ $(NULL) ##----------------------------------------------------------------------------- diff --git a/js/src/ipc/CPOWTypes.h b/js/ipc/CPOWTypes.h similarity index 100% rename from js/src/ipc/CPOWTypes.h rename to js/ipc/CPOWTypes.h diff --git a/js/src/ipc/ContextWrapperChild.h b/js/ipc/ContextWrapperChild.h similarity index 100% rename from js/src/ipc/ContextWrapperChild.h rename to js/ipc/ContextWrapperChild.h diff --git a/js/src/ipc/ContextWrapperParent.h b/js/ipc/ContextWrapperParent.h similarity index 100% rename from js/src/ipc/ContextWrapperParent.h rename to js/ipc/ContextWrapperParent.h diff --git a/js/src/ipc/Makefile.in b/js/ipc/Makefile.in similarity index 99% rename from js/src/ipc/Makefile.in rename to js/ipc/Makefile.in index 44719efa779d..671637fb43de 100644 --- a/js/src/ipc/Makefile.in +++ b/js/ipc/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../../.. +DEPTH = ../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/js/src/ipc/ObjectWrapperChild.cpp b/js/ipc/ObjectWrapperChild.cpp similarity index 100% rename from js/src/ipc/ObjectWrapperChild.cpp rename to js/ipc/ObjectWrapperChild.cpp diff --git a/js/src/ipc/ObjectWrapperChild.h b/js/ipc/ObjectWrapperChild.h similarity index 100% rename from js/src/ipc/ObjectWrapperChild.h rename to js/ipc/ObjectWrapperChild.h diff --git a/js/src/ipc/ObjectWrapperParent.cpp b/js/ipc/ObjectWrapperParent.cpp similarity index 100% rename from js/src/ipc/ObjectWrapperParent.cpp rename to js/ipc/ObjectWrapperParent.cpp diff --git a/js/src/ipc/ObjectWrapperParent.h b/js/ipc/ObjectWrapperParent.h similarity index 100% rename from js/src/ipc/ObjectWrapperParent.h rename to js/ipc/ObjectWrapperParent.h diff --git a/js/src/ipc/PContextWrapper.ipdl b/js/ipc/PContextWrapper.ipdl similarity index 100% rename from js/src/ipc/PContextWrapper.ipdl rename to js/ipc/PContextWrapper.ipdl diff --git a/js/src/ipc/PObjectWrapper.ipdl b/js/ipc/PObjectWrapper.ipdl similarity index 100% rename from js/src/ipc/PObjectWrapper.ipdl rename to js/ipc/PObjectWrapper.ipdl diff --git a/js/src/ipc/ipdl.mk b/js/ipc/ipdl.mk similarity index 100% rename from js/src/ipc/ipdl.mk rename to js/ipc/ipdl.mk diff --git a/js/src/ipc/jar.mn b/js/ipc/jar.mn similarity index 100% rename from js/src/ipc/jar.mn rename to js/ipc/jar.mn diff --git a/js/src/ipc/tests/Makefile.in b/js/ipc/tests/Makefile.in similarity index 98% rename from js/src/ipc/tests/Makefile.in rename to js/ipc/tests/Makefile.in index 41687929f4b7..2651ee3eb35b 100644 --- a/js/src/ipc/tests/Makefile.in +++ b/js/ipc/tests/Makefile.in @@ -35,7 +35,7 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = ../../../.. +DEPTH = ../../.. topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/js/src/ipc/tests/adhoc/child.html b/js/ipc/tests/adhoc/child.html similarity index 100% rename from js/src/ipc/tests/adhoc/child.html rename to js/ipc/tests/adhoc/child.html diff --git a/js/src/ipc/tests/adhoc/test.xul b/js/ipc/tests/adhoc/test.xul similarity index 100% rename from js/src/ipc/tests/adhoc/test.xul rename to js/ipc/tests/adhoc/test.xul diff --git a/js/src/ipc/tests/unit/cpow_child.js b/js/ipc/tests/unit/cpow_child.js similarity index 100% rename from js/src/ipc/tests/unit/cpow_child.js rename to js/ipc/tests/unit/cpow_child.js diff --git a/js/src/ipc/tests/unit/test_cpow.js b/js/ipc/tests/unit/test_cpow.js similarity index 100% rename from js/src/ipc/tests/unit/test_cpow.js rename to js/ipc/tests/unit/test_cpow.js diff --git a/toolkit/toolkit-makefiles.sh b/toolkit/toolkit-makefiles.sh index e92d7762a1ee..3bc349b41eed 100644 --- a/toolkit/toolkit-makefiles.sh +++ b/toolkit/toolkit-makefiles.sh @@ -209,7 +209,7 @@ MAKEFILES_xpconnect=" " MAKEFILES_jsipc=" - js/src/ipc/Makefile + js/ipc/Makefile " MAKEFILES_jsdebugger=" diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk index 1ec46aa8b995..7f07a4f15b87 100644 --- a/toolkit/toolkit-tiers.mk +++ b/toolkit/toolkit-tiers.mk @@ -104,7 +104,7 @@ endif # ifdef MOZ_IPC -tier_platform_dirs += ipc js/src/ipc +tier_platform_dirs += ipc js/ipc endif tier_platform_dirs += \