From bfbdc24a6f67056323723b805cd5fa98e30321bc Mon Sep 17 00:00:00 2001 From: "Matthias Huetsch [mhu]" Date: Mon, 8 Nov 2010 18:51:50 +0100 Subject: Workaround multiple sqlite conflict. --- moz/prj/d.lst | 3 +++ 1 file changed, 3 insertions(+) (limited to 'moz') diff --git a/moz/prj/d.lst b/moz/prj/d.lst index dda8503f5f9d..2ecfab53df91 100644 --- a/moz/prj/d.lst +++ b/moz/prj/d.lst @@ -236,5 +236,8 @@ mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete ..\%__SRC%\inc\xpnet\* %_DEST%\inc%_EXT%\mozilla\xpnet ..\%__SRC%\inc\zlib\* %_DEST%\inc%_EXT%\mozilla\zlib ..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete + +mkdir: %_DEST%\lib%_EXT%\sqlite +..\%__SRC%\lib\libsqlite3* %_DEST%\lib%_EXT%\sqlite ..\%__SRC%\lib\* %_DEST%\lib%_EXT% ..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT% -- cgit From 0fef73130574c0c703f248d848fa8c339d7b6991 Mon Sep 17 00:00:00 2001 From: "Matthias Huetsch [mhu]" Date: Mon, 13 Dec 2010 12:24:22 +0100 Subject: Better workaround for multiple sqlite conflict (see module nss/prj/d.lst). --- moz/prj/d.lst | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'moz') diff --git a/moz/prj/d.lst b/moz/prj/d.lst index 2ecfab53df91..df08e6be4371 100644 --- a/moz/prj/d.lst +++ b/moz/prj/d.lst @@ -237,7 +237,20 @@ mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete ..\%__SRC%\inc\zlib\* %_DEST%\inc%_EXT%\mozilla\zlib ..\%__SRC%\inc\xpcom_obsolete\* %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete +..\%__SRC%\lib\libldap50.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libmozjs.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libmozz.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libmsgbaseutil.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libnssckbi.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libnssdbm3.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libnssutil3.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libprldap50.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libxpcom.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libxpcom_compat.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libxpcom_core.* %_DEST%\lib%_EXT% +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT% + mkdir: %_DEST%\lib%_EXT%\sqlite -..\%__SRC%\lib\libsqlite3* %_DEST%\lib%_EXT%\sqlite -..\%__SRC%\lib\* %_DEST%\lib%_EXT% +..\%__SRC%\lib\libsqlite3.* %_DEST%\lib%_EXT%\sqlite + ..\%__SRC%\bin\*.zip %_DEST%\bin%_EXT% -- cgit From 3c07c026b564774c3bf4d3edfa39b169f3dfe990 Mon Sep 17 00:00:00 2001 From: "Matthias Huetsch [mhu]" Date: Fri, 18 Feb 2011 16:23:50 +0100 Subject: #i115784# moz/d.lst: deliver windows libs, too. --- moz/prj/d.lst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'moz') diff --git a/moz/prj/d.lst b/moz/prj/d.lst index df08e6be4371..67bd28bb164b 100644 --- a/moz/prj/d.lst +++ b/moz/prj/d.lst @@ -248,7 +248,8 @@ mkdir: %_DEST%\inc%_EXT%\mozilla\xpcom_obsolete ..\%__SRC%\lib\libxpcom.* %_DEST%\lib%_EXT% ..\%__SRC%\lib\libxpcom_compat.* %_DEST%\lib%_EXT% ..\%__SRC%\lib\libxpcom_core.* %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT% +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT% +..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% mkdir: %_DEST%\lib%_EXT%\sqlite ..\%__SRC%\lib\libsqlite3.* %_DEST%\lib%_EXT%\sqlite -- cgit