Permalink
Browse files

Merge bit/master

  • Loading branch information...
2 parents e910f4d + f760be9 commit 07f10c44c87d2958d0db7a55d06f8a3a0c58f611 @darkpixel darkpixel committed Jan 5, 2012
Showing with 1,833 additions and 8,504 deletions.
  1. +1 −2 build.sh
  2. +0 −8 chrome.manifest
  3. BIN components/firegpg_ipc.dll
  4. BIN components/firegpg_ipc.xpt
  5. BIN components/libfiregpg_ipc.32.so
  6. BIN components/libfiregpg_ipc.64.so
  7. BIN components/libfiregpg_ipc.dylib
  8. +1 −1 config_build.sh
  9. +13 −23 content/Core/cgpgaccess.js
  10. +1 −1 install.rdf
  11. +0 −11 ipc/README
  12. +0 −20 ipc/build_linux32.sh
  13. +0 −20 ipc/build_linux64.sh
  14. +0 −31 ipc/build_osx.sh
  15. +0 −21 ipc/build_win32.sh
  16. +0 −10 ipc/chrome.manifest
  17. BIN ipc/firegpg-ipc/.hg/00changelog.i
  18. +0 −1 ipc/firegpg-ipc/.hg/branch
  19. +0 −2 ipc/firegpg-ipc/.hg/branchheads.cache
  20. BIN ipc/firegpg-ipc/.hg/dirstate
  21. +0 −2 ipc/firegpg-ipc/.hg/hgrc
  22. +0 −4 ipc/firegpg-ipc/.hg/requires
  23. BIN ipc/firegpg-ipc/.hg/store/00changelog.i
  24. BIN ipc/firegpg-ipc/.hg/store/00manifest.i
  25. BIN ipc/firegpg-ipc/.hg/store/data/_makefile.in.i
  26. BIN ipc/firegpg-ipc/.hg/store/data/build/_makefile.in.i
  27. BIN ipc/firegpg-ipc/.hg/store/data/build/ns_i_p_c_module.cpp.i
  28. BIN ipc/firegpg-ipc/.hg/store/data/makemake.i
  29. BIN ipc/firegpg-ipc/.hg/store/data/modules/_makefile.in.i
  30. BIN ipc/firegpg-ipc/.hg/store/data/modules/subprocess.jsm.i
  31. BIN ipc/firegpg-ipc/.hg/store/data/public/_makefile.in.i
  32. BIN ipc/firegpg-ipc/.hg/store/data/public/ns_i_i_p_c_buffer.idl.i
  33. BIN ipc/firegpg-ipc/.hg/store/data/public/ns_i_pipe_listener.idl.i
  34. BIN ipc/firegpg-ipc/.hg/store/data/public/ns_i_pipe_transport.idl.i
  35. BIN ipc/firegpg-ipc/.hg/store/data/readme.txt.i
  36. BIN ipc/firegpg-ipc/.hg/store/data/src/_i_p_c_process.cpp.i
  37. BIN ipc/firegpg-ipc/.hg/store/data/src/_i_p_c_process.h.i
  38. BIN ipc/firegpg-ipc/.hg/store/data/src/_makefile.in.i
  39. BIN ipc/firegpg-ipc/.hg/store/data/src/ipc.h.i
  40. BIN ipc/firegpg-ipc/.hg/store/data/src/ns_i_p_c_buffer.cpp.i
  41. BIN ipc/firegpg-ipc/.hg/store/data/src/ns_i_p_c_buffer.h.i
  42. BIN ipc/firegpg-ipc/.hg/store/data/src/ns_pipe_transport.cpp.i
  43. BIN ipc/firegpg-ipc/.hg/store/data/src/ns_pipe_transport.h.i
  44. BIN ipc/firegpg-ipc/.hg/store/data/tests/_ipc_cat.cpp.i
  45. BIN ipc/firegpg-ipc/.hg/store/data/tests/_makefile.in.i
  46. BIN ipc/firegpg-ipc/.hg/store/data/tests/unit/test__ipcbuffer.js.i
  47. BIN ipc/firegpg-ipc/.hg/store/data/tests/unit/test__pipetrans.js.i
  48. BIN ipc/firegpg-ipc/.hg/store/data/tests/unit/test__subprocess.js.i
  49. BIN ipc/firegpg-ipc/.hg/store/data/~2ehgtags.i
  50. +0 −25 ipc/firegpg-ipc/.hg/store/fncache
  51. BIN ipc/firegpg-ipc/.hg/store/undo
  52. +0 −3 ipc/firegpg-ipc/.hg/tags.cache
  53. +0 −1 ipc/firegpg-ipc/.hg/undo.branch
  54. +0 −3 ipc/firegpg-ipc/.hg/undo.desc
  55. 0 ipc/firegpg-ipc/.hg/undo.dirstate
  56. +0 −1 ipc/firegpg-ipc/.hgtags
  57. +0 −53 ipc/firegpg-ipc/Makefile.in
  58. +0 −115 ipc/firegpg-ipc/build/Makefile.in
  59. +0 −69 ipc/firegpg-ipc/build/nsIPCModule.cpp
  60. +0 −193 ipc/firegpg-ipc/makemake
  61. +0 −52 ipc/firegpg-ipc/modules/Makefile.in
  62. +0 −422 ipc/firegpg-ipc/modules/subprocess.jsm
  63. +0 −53 ipc/firegpg-ipc/public/Makefile.in
  64. +0 −122 ipc/firegpg-ipc/public/nsIIPCBuffer.idl
  65. +0 −114 ipc/firegpg-ipc/public/nsIPipeListener.idl
  66. +0 −294 ipc/firegpg-ipc/public/nsIPipeTransport.idl
  67. +0 −16 ipc/firegpg-ipc/readme.txt
  68. +0 −684 ipc/firegpg-ipc/src/IPCProcess.cpp
  69. +0 −195 ipc/firegpg-ipc/src/IPCProcess.h
  70. +0 −89 ipc/firegpg-ipc/src/Makefile.in
  71. +0 −46 ipc/firegpg-ipc/src/ipc.h
  72. +0 −1,074 ipc/firegpg-ipc/src/nsIPCBuffer.cpp
  73. +0 −113 ipc/firegpg-ipc/src/nsIPCBuffer.h
  74. +0 −2,824 ipc/firegpg-ipc/src/nsPipeTransport.cpp
  75. +0 −414 ipc/firegpg-ipc/src/nsPipeTransport.h
  76. +0 −156 ipc/firegpg-ipc/tests/IpcCat.cpp
  77. +0 −62 ipc/firegpg-ipc/tests/Makefile.in
  78. +0 −245 ipc/firegpg-ipc/tests/unit/test_ipcbuffer.js
  79. +0 −342 ipc/firegpg-ipc/tests/unit/test_pipetrans.js
  80. +0 −251 ipc/firegpg-ipc/tests/unit/test_subprocess.js
  81. +0 −33 ipc/get.sh
  82. +1,364 −283 modules/subprocess.jsm
  83. +229 −0 modules/subprocess_worker_unix.js
  84. +224 −0 modules/subprocess_worker_win.js
View
@@ -15,7 +15,6 @@
# skin/ |
#
# defaults/ |
-# components/ |} these must be listed in $ROOT_DIRS in order to be packaged
# ... |
#
# It uses a temporary directory ./build when building; don't use that!
@@ -75,7 +74,7 @@ zip -0 -r $JAR_FILE `cat files` -x '*.svn*'
# The following statement should be used instead if you don't wish to use the JAR file
#cp --verbose --parents `cat files` $TMP_DIR/chrome
-# prepare components and defaults
+# prepare defaults
echo "Copying various files to $TMP_DIR folder..."
for DIR in $ROOT_DIRS; do
mkdir $TMP_DIR/$DIR
View
@@ -41,11 +41,3 @@ style chrome://global/content/customizeToolbar.xul chrome://fire
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.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}
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -4,6 +4,6 @@ APP_NAME=firegpg
CHROME_PROVIDERS="content locale skin"
CLEAN_UP=1
ROOT_FILES="AUTHORS COPYING README"
-ROOT_DIRS="defaults components modules"
+ROOT_DIRS="defaults modules"
BEFORE_BUILD=
AFTER_BUILD=
View
@@ -358,29 +358,29 @@ FireGPG.GPGAccess = {
Parameters:
parameters - The parameters for gnupg.
- sdtIn - The data to send to gnupg on the sdIn
- charset - _Optional_. The charset to read the sdtIn (UTF-8 by default)
+ stdIn - The data to send to gnupg on the sdIn
+ charset - _Optional_. The charset to read the stdIn (UTF-8 by default)
Return:
The sdOut (.out) and the sdErr (.err) of the execution
*/
- runGnupg: function(parameters, sdtIn, charset) {
+ runGnupg: function(parameters, stdIn, charset) {
if (charset == undefined)
charset = "utf-8";
- if (sdtIn == undefined)
- sdtIn = "";
+ if (stdIn == undefined)
+ stdIn = "";
- sdtIn = FireGPG.Misc.EnigConvertFromUnicode(sdtIn, charset);
+ stdIn = FireGPG.Misc.EnigConvertFromUnicode(stdIn, charset);
var outStrObj = new Object();
var outLenObj = new Object();
var errStrObj = new Object();
var errLenObj = new Object();
- FireGPG.debug(this.getGPGCommand() + " " + parameters + "[" + sdtIn + "]",'FireGPGGPGAccessCallerUnixXpcom');
+ FireGPG.debug(this.getGPGCommand() + " " + parameters + "[" + stdIn + "]",'FireGPGGPGAccessCallerUnixXpcom');
var parametersS = parameters.split(/ /gi);
@@ -416,22 +416,12 @@ FireGPG.GPGAccess = {
var p = subprocess.call({
command: this.getGPGCommand(),
arguments: gpgArgs,
- onFinished: subprocess.Terminate(function() {
- retour.out = FireGPG.Misc.EnigConvertToUnicode(retour.out,
- charset);
- retour.err = FireGPG.Misc.EnigConvertToUnicode(retour.err,
- charset);
- }),
- stderr: subprocess.ReadablePipe(function(data) {
- retour.err += data;
- }),
- stdout: subprocess.ReadablePipe(function(data) {
- retour.out += data;
- }),
- stdin: subprocess.WritablePipe(function() {
- this.write(sdtIn);
- this.close();
- })
+ charset: charset,
+ done: function(result) {
+ retour.err = result.stderr;
+ retour.out = result.stdout;
+ },
+ stdin: stdIn
});
p.wait();
return retour;
View
@@ -6,7 +6,7 @@
em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
em:minVersion="6.0"
- em:maxVersion="6.*" />
+ em:maxVersion="10.*" />
<RDF:Description RDF:about="urn:mozilla:install-manifest"
em:id="firegpg@firegpg.team"
em:version="0.8.5"
View
@@ -1,11 +0,0 @@
-ipc needs to be build on each platform
-
-./get.sh this checks out ipc code and patches it for use this extension
-./build_* build scripts for each platform, expects mozilla-central in ~/src/
-
-after building you need to move all files in:
- components/ to extension/components/
- ipc*/modules/subprocess.jsm to extension/modules/subprocess.jsm
-
-add contents of chrome.manifest to extension/chrome.manifest
-
View
@@ -1,20 +0,0 @@
-#!/bin/bash
-name=firegpg
-MOZBUILD=${MOZBUILD:-$HOME/src/mozilla-beta/obj-ff-release}
-
-cd `dirname $0`
-IPC=`pwd`
-
-ln -sf $IPC/$name-ipc $MOZBUILD/../extensions/$name-ipc
-
-cd $MOZBUILD
-../build/autoconf/make-makefile extensions/$name-ipc
-cd $MOZBUILD/extensions/$name-ipc
-make
-
-#install
-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,20 +0,0 @@
-#!/bin/bash
-name=firegpg
-MOZBUILD=${MOZBUILD:-$HOME/src/mozilla-beta/obj-ff-release}
-
-cd `dirname $0`
-IPC=`pwd`
-
-ln -sf $IPC/$name-ipc $MOZBUILD/../extensions/$name-ipc
-
-cd $MOZBUILD
-../build/autoconf/make-makefile extensions/$name-ipc
-cd $MOZBUILD/extensions/$name-ipc
-make
-
-#install
-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,31 +0,0 @@
-#!/bin/bash
-name=firegpg
-MOZBUILD=${MOZBUILD:-$HOME/src/mozilla-beta/obj-x86_64-apple-darwin10.8.0}
-
-cd `dirname $0`
-IPC=`pwd`
-
-rm -rf $MOZBUILD/../extensions/$name-ipc
-cp -r $IPC/$name-ipc $MOZBUILD/../extensions/$name-ipc
-
-arch=i386
-cd $MOZBUILD/$arch
-../../build/autoconf/make-makefile extensions/$name-ipc
-cd $MOZBUILD/$arch/extensions/$name-ipc
-make
-
-arch=x86_64
-cd $MOZBUILD/$arch
-../../build/autoconf/make-makefile extensions/$name-ipc
-cd $MOZBUILD/$arch/extensions/$name-ipc
-make
-
-COMPONENTS=$IPC/components/
-mkdir -p $COMPONENTS
-
-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,21 +0,0 @@
-#!/bin/sh
-name=firegpg
-MOZBUILD=${MOZBUILD:-$HOME/src/mozilla-beta/obj-ff-release}
-
-cd `dirname $0`
-IPC=`pwd`
-
-rm -rf $MOZBUILD/../extensions/$name-ipc
-cp -r $IPC/$name-ipc $MOZBUILD/../extensions/$name-ipc
-
-
-cd $MOZBUILD
-../build/autoconf/make-makefile extensions/$name-ipc
-cd $MOZBUILD/extensions/$name-ipc
-make
-
-#install
-COMPONENTS=$IPC/components/
-mkdir -p $COMPONENTS
-cp ../../dist/bin/components/${name}_ipc.dll $COMPONENTS
-cp ../../dist/bin/components/${name}_ipc.xpt $COMPONENTS
View
@@ -1,10 +0,0 @@
-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.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.
@@ -1 +0,0 @@
-default
@@ -1,2 +0,0 @@
-3aa8d8e7a70a4ec2fe6fa1499b4c4cbbb7cc3e48 2
-3aa8d8e7a70a4ec2fe6fa1499b4c4cbbb7cc3e48 default
Binary file not shown.
View
@@ -1,2 +0,0 @@
-[paths]
-default = http://hg.mozilla.org/ipccode
@@ -1,4 +0,0 @@
-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.
@@ -1,25 +0,0 @@
-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.
@@ -1,3 +0,0 @@
-2 3aa8d8e7a70a4ec2fe6fa1499b4c4cbbb7cc3e48 6c9c742a2408af25fc6db7a39a39ab71a35fbe79
-
-d014d4a1bac10e7131c3a1bb17859034a3839b65 gecko-192
@@ -1 +0,0 @@
-default
@@ -1,3 +0,0 @@
-0
-pull
-http://hg.mozilla.org/ipccode
No changes.
View
@@ -1 +0,0 @@
-d014d4a1bac10e7131c3a1bb17859034a3839b65 gecko-192
@@ -1,53 +0,0 @@
-# **** 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
Oops, something went wrong.

0 comments on commit 07f10c4

Please sign in to comment.