[Libreoffice-commits] .: 3 commits - fileaccess/prj fpicker/prj linguistic/prj readlicense_oo/prj scripting/prj sfx2/prj shell/prj sysui/prj xmlhelp/prj xmlscript/prj
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Jun 16 16:12:19 PDT 2011
fileaccess/prj/build.lst | 2 +-
fpicker/prj/build.lst | 2 +-
linguistic/prj/d.lst | 2 +-
readlicense_oo/prj/build.lst | 2 +-
scripting/prj/build.lst | 2 +-
sfx2/prj/build.lst | 2 +-
shell/prj/build.lst | 2 +-
sysui/prj/build.lst | 2 +-
xmlhelp/prj/build.lst | 2 +-
xmlscript/prj/d.lst | 1 +
10 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 7eb1a70381c827d4475322d38295fa7d5b39ca88
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Jun 17 01:49:28 2011 +0300
Deliver also a static library
diff --git a/xmlscript/prj/d.lst b/xmlscript/prj/d.lst
index 6a2447a..2461a74 100644
--- a/xmlscript/prj/d.lst
+++ b/xmlscript/prj/d.lst
@@ -3,6 +3,7 @@ mkdir: %_DEST%\inc\xmlscript
..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib
..\%__SRC%\lib\lib*.so %_DEST%\lib\lib*.so
..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
..\inc\xmlscript\xml_helper.hxx %_DEST%\inc\xmlscript\xml_helper.hxx
..\inc\xmlscript\xmldlg_imexp.hxx %_DEST%\inc\xmlscript\xmldlg_imexp.hxx
commit c7c2928aeb6fcec6d45721ee6fd5967de726ffc4
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 11:32:58 2011 +0300
Correct the static library name
diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst
index ed24c0a..f983a5e 100644
--- a/linguistic/prj/d.lst
+++ b/linguistic/prj/d.lst
@@ -1,6 +1,6 @@
..\%__SRC%\bin\lng* %_DEST%\bin\lng*
..\%__SRC%\lib\ilng* %_DEST%\lib\ilng*
-..\%__SRC%\lib\liblng.a %_DEST%\lib\liblng.a
+..\%__SRC%\lib\liblng*.a %_DEST%\lib\liblng*.a
..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
..\%__SRC%\lib\liblng*.so %_DEST%\lib\liblng*.so
commit 5ce25e363575b64cd21515cb668a8b7350f510ae
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Jun 16 01:17:09 2011 +0300
Use DESKTOP and NATIVE where appropriate
diff --git a/fileaccess/prj/build.lst b/fileaccess/prj/build.lst
index a378698..8ec9888 100644
--- a/fileaccess/prj/build.lst
+++ b/fileaccess/prj/build.lst
@@ -1,2 +1,2 @@
-fa fileaccess : unotools rdbmaker tools ucbhelper LIBXSLT:libxslt NULL
+fa fileaccess : unotools DESKTOP:rdbmaker tools ucbhelper LIBXSLT:libxslt NULL
fa fileaccess\prj nmake - all fa_prj NULL
diff --git a/fpicker/prj/build.lst b/fpicker/prj/build.lst
index 6b8fb2d..07d4d4d 100644
--- a/fpicker/prj/build.lst
+++ b/fpicker/prj/build.lst
@@ -1,4 +1,4 @@
-fp fpicker : LIBXSLT:libxslt TRANSLATIONS:translations rdbmaker svtools NULL
+fp fpicker : LIBXSLT:libxslt TRANSLATIONS:translations DESKTOP:rdbmaker svtools NULL
fp fpicker\inc nmake - all fp_inc NULL
fp fpicker\source\generic nmake - all fp_generic fp_inc NULL
fp fpicker\source\office nmake - all fp_office fp_inc NULL
diff --git a/readlicense_oo/prj/build.lst b/readlicense_oo/prj/build.lst
index c043ef4..6d215ee 100644
--- a/readlicense_oo/prj/build.lst
+++ b/readlicense_oo/prj/build.lst
@@ -1,4 +1,4 @@
-ro readlicense_oo : TRANSLATIONS:translations l10ntools solenv LIBXSLT:libxslt NULL
+ro readlicense_oo : TRANSLATIONS:translations DESKTOP:l10ntools solenv LIBXSLT:libxslt NULL
ro readlicense_oo usr1 - all ro_root NULL
ro readlicense_oo\docs\readme nmake - all ro_readme NULL
ro readlicense_oo nmake - all ro_conv NULL
diff --git a/scripting/prj/build.lst b/scripting/prj/build.lst
index 50bb1f3..eb57d2b 100644
--- a/scripting/prj/build.lst
+++ b/scripting/prj/build.lst
@@ -1,4 +1,4 @@
-tc scripting : filter oovbaapi vbahelper bridges rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
+tc scripting : filter oovbaapi vbahelper bridges DESKTOP:rdbmaker vcl xmlscript basic sfx2 rhino BSH:beanshell javaunohelper LIBXSLT:libxslt NULL
tc scripting usr1 - all tc1_mkout NULL
tc scripting\inc nmake - all tc1_inc NULL
tc scripting\source\provider nmake - all tc1_scriptingprovider tc1_inc NULL
diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst
index 32f90ba..3126d35 100644
--- a/sfx2/prj/build.lst
+++ b/sfx2/prj/build.lst
@@ -1,3 +1,3 @@
-sf sfx2 : TRANSLATIONS:translations idl basic xmlscript framework readlicense_oo shell setup_native sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
+sf sfx2 : TRANSLATIONS:translations NATIVE:idl basic xmlscript framework readlicense_oo shell DESKTOP:setup_native sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
sf sfx2\prj nmake - all sf_prj NULL
diff --git a/shell/prj/build.lst b/shell/prj/build.lst
index db52730..635ed20 100644
--- a/shell/prj/build.lst
+++ b/shell/prj/build.lst
@@ -1,4 +1,4 @@
-sl shell : TRANSLATIONS:translations offuh rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL
+sl shell : TRANSLATIONS:translations offuh DESKTOP:rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL
sl shell\inc nmake - all sl_inc NULL
sl shell\source\win32 nmake - w sl_win32 sl_inc NULL
sl shell\source\win32\simplemail nmake - w sl_win32_simplemail sl_inc NULL
diff --git a/sysui/prj/build.lst b/sysui/prj/build.lst
index f44ee33..cc14490 100644
--- a/sysui/prj/build.lst
+++ b/sysui/prj/build.lst
@@ -1,4 +1,4 @@
-su sysui : TRANSLATIONS:translations offapi xml2cmp rdbmaker l10ntools setup_native NULL
+su sysui : TRANSLATIONS:translations offapi xml2cmp DESKTOP:rdbmaker DESKTOP:l10ntools DESKTOP:setup_native NULL
#su sysui\source\win32\QuickStart nmake - w su_win32_quickstart NULL
#su sysui\source\win32\QuickStart\so nmake - w su_win32_quickstart_so su_win32_quickstart.w NULL
su sysui\desktop\icons nmake - w su_iconsw NULL
diff --git a/xmlhelp/prj/build.lst b/xmlhelp/prj/build.lst
index 00e285c..4594f27 100644
--- a/xmlhelp/prj/build.lst
+++ b/xmlhelp/prj/build.lst
@@ -1,4 +1,4 @@
-xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb LUCENE:lucene javaunohelper l10ntools unotools NULL
+xh xmlhelp : comphelper ucbhelper LIBXSLT:libxslt unoil BERKELEYDB:berkeleydb LUCENE:lucene javaunohelper DESKTOP:l10ntools unotools NULL
xh xmlhelp usr1 - all xh_mkout NULL
xh xmlhelp\inc nmake - all xh_inc NULL
xh xmlhelp\source\treeview nmake - all xh_treeview xh_inc NULL
More information about the Libreoffice-commits
mailing list