[tor-commits] [tor-messenger-build/master] Fix Windows build of ctypes-otr

[boklm at torproject.org]

commit b092ffc2994aed02e8d8c380aa5335efedb66861
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Nov 27 23:27:31 2014 +0100

    Fix Windows build of ctypes-otr
---
 projects/ctypes-otr/build  |    6 +++---
 projects/ctypes-otr/config |    6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/projects/ctypes-otr/build b/projects/ctypes-otr/build
index 89ed37f..f86c75a 100644
--- a/projects/ctypes-otr/build
+++ b/projects/ctypes-otr/build
@@ -2,11 +2,11 @@
 set -e
 tar xf [% project %]-[% c('version') %].tar.gz
 tar xf [% c('input_files_by_name/libotr') %]
-mv libotr/lib/*.so* [% project %]-[% c('version') %]/chrome/content/
+mv libotr/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/
 tar xf [% c('input_files_by_name/libgcrypt') %]
-mv libgcrypt/lib/*.so* [% project %]-[% c('version') %]/chrome/content/
+mv libgcrypt/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/
 tar xf [% c('input_files_by_name/libgpg-error') %]
-mv libgpg-error/lib/*.so* [% project %]-[% c('version') %]/chrome/content/
+mv libgpg-error/[% c('var/lib_glob') %] [% project %]-[% c('version') %]/chrome/content/
 [% SET src_dir=project _ '-' _ c('version');
    c('tar', {
         tar_src => [src_dir],
diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config
index 4be3f38..8d4a662 100644
--- a/projects/ctypes-otr/config
+++ b/projects/ctypes-otr/config
@@ -3,6 +3,12 @@ version: '[% c("abbrev") %]'
 git_url: https://github.com/arlolra/ctypes-otr
 git_hash: master
 filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
+var:
+  lib_glob: 'lib/*.so*'
+targets:
+  windows-i686:
+    var:
+      lib_glob: 'bin/*.dll'
 input_files:
   - name: libotr
     project: libotr