Bug 684327 - Move the C++ implementation of the test component into its own subdirectory. r=khuey
authorBobby Holley <bobbyholley@gmail.com>
Sun, 25 Sep 2011 15:37:59 +0100
changeset 78831 de1c69fb961e0ad49bf3447b553c28bca660f694
parent 78830 96405a264d9df003ed88748a8752b6586e5c296a
child 78832 7934b2288e1c8fdac09a32eb3c7c4642ae6baba5
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs684327
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 684327 - Move the C++ implementation of the test component into its own subdirectory. r=khuey
js/src/xpconnect/tests/Makefile.in
js/src/xpconnect/tests/components/Makefile.in
js/src/xpconnect/tests/components/native/Makefile.in
js/src/xpconnect/tests/components/native/xpctest.manifest
js/src/xpconnect/tests/components/native/xpctest_attributes.cpp
js/src/xpconnect/tests/components/native/xpctest_module.cpp
js/src/xpconnect/tests/components/native/xpctest_private.h
js/src/xpconnect/tests/components/xpctest.manifest
js/src/xpconnect/tests/components/xpctest_attributes.cpp
js/src/xpconnect/tests/components/xpctest_module.cpp
js/src/xpconnect/tests/components/xpctest_private.h
--- a/js/src/xpconnect/tests/Makefile.in
+++ b/js/src/xpconnect/tests/Makefile.in
@@ -39,17 +39,17 @@
 DEPTH = ../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = js/src/xpconnect/tests
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = idl mochitest chrome components
+DIRS = idl mochitest chrome components/native
 
 XPCSHELL_TESTS = unit
 
 LIBS = \
   $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
   $(LIBS_DIR) \
   $(MOZ_JS_LIBS) \
   $(MOZ_COMPONENT_LIBS) \
rename from js/src/xpconnect/tests/components/Makefile.in
rename to js/src/xpconnect/tests/components/native/Makefile.in
--- a/js/src/xpconnect/tests/components/Makefile.in
+++ b/js/src/xpconnect/tests/components/native/Makefile.in
@@ -32,17 +32,17 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../../../../..
+DEPTH = ../../../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = xpctest
 LIBRARY_NAME = xpctest
@@ -66,15 +66,15 @@ EXTRA_DSO_LDOPTS += \
   $(MOZ_JS_LIBS) \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 
 DEFINES += -DLIBRARY_FILENAME="$(SHARED_LIBRARY)"
 
-componentdir = js/src/xpconnect/tests/components
+componentdir = js/src/xpconnect/tests/components/native
 
 libs:: $(SHARED_LIBRARY)
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)
 
 libs:: $(MANIFEST_FILE)
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $< > $(testxpcobjdir)/$(componentdir)/$(<F)
rename from js/src/xpconnect/tests/components/xpctest.manifest
rename to js/src/xpconnect/tests/components/native/xpctest.manifest
rename from js/src/xpconnect/tests/components/xpctest_attributes.cpp
rename to js/src/xpconnect/tests/components/native/xpctest_attributes.cpp
rename from js/src/xpconnect/tests/components/xpctest_module.cpp
rename to js/src/xpconnect/tests/components/native/xpctest_module.cpp
--- a/js/src/xpconnect/tests/components/xpctest_module.cpp
+++ b/js/src/xpconnect/tests/components/native/xpctest_module.cpp
@@ -62,18 +62,18 @@ NS_DEFINE_NAMED_CID(NS_XPCTESTOBJECTREAD
 
 static const mozilla::Module::CIDEntry kXPCTestCIDs[] = {
     { &kNS_XPCTESTOBJECTREADONLY_CID, false, NULL, xpcTestObjectReadOnlyConstructor },
     { &kNS_XPCTESTOBJECTREADWRITE_CID, false, NULL, xpcTestObjectReadWriteConstructor },
     { NULL }
 };
 
 static const mozilla::Module::ContractIDEntry kXPCTestContracts[] = {
-    { "@mozilla.org/js/xpc/test/ObjectReadOnly;1", &kNS_XPCTESTOBJECTREADONLY_CID },
-    { "@mozilla.org/js/xpc/test/ObjectReadWrite;1", &kNS_XPCTESTOBJECTREADWRITE_CID },
+    { "@mozilla.org/js/xpc/test/native/ObjectReadOnly;1", &kNS_XPCTESTOBJECTREADONLY_CID },
+    { "@mozilla.org/js/xpc/test/native/ObjectReadWrite;1", &kNS_XPCTESTOBJECTREADWRITE_CID },
     { NULL }
 };
 
 static const mozilla::Module kXPCTestModule = {
     mozilla::Module::kVersion,
     kXPCTestCIDs,
     kXPCTestContracts
 };
rename from js/src/xpconnect/tests/components/xpctest_private.h
rename to js/src/xpconnect/tests/components/native/xpctest_private.h