diff --git a/allmakefiles.sh b/allmakefiles.sh index 15a18f2b96a0..239a1588c14f 100755 --- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -151,6 +151,7 @@ js/src/liveconnect/classes/Makefile # js/src/xpcom/Makefile js/src/xpconnect/Makefile js/src/xpconnect/public/Makefile +js/src/xpconnect/idl/Makefile js/src/xpconnect/shell/Makefile js/src/xpconnect/src/Makefile js/src/xpconnect/tests/Makefile diff --git a/js/src/xpconnect/idl/Makefile.in b/js/src/xpconnect/idl/Makefile.in new file mode 100644 index 000000000000..e780c36bda3a --- /dev/null +++ b/js/src/xpconnect/idl/Makefile.in @@ -0,0 +1,33 @@ +#!gmake +# +# The contents of this file are subject to the Netscape Public License +# Version 1.0 (the "NPL"); you may not use this file except in +# compliance with the NPL. You may obtain a copy of the NPL at +# http://www.mozilla.org/NPL/ +# +# Software distributed under the NPL is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL +# for the specific language governing rights and limitations under the +# NPL. +# +# The Initial Developer of this code under the NPL is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1999 Netscape Communications Corporation. All Rights +# Reserved. + +DEPTH = ../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +MODULE = xpconnect + +XPIDLSRCS = \ + xpccomponents.idl \ + xpcjsid.idl \ + xpctest.idl \ + $(NULL) + +include $(topsrcdir)/config/rules.mk diff --git a/js/src/xpconnect/idl/makefile.win b/js/src/xpconnect/idl/makefile.win new file mode 100644 index 000000000000..b59d8e8aeb6f --- /dev/null +++ b/js/src/xpconnect/idl/makefile.win @@ -0,0 +1,28 @@ +#!gmake +# +# The contents of this file are subject to the Netscape Public License +# Version 1.0 (the "NPL"); you may not use this file except in +# compliance with the NPL. You may obtain a copy of the NPL at +# http://www.mozilla.org/NPL/ +# +# Software distributed under the NPL is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL +# for the specific language governing rights and limitations under the +# NPL. +# +# The Initial Developer of this code under the NPL is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1999 Netscape Communications Corporation. All Rights +# Reserved. + +DEPTH=..\..\..\.. + +MODULE=xpconnect + +XPIDLSRCS= .\xpccomponents.idl \ + .\xpcjsid.idl \ + .\xpctest.idl \ + $(NULL) + +include <$(DEPTH)\config\rules.mak> + diff --git a/js/src/xpconnect/idl/nsISupports.idl b/js/src/xpconnect/idl/nsISupports.idl deleted file mode 100644 index 1c614c1a022f..000000000000 --- a/js/src/xpconnect/idl/nsISupports.idl +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -#include "nsrootidl.idl" - -%{C++ -#include "nsDebug.h" -#include "nsTraceRefcnt.h" -#include "nsIID.h" -#include "nsError.h" -#include "nsISupportsUtils.h" -%} - -[scriptable, uuid(00000000-0000-0000-c000-000000000046)] -interface nsISupports { - void QueryInterface(in nsIIDRef uuid, - [iid_is(uuid),retval] out nsQIResult result); - [noscript, notxpcom] nsrefcnt AddRef(); - [noscript, notxpcom] nsrefcnt Release(); -}; diff --git a/js/src/xpconnect/idl/nsrootidl.idl b/js/src/xpconnect/idl/nsrootidl.idl deleted file mode 100644 index 6d4b7a106787..000000000000 --- a/js/src/xpconnect/idl/nsrootidl.idl +++ /dev/null @@ -1,57 +0,0 @@ -/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * - * The contents of this file are subject to the Netscape Public License - * Version 1.0 (the "NPL"); you may not use this file except in - * compliance with the NPL. You may obtain a copy of the NPL at - * http://www.mozilla.org/NPL/ - * - * Software distributed under the NPL is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL - * for the specific language governing rights and limitations under the - * NPL. - * - * The Initial Developer of this code under the NPL is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All Rights - * Reserved. - */ - -/* Root idl declarations to be used by all. */ - -%{C++ -/* - * Start commenting out the C++ versions of the below in the output header - */ -#if 0 -%} - -typedef boolean PRBool ; -typedef octet PRUint8 ; -typedef unsigned short PRUint16 ; -typedef unsigned long PRUint32 ; -typedef unsigned long long PRUint64 ; -typedef short PRInt16 ; -typedef long PRInt32 ; -typedef long long PRInt64 ; - -typedef unsigned long nsrefcnt ; - -[ptr] native voidStar(void); -[ref] native voidRef(void); - -[ref, nsid] native nsIDRef(nsID); -[ref, nsid] native nsIIDRef(nsIID); -[ref, nsid] native nsCIDRef(nsCID); - -[ptr, nsid] native nsIDPtr(nsID); -[ptr, nsid] native nsIIDPtr(nsIID); -[ptr, nsid] native nsCIDPtr(nsCID); - -[ptr] native nsQIResult(void); - -%{C++ -/* - * End commenting out the C++ versions of the above in the output header - */ -#endif -%}