[tor-commits] [tor-messenger-build/master] Windows: don't include libgcrypt and libgpg-error in ctypes-otr

boklm at torproject.org boklm at torproject.org
Thu Jun 11 12:58:04 UTC 2015


commit 008bc47300331ed67c81367b4e1c6eecd57b0c35
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Jun 11 14:55:40 2015 +0200

    Windows: don't include libgcrypt and libgpg-error in ctypes-otr
    
    They are now linked statically in libotr, so we don't need to include
    them.
---
 projects/ctypes-otr/build |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/projects/ctypes-otr/build b/projects/ctypes-otr/build
index 8b0d232..e7e5238 100644
--- a/projects/ctypes-otr/build
+++ b/projects/ctypes-otr/build
@@ -6,11 +6,12 @@ mv libotr/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/conten
 [% IF c('var/windows') -%]
 mv -f [% project %]-[% c('version') %]/chrome/content/libotr-*.dll \
       [% project %]-[% c('version') %]/chrome/content/otr.dll
-[% END -%]
+[% ELSE -%]
 tar xf [% c('input_files_by_name/libgcrypt') %]
 mv libgcrypt/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/
 tar xf [% c('input_files_by_name/libgpg-error') %]
 mv libgpg-error/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/
+[% END -%]
 [% SET src_dir=project _ '-' _ c('version');
    c('tar', {
         tar_src => [src_dir],



More information about the tor-commits mailing list