Permalink
Browse files

Merge pull request #2 from bit/master

Update ipc to work with Firefox 5.0
  • Loading branch information...
darkpixel committed Jul 8, 2011
2 parents e92415f + 23ecb7f commit c00766de30a0d309e3e04a8dc2d4f934d8d69bc6
Showing with 8,053 additions and 11 deletions.
  1. BIN components/firegpg_ipc.dll
  2. BIN components/libfiregpg_ipc.32.so
  3. BIN components/libfiregpg_ipc.64.so
  4. BIN components/libfiregpg_ipc.dylib
  5. +1 −1 content/Core/cgpg.js
  6. +2 −2 install.rdf
  7. +2 −1 ipc/build_linux32.sh
  8. +2 −1 ipc/build_linux64.sh
  9. +2 −2 ipc/build_osx.sh
  10. +1 −1 ipc/build_win32.sh
  11. +3 −3 ipc/chrome.manifest
  12. BIN ipc/firegpg-ipc/.hg/00changelog.i
  13. +1 −0 ipc/firegpg-ipc/.hg/branch
  14. +2 −0 ipc/firegpg-ipc/.hg/branchheads.cache
  15. BIN ipc/firegpg-ipc/.hg/dirstate
  16. +2 −0 ipc/firegpg-ipc/.hg/hgrc
  17. +4 −0 ipc/firegpg-ipc/.hg/requires
  18. BIN ipc/firegpg-ipc/.hg/store/00changelog.i
  19. BIN ipc/firegpg-ipc/.hg/store/00manifest.i
  20. BIN ipc/firegpg-ipc/.hg/store/data/_makefile.in.i
  21. BIN ipc/firegpg-ipc/.hg/store/data/build/_makefile.in.i
  22. BIN ipc/firegpg-ipc/.hg/store/data/build/ns_i_p_c_module.cpp.i
  23. BIN ipc/firegpg-ipc/.hg/store/data/makemake.i
  24. BIN ipc/firegpg-ipc/.hg/store/data/modules/_makefile.in.i
  25. BIN ipc/firegpg-ipc/.hg/store/data/modules/subprocess.jsm.i
  26. BIN ipc/firegpg-ipc/.hg/store/data/public/_makefile.in.i
  27. BIN ipc/firegpg-ipc/.hg/store/data/public/ns_i_i_p_c_buffer.idl.i
  28. BIN ipc/firegpg-ipc/.hg/store/data/public/ns_i_pipe_listener.idl.i
  29. BIN ipc/firegpg-ipc/.hg/store/data/public/ns_i_pipe_transport.idl.i
  30. BIN ipc/firegpg-ipc/.hg/store/data/readme.txt.i
  31. BIN ipc/firegpg-ipc/.hg/store/data/src/_i_p_c_process.cpp.i
  32. BIN ipc/firegpg-ipc/.hg/store/data/src/_i_p_c_process.h.i
  33. BIN ipc/firegpg-ipc/.hg/store/data/src/_makefile.in.i
  34. BIN ipc/firegpg-ipc/.hg/store/data/src/ipc.h.i
  35. BIN ipc/firegpg-ipc/.hg/store/data/src/ns_i_p_c_buffer.cpp.i
  36. BIN ipc/firegpg-ipc/.hg/store/data/src/ns_i_p_c_buffer.h.i
  37. BIN ipc/firegpg-ipc/.hg/store/data/src/ns_pipe_transport.cpp.i
  38. BIN ipc/firegpg-ipc/.hg/store/data/src/ns_pipe_transport.h.i
  39. BIN ipc/firegpg-ipc/.hg/store/data/tests/_ipc_cat.cpp.i
  40. BIN ipc/firegpg-ipc/.hg/store/data/tests/_makefile.in.i
  41. BIN ipc/firegpg-ipc/.hg/store/data/tests/unit/test__ipcbuffer.js.i
  42. BIN ipc/firegpg-ipc/.hg/store/data/tests/unit/test__pipetrans.js.i
  43. BIN ipc/firegpg-ipc/.hg/store/data/tests/unit/test__subprocess.js.i
  44. BIN ipc/firegpg-ipc/.hg/store/data/~2ehgtags.i
  45. +25 −0 ipc/firegpg-ipc/.hg/store/fncache
  46. BIN ipc/firegpg-ipc/.hg/store/undo
  47. +3 −0 ipc/firegpg-ipc/.hg/tags.cache
  48. +1 −0 ipc/firegpg-ipc/.hg/undo.branch
  49. +3 −0 ipc/firegpg-ipc/.hg/undo.desc
  50. 0 ipc/firegpg-ipc/.hg/undo.dirstate
  51. +1 −0 ipc/firegpg-ipc/.hgtags
  52. +53 −0 ipc/firegpg-ipc/Makefile.in
  53. +115 −0 ipc/firegpg-ipc/build/Makefile.in
  54. +69 −0 ipc/firegpg-ipc/build/nsIPCModule.cpp
  55. +193 −0 ipc/firegpg-ipc/makemake
  56. +52 −0 ipc/firegpg-ipc/modules/Makefile.in
  57. +422 −0 ipc/firegpg-ipc/modules/subprocess.jsm
  58. +53 −0 ipc/firegpg-ipc/public/Makefile.in
  59. +122 −0 ipc/firegpg-ipc/public/nsIIPCBuffer.idl
  60. +114 −0 ipc/firegpg-ipc/public/nsIPipeListener.idl
  61. +294 −0 ipc/firegpg-ipc/public/nsIPipeTransport.idl
  62. +16 −0 ipc/firegpg-ipc/readme.txt
  63. +684 −0 ipc/firegpg-ipc/src/IPCProcess.cpp
  64. +195 −0 ipc/firegpg-ipc/src/IPCProcess.h
  65. +89 −0 ipc/firegpg-ipc/src/Makefile.in
  66. +46 −0 ipc/firegpg-ipc/src/ipc.h
  67. +1,074 −0 ipc/firegpg-ipc/src/nsIPCBuffer.cpp
  68. +113 −0 ipc/firegpg-ipc/src/nsIPCBuffer.h
  69. +2,824 −0 ipc/firegpg-ipc/src/nsPipeTransport.cpp
  70. +414 −0 ipc/firegpg-ipc/src/nsPipeTransport.h
  71. +156 −0 ipc/firegpg-ipc/tests/IpcCat.cpp
  72. +62 −0 ipc/firegpg-ipc/tests/Makefile.in
  73. +245 −0 ipc/firegpg-ipc/tests/unit/test_ipcbuffer.js
  74. +342 −0 ipc/firegpg-ipc/tests/unit/test_pipetrans.js
  75. +251 −0 ipc/firegpg-ipc/tests/unit/test_subprocess.js
  76. BIN platform/Darwin_x86-gcc3/components/libipc.dylib
  77. BIN platform/Linux_x86-gcc3/components/libipc.so
  78. BIN platform/Linux_x86_64-gcc3/components/libipc.so
  79. BIN platform/WINNT_x86-msvc/components/ipc.dll
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -176,7 +176,7 @@ FireGPG.Sortage = function(a,b) {
var i = 0;
- while(infosA[i] == infosB[i] && i < infosA.lenght)
+ while(infosA[i] == infosB[i] && i < infosA.length)
i++;
if (infosA[i]<infosB[i]) return -1;
View
@@ -5,11 +5,11 @@
<RDF:Description RDF:about="rdf:#$g5s0x"
em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
- em:minVersion="4.0"
+ em:minVersion="5.0b2"
em:maxVersion="5.0" />
<RDF:Description RDF:about="urn:mozilla:install-manifest"
em:id="firegpg@firegpg.team"
- em:version="0.8"
+ em:version="0.8.5"
em:type="2"
em:unpack="true"
em:name="FireGPG"
View
@@ -1,6 +1,6 @@
#!/bin/bash
name=firegpg
-MOZBUILD=$HOME/src/mozilla-central/obj-ff-release
+MOZBUILD=$HOME/src/mozilla-beta/obj-ff-release
cd `dirname $0`
IPC=`pwd`
@@ -16,4 +16,5 @@ make
COMPONENTS=$IPC/components/
mkdir -p $COMPONENTS
cp ../../dist/bin/components/lib${name}_ipc.so $COMPONENTS/lib${name}_ipc.32.so
+strip $COMPONENTS/lib${name}_ipc.32.so
cp ../../dist/bin/components/${name}_ipc.xpt $COMPONENTS
View
@@ -1,6 +1,6 @@
#!/bin/bash
name=firegpg
-MOZBUILD=$HOME/src/mozilla-central/obj-ff-release
+MOZBUILD=$HOME/src/mozilla-beta/obj-ff-release
cd `dirname $0`
IPC=`pwd`
@@ -16,4 +16,5 @@ make
COMPONENTS=$IPC/components/
mkdir -p $COMPONENTS
cp ../../dist/bin/components/lib${name}_ipc.so $COMPONENTS/lib${name}_ipc.64.so
+strip $COMPONENTS/lib${name}_ipc.64.so
cp ../../dist/bin/components/${name}_ipc.xpt $COMPONENTS
View
@@ -1,6 +1,6 @@
#!/bin/bash
name=firegpg
-MOZBUILD=$HOME/src/mozilla-central/obj-x86_64-apple-darwin10.6.0
+MOZBUILD=$HOME/src/mozilla-beta/obj-x86_64-apple-darwin10.6.0
cd `dirname $0`
IPC=`pwd`
@@ -27,5 +27,5 @@ lipo -create \
-arch i386 $MOZBUILD/i386/dist/bin/components/lib${name}_ipc.dylib \
-arch x86_64 $MOZBUILD/x86_64/dist/bin/components/lib${name}_ipc.dylib \
-output $COMPONENTS/lib${name}_ipc.dylib
-
+strip -S $COMPONENTS/lib${name}_ipc.dylib
cp ../../dist/bin/components/${name}_ipc.xpt $COMPONENTS
View
@@ -1,6 +1,6 @@
#!/bin/sh
name=firegpg
-MOZBUILD=$HOME/src/mozilla-central/ff-opt
+MOZBUILD=$HOME/src/mozilla-beta/ff-opt
cd `dirname $0`
View
@@ -1,10 +1,10 @@
-resource firegpg modules/
+resource firegpg modules/
interfaces components/firegpg_ipc.xpt
binary-component components/libfiregpg_ipc.dylib ABI=Darwin_x86-gcc3
binary-component components/libfiregpg_ipc.dylib ABI=Darwin_x86_64-gcc3
-binary-component components/libfiregpg_ipc.so ABI=Linux_x86_64-gcc3
-binary-component components/libfiregpg_ipc.so ABI=Linux_x86-gcc3
+binary-component components/libfiregpg_ipc.64.so ABI=Linux_x86_64-gcc3
+binary-component components/libfiregpg_ipc.32.so ABI=Linux_x86-gcc3
binary-component components/firegpg_ipc.dll ABI=WINNT_x86-msvc
contract @getfiregpg.org/ipc/ipc-buffer;1 {babce0c1-7ab1-11d4-8f02-a06008948af5}
contract @getfiregpg.org/ipc/pipe-transport;1 {babce001-7ab1-11d4-8f02-a06008948af5}
Binary file not shown.
@@ -0,0 +1 @@
+default
@@ -0,0 +1,2 @@
+3aa8d8e7a70a4ec2fe6fa1499b4c4cbbb7cc3e48 2
+3aa8d8e7a70a4ec2fe6fa1499b4c4cbbb7cc3e48 default
Binary file not shown.
View
@@ -0,0 +1,2 @@
+[paths]
+default = http://hg.mozilla.org/ipccode
@@ -0,0 +1,4 @@
+revlogv1
+store
+fncache
+dotencode
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,25 @@
+data/.hgtags.i
+data/Makefile.in.i
+data/build/Makefile.in.i
+data/build/nsIPCModule.cpp.i
+data/makemake.i
+data/modules/Makefile.in.i
+data/modules/subprocess.jsm.i
+data/public/Makefile.in.i
+data/public/nsIIPCBuffer.idl.i
+data/public/nsIPipeListener.idl.i
+data/public/nsIPipeTransport.idl.i
+data/readme.txt.i
+data/src/IPCProcess.cpp.i
+data/src/IPCProcess.h.i
+data/src/Makefile.in.i
+data/src/ipc.h.i
+data/src/nsIPCBuffer.cpp.i
+data/src/nsIPCBuffer.h.i
+data/src/nsPipeTransport.cpp.i
+data/src/nsPipeTransport.h.i
+data/tests/IpcCat.cpp.i
+data/tests/Makefile.in.i
+data/tests/unit/test_ipcbuffer.js.i
+data/tests/unit/test_pipetrans.js.i
+data/tests/unit/test_subprocess.js.i
Binary file not shown.
@@ -0,0 +1,3 @@
+2 3aa8d8e7a70a4ec2fe6fa1499b4c4cbbb7cc3e48 6c9c742a2408af25fc6db7a39a39ab71a35fbe79
+
+d014d4a1bac10e7131c3a1bb17859034a3839b65 gecko-192
@@ -0,0 +1 @@
+default
@@ -0,0 +1,3 @@
+0
+pull
+http://hg.mozilla.org/ipccode
No changes.
View
@@ -0,0 +1 @@
+d014d4a1bac10e7131c3a1bb17859034a3839b65 gecko-192
@@ -0,0 +1,53 @@
+# **** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "MPL"); you may not use this file
+# except in compliance with the MPL. You may obtain a copy of
+# the MPL at http://www.mozilla.org/MPL/
+#
+# Software distributed under the MPL is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the MPL for the specific language governing
+# rights and limitations under the MPL.
+#
+# The Original Code is protoZilla.
+#
+# The Initial Developer of the Original Code is Ramalingam Saravanan.
+# Portions created by Ramalingam Saravanan <svn@xmlterm.org> are
+# Copyright (C) 2001 Ramalingam Saravanan. All Rights Reserved.
+#
+# Contributor(s):
+# Patrick Brunschwig <patrick@mozilla-enigmail.org>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# 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 = ../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = public \
+ src \
+ build \
+ modules
+
+ifdef ENABLE_TESTS
+ DIRS += tests
+endif
+
+include $(topsrcdir)/config/rules.mk
@@ -0,0 +1,115 @@
+# **** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "MPL"); you may not use this file
+# except in compliance with the MPL. You may obtain a copy of
+# the MPL at http://www.mozilla.org/MPL/
+#
+# Software distributed under the MPL is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the MPL for the specific language governing
+# rights and limitations under the MPL.
+#
+# The Original Code is protoZilla.
+#
+# The Initial Developer of the Original Code is Ramalingam Saravanan.
+# Portions created by Ramalingam Saravanan <svn@xmlterm.org> are
+# Copyright (C) 2001 Ramalingam Saravanan. All Rights Reserved.
+#
+# Contributor(s):
+# Patrick Brunschwig <patrick@mozilla-enigmail.org>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# 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 = ../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+XPI_MODULE = firegpg_ipc
+XPI_MODULE_VERS = 1.3.0
+
+MODULE = firegpg_ipc
+LIBRARY_NAME = firegpg_ipc
+SHORT_LIBNAME = firegpg_ipc
+
+IS_COMPONENT = 1
+FORCE_SHARED_LIB = 1
+EXTRA_BUILD_OPTS =
+
+ifeq ($(OS_ARCH),WINNT)
+ EXPORT_LIBRARY = 0
+ USE_STATIC_LIBS = 1
+ EXTRA_BUILD_OPTS = /NODEFAULTLIB:LIBCMT
+ FORCE_SHARED_LIB = 0
+endif
+
+MOZILLA_VERSION_PARTS = $(subst ., ,$(MOZILLA_VERSION))
+MOZILLA_MAJOR_VERSION = $(firstword $(MOZILLA_VERSION_PARTS))
+TMP_VAR = $(word 2,$(MOZILLA_VERSION_PARTS))
+MOZILLA_MINOR_VERSION = $(shell echo $(TMP_VAR)|sed 's/[a-z].*//')
+
+DEFINES += -DMOZILLA_MAJOR_VERSION=$(MOZILLA_MAJOR_VERSION)
+DEFINES += -DMOZILLA_MINOR_VERSION=$(MOZILLA_MINOR_VERSION)
+
+
+ifdef USE_XPCOM_GLUE
+# Ensure that the xpcom classes that we build
+# do not export themselves
+DEFINES += -D_IMPL_NS_COM_OFF -DXPCOM_GLUE
+endif
+
+REQUIRES = xpcom \
+ string \
+ js \
+ caps \
+ uconv \
+ necko \
+ xpconnect \
+ $(NULL)
+
+MODULE_NAME = IPCModule
+
+CPPSRCS = nsIPCModule.cpp
+
+# hack to build non standard library dependent build on unix
+ifeq ($(IPC_STATIC),1)
+BUILD_STATIC = -nodefaultlibs -Xlinker --unresolved-symbols=ignore-all
+else
+BUILD_STATIC =
+endif
+
+
+SHARED_LIBRARY_LIBS = \
+ ../src/$(LIB_PREFIX)ipc_s.$(LIB_SUFFIX) \
+ $(NULL)
+
+LOCAL_INCLUDES = \
+ -I$(srcdir)/../src \
+ $(NULL)
+
+EXTRA_DSO_LDOPTS = \
+ $(LIBS_DIR) \
+ $(XPCOM_GLUE_LDOPTS) \
+ $(XPCOM_LIBS) \
+ $(NSPR_LIBS) \
+ $(BUILD_STATIC) \
+ $(EXTRA_BUILD_OPTS) \
+ $(NULL)
+
+include $(topsrcdir)/config/rules.mk
@@ -0,0 +1,69 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "MPL"); you may not use this file
+ * except in compliance with the MPL. You may obtain a copy of
+ * the MPL at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the MPL is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the MPL for the specific language governing
+ * rights and limitations under the MPL.
+ *
+ * The Original Code is protoZilla.
+ *
+ * The Initial Developer of the Original Code is Ramalingam Saravanan.
+ * Portions created by Ramalingam Saravanan <svn@xmlterm.org> are
+ * Copyright (C) 2000 Ramalingam Saravanan. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Patrick Brunschwig <patrick@mozilla-enigmail.org>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * 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 ***** */
+
+#include "ipc.h"
+#include "nsIClassInfoImpl.h"
+
+#include "nsPipeTransport.h"
+#include "nsIPCBuffer.h"
+
+#include "mozilla/ModuleUtils.h"
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsPipeTransport)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsIPCBuffer)
+
+NS_DEFINE_NAMED_CID(NS_PIPETRANSPORT_CID);
+NS_DEFINE_NAMED_CID(NS_IPCBUFFER_CID);
+
+const mozilla::Module::CIDEntry kIPCModuleCIDs[] = {
+ { &kNS_PIPETRANSPORT_CID, false, NULL, nsPipeTransportConstructor },
+ { &kNS_IPCBUFFER_CID, false, NULL, nsIPCBufferConstructor },
+ { NULL }
+};
+
+const mozilla::Module::ContractIDEntry kIPCModuleContracts[] = {
+ { NS_PIPETRANSPORT_CONTRACTID, &kNS_PIPETRANSPORT_CID },
+ { NS_IPCBUFFER_CONTRACTID, &kNS_IPCBUFFER_CID },
+ { NULL }
+};
+
+static const mozilla::Module kIPCModule = {
+ mozilla::Module::kVersion,
+ kIPCModuleCIDs,
+ kIPCModuleContracts,
+ NULL
+};
+
+NSMODULE_DEFN(nsIPCModule) = &kIPCModule;
Oops, something went wrong.

0 comments on commit c00766d

Please sign in to comment.