[Libreoffice-commits] .: 2 commits - scp2/inc scp2/source solenv/bin

Petr Mladek pmladek at kemper.freedesktop.org
Thu Dec 1 09:45:18 PST 2011


 scp2/inc/macros.inc                                |    7 
 scp2/source/activex/file_activex.scp               |    8 
 scp2/source/canvas/cairocanvas.scp                 |    2 
 scp2/source/canvas/mtfrenderer.scp                 |    2 
 scp2/source/crashrep/file_crashrep.scp             |    2 
 scp2/source/gnome/file_gnome.scp                   |    8 
 scp2/source/impress/module_ogltrans.scp            |    2 
 scp2/source/javafilter/file_javafilter.scp         |    4 
 scp2/source/kde/file_kde.scp                       |    4 
 scp2/source/ooo/file_library_ooo.scp               |  250 ++++++++++-----------
 scp2/source/ooo/ure.scp                            |   94 +++----
 scp2/source/python/file_python.scp                 |    8 
 scp2/source/winexplorerext/file_winexplorerext.scp |   16 -
 solenv/bin/modules/installer/profiles.pm           |    2 
 14 files changed, 206 insertions(+), 203 deletions(-)

New commits:
commit 2578d13ea8bf7b3918e392a3fabca7ba2fec3146
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Nov 30 16:48:22 2011 +0100

    add exectuable rights for libraries on Linux
    
    RPM strips debuginfo packages from libraries only when they have
    execuateble rights
    
    It does not fix permissions of the prebuilt mozilla libraries; scp2 defines
    the same permissions for all files inside the mozruntime.zip archive.
    Unfortuantely, it icludes libraries and data files togetger.

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 8120b12..04e0179 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -90,6 +90,9 @@
 #define BIN_FILE_BODY \
         UnixRights   = 755
 
+#define LIB_FILE_BODY \
+        UnixRights   = 755
+
 #define TXT_FILE_BODY \
         UnixRights   = 644
 
@@ -131,12 +134,12 @@
         Styles = (ARCHIVE,SUBSTITUTE,PATCH)
 
 #define PACKED_LIB_FILE_BODY \
-        TXT_FILE_BODY; \
+        LIB_FILE_BODY; \
         Styles = (PACKED); \
         Dir    = SCP2_OOO_BIN_DIR
 
 #define PACKED_LIB_FILE_BODY_PATCH \
-        TXT_FILE_BODY; \
+        LIB_FILE_BODY; \
         Styles = (PACKED,PATCH); \
         Dir    = SCP2_OOO_BIN_DIR
 
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index db9b028..2ff8583 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -30,7 +30,7 @@
 #ifdef WITH_ACTIVEX_COMPONENT
 
 File gid_File_Lib_Soactivex
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "so_activex.dll";
@@ -38,7 +38,7 @@ End
 
 #ifdef BUILD_X64
 	File gid_File_Lib_Soactivex64
-		TXT_FILE_BODY;
+		LIB_FILE_BODY;
 		Styles = (PACKED);
 		Dir = SCP2_OOO_BIN_DIR;
 		Name = "so_activex_x64.dll";
@@ -47,14 +47,14 @@ End
 #endif
 
 File gid_File_Lib_Regactivex_Msi
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "regactivex.dll";
 End
 
 File gid_File_Lib_Regpatchactivex_Msi
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "regpatchactivex.dll";
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
index 2d7af53..4b313bc 100644
--- a/scp2/source/canvas/cairocanvas.scp
+++ b/scp2/source/canvas/cairocanvas.scp
@@ -28,7 +28,7 @@
 #include "macros.inc"
 
 File gid_File_Lib_CairoCanvas
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp
index 7e239be..da372b2 100644
--- a/scp2/source/canvas/mtfrenderer.scp
+++ b/scp2/source/canvas/mtfrenderer.scp
@@ -28,7 +28,7 @@
 #include "macros.inc"
 
 File gid_File_Lib_MtfRenderer
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED,UNO_COMPONENT);
     RegistryID = gid_Starregistry_Services_Rdb;
     Dir = SCP2_OOO_BIN_DIR;
diff --git a/scp2/source/crashrep/file_crashrep.scp b/scp2/source/crashrep/file_crashrep.scp
index 53ec1ac..481d9fc 100644
--- a/scp2/source/crashrep/file_crashrep.scp
+++ b/scp2/source/crashrep/file_crashrep.scp
@@ -55,7 +55,7 @@ End
 #ifdef WNT
 
 File gid_Brand_File_Lib_Dbghelp
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Name = "dbghelp.dll";
     Dir = gid_Brand_Dir_Program;
     Styles = (PACKED);
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index e3d2baf..27968b5 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -28,7 +28,7 @@
 
 #ifdef ENABLE_GIO
 File gid_File_Lib_GIO
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
@@ -37,7 +37,7 @@ End
 
 #ifdef ENABLE_GNOMEVFS
 File gid_File_Lib_Gnomevfs
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX));
@@ -55,7 +55,7 @@ End
 
 #ifdef ENABLE_GCONF
 File gid_File_Lib_Gconfbe
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
@@ -65,7 +65,7 @@ End
 #ifdef ENABLE_SYSTRAY_GTK
 File gid_File_Lib_QStart_Gtk
     Name = LIBNAME(qstart_gtk);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index 91d5a4e..409ff9b 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -37,7 +37,7 @@ Module gid_Module_Optional_OGLTrans
 End
 
 File gid_File_Lib_OpenGLTransitions
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index 614b120..906bf06 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -30,7 +30,7 @@
 #ifdef WNT
 
 File gid_File_Lib_Xmergesync
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "xmergesync.dll";
@@ -41,7 +41,7 @@ End
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_Jfregca
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "jfregca.dll";
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
index 4faff69..1614f69 100644
--- a/scp2/source/kde/file_kde.scp
+++ b/scp2/source/kde/file_kde.scp
@@ -28,7 +28,7 @@
 
 #ifdef ENABLE_KDE
 File gid_File_Lib_Kdebe
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX));
@@ -37,7 +37,7 @@ End
 
 #ifdef ENABLE_KDE4
 File gid_File_Lib_Kde4be
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(kde4be1.uno,UNXSUFFIX));
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a332793..8169eef 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -28,7 +28,7 @@
 
 #if defined SOLAR_JAVA && defined WNT
 File gid_File_Lib_Accessbridge
-    BIN_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "java_uno_accessbridge.dll";
@@ -42,7 +42,7 @@ STD_LIB_FILE( gid_File_Lib_Ado, ado)
 STD_LIB_FILE( gid_File_Lib_Basctl, basctl)
 
 File gid_File_Lib_Basprov
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -53,7 +53,7 @@ File gid_File_Lib_Basprov
 End
 
 File gid_File_Lib_Vbaevent
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -66,7 +66,7 @@ End
 STD_LIB_FILE( gid_File_Lib_Bib , bib)
 
 File gid_File_Lib_Cached1
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -80,7 +80,7 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno)
 
 #ifdef WITH_LDAP
 File gid_File_Lib_Ldapbe2
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -149,7 +149,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Cmdmail, cmdmail.uno )
 
 
 File gid_File_Lib_Comphelper2
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT3(libcomphelp,COMID,UNXSUFFIX));
   #else
@@ -166,7 +166,7 @@ STD_LIB_FILE( gid_File_Lib_Cui, cui)
 #ifndef SYSTEM_CURL
 
 File gid_File_Lib_Curl
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -189,7 +189,7 @@ End
 #ifndef SYSTEM_DB
 
 File gid_File_Lib_Db
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -206,7 +206,7 @@ End
 #ifdef ENABLE_SYSTRAY_GTK
 File gid_File_Lib_QStart_Gtk
     Name = LIBNAME(qstart_gtk);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -227,7 +227,7 @@ STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase)
 
 
 File gid_File_Lib_Dbpool
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -242,7 +242,7 @@ STD_LIB_FILE( gid_File_Lib_Dbt, dbtools )
 STD_LIB_FILE( gid_File_Lib_Dbaxml, dbaxml )
 
 File gid_File_Lib_Dict_Ja
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libdict_ja,UNXSUFFIX));
   #else
@@ -253,7 +253,7 @@ File gid_File_Lib_Dict_Ja
 End
 
 File gid_File_Lib_Dict_Zh
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libdict_zh,UNXSUFFIX));
   #else
@@ -264,7 +264,7 @@ File gid_File_Lib_Dict_Zh
 End
 
 File gid_File_Lib_Collator_Data
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libcollator_data,UNXSUFFIX));
   #else
@@ -275,7 +275,7 @@ File gid_File_Lib_Collator_Data
 End
 
 File gid_File_Lib_Index_Data
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libindex_data,UNXSUFFIX));
   #else
@@ -286,7 +286,7 @@ File gid_File_Lib_Index_Data
 End
 
 File gid_File_Lib_Textconv_Dict
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libtextconv_dict,UNXSUFFIX));
   #else
@@ -297,7 +297,7 @@ File gid_File_Lib_Textconv_Dict
 End
 
 File gid_File_Lib_Dlgprov
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -308,7 +308,7 @@ File gid_File_Lib_Dlgprov
 End
 
 File gid_File_Lib_Stringresource
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -319,7 +319,7 @@ File gid_File_Lib_Stringresource
 End
 
 File gid_File_Lib_Vbaobj
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -330,7 +330,7 @@ File gid_File_Lib_Vbaobj
 End
 
 File gid_File_Lib_Vbaswobj
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -341,7 +341,7 @@ File gid_File_Lib_Vbaswobj
 End
 
 File gid_File_Lib_Vbamsforms
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -352,7 +352,7 @@ File gid_File_Lib_Vbamsforms
 End
 
 File gid_File_Lib_Vbahelper
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -366,7 +366,7 @@ End
 #ifdef WNT
 
 File gid_File_Lib_Dnd
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "dnd.dll";
@@ -377,7 +377,7 @@ End
 #ifdef WNT
 
 File gid_File_Lib_Dtrans
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Name = "dtrans.dll";
     Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
@@ -398,7 +398,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
 STD_LIB_FILE( gid_File_Lib_Emser, emser )
 
 File gid_File_Lib_Inprocserv
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "inprocserv.dll";
@@ -410,14 +410,14 @@ End
 
 #ifdef ENABLE_KAB
 File gid_File_Lib_Kab_1
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libkab1,UNXSUFFIX));
 End
 
 File gid_File_Lib_Kab_Drv_1
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libkabdrv1,UNXSUFFIX));
@@ -427,14 +427,14 @@ End
 
 #ifdef MACOSX
 File gid_File_Lib_Macab_1
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libmacab1,UNXSUFFIX));
 End
 
 File gid_File_Lib_Macab_Drv_1
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX));
@@ -461,7 +461,7 @@ STD_LIB_FILE( gid_File_Lib_Flat, flat)
 #ifdef WNT
 
 File gid_File_Lib_Fop
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "fop.dll";
@@ -472,7 +472,7 @@ End
 #ifdef WNT
 
 File gid_File_Lib_Fps
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "fps.dll";
@@ -483,7 +483,7 @@ End
 #if defined UNX && ! defined MACOSX
 
 File gid_File_Lib_Desktopbe
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
@@ -492,7 +492,7 @@ End
 #ifdef ENABLE_KDE4
 #ifndef MACOSX
 File gid_File_Lib_Fps_Kde4
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde4.uno);
@@ -502,7 +502,7 @@ End
 #ifdef ENABLE_KDE
 #ifndef MACOSX
 File gid_File_Lib_Fps_Kde
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde.uno);
@@ -519,21 +519,21 @@ End
 
 #ifdef QUARTZ
 File gid_File_Lib_Fps_Aqua
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
 End
 
 File gid_File_Lib_MacOSXSpell
-	TXT_FILE_BODY;
+	LIB_FILE_BODY;
 	Styles = (PACKED);
 	Name = LIBNAME(MacOSXSpell);
 	Dir = SCP2_OOO_BIN_DIR;
 End
 
 File gid_File_Lib_avmediaQuickTime
-	TXT_FILE_BODY;
+	LIB_FILE_BODY;
 	Styles = (PACKED);
 	Name = LIBNAME(avmediaQuickTime);
 	Dir = SCP2_OOO_BIN_DIR;
@@ -551,7 +551,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
 #ifndef SYSTEM_CAIRO
 
 File gid_File_Lib_Cairo
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -572,7 +572,7 @@ End
 #ifndef WNT
 
 File gid_File_Lib_Pixman
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -595,7 +595,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fsstorage, fsstorage.uno )
 #ifdef WNT
 
 File gid_File_Lib_Ftransl
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "ftransl.dll";
@@ -609,7 +609,7 @@ STD_LIB_FILE( gid_File_Lib_Fwi , fwi)
 
 File gid_File_Lib_Fwk
     Name = LIBNAME(fwk);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -620,7 +620,7 @@ STD_LIB_FILE( gid_File_Lib_Fwm , fwm)
 
 #ifdef ENABLE_DIRECTX
 File gid_File_Lib_Gdiplus
-    BIN_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "gdiplus.dll";
@@ -632,7 +632,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Hatchwindowfactory, hatchwindowfactory.
 STD_LIB_FILE( gid_File_Lib_Helplinker, helplinker)
 
 File gid_File_Lib_I18npool
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -645,7 +645,7 @@ End
 STD_LIB_FILE( gid_File_I18nregexp, i18nregexp )
 
 File gid_File_Lib_I18nsearch
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -665,7 +665,7 @@ File gid_File_Lib_I18nisolang
 End
 
 File gid_File_Lib_I18nutil
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT3(libi18nutil,COMID,UNXSUFFIX));
   #else
@@ -680,7 +680,7 @@ STD_LIB_FILE( gid_File_Lib_I18npaper, i18npaper)
 #ifndef SYSTEM_ICU
 
 File gid_File_Lib_Icudata
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT7(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
   #else
@@ -691,7 +691,7 @@ File gid_File_Lib_Icudata
 End
 
 File gid_File_Lib_Icui18n
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT7(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
   #else
@@ -702,7 +702,7 @@ File gid_File_Lib_Icui18n
 End
 
 File gid_File_Lib_Icule
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT7(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
   #else
@@ -713,7 +713,7 @@ File gid_File_Lib_Icule
 End
 
 File gid_File_Lib_Icuuc
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT7(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO));
   #else
@@ -733,7 +733,7 @@ STD_LIB_FILE( gid_File_Lib_Jdbc, jdbc)
 
 #ifdef SOLAR_JAVA
 File gid_File_Lib_Hsqldb_2
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -748,7 +748,7 @@ End
 #ifdef WNT
 
 File gid_File_Lib_Lngpckinsthlp
-    BIN_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED, LANGUAGEPACK, BINARYTABLE, BINARYTABLE_ONLY);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "lngpckinsthlp.dll";
@@ -759,7 +759,7 @@ End
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_sn_tools
-    BIN_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "sn_tools.dll";
@@ -770,7 +770,7 @@ End
 #ifdef WNT
 
 File gid_File_Lib_Patchmsi
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Name = "patchmsi.dll";
     Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
@@ -781,7 +781,7 @@ End
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_Rebasemsi
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Name = "rebase.dll";
     Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
@@ -792,7 +792,7 @@ End
 STD_LIB_FILE( gid_File_Lib_Lng, lng)
 
 File gid_File_Lib_Localedata_En
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(liblocaledata_en,UNXSUFFIX));
   #else
@@ -803,7 +803,7 @@ File gid_File_Lib_Localedata_En
 End
 
 File gid_File_Lib_Localedata_Es
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(liblocaledata_es,UNXSUFFIX));
   #else
@@ -814,7 +814,7 @@ File gid_File_Lib_Localedata_Es
 End
 
 File gid_File_Lib_Localedata_Euro
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(liblocaledata_euro,UNXSUFFIX));
   #else
@@ -825,7 +825,7 @@ File gid_File_Lib_Localedata_Euro
 End
 
 File gid_File_Lib_Localedata_Others
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(liblocaledata_others,UNXSUFFIX));
   #else
@@ -836,7 +836,7 @@ File gid_File_Lib_Localedata_Others
 End
 
 File gid_File_Lib_Mcnttype
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -854,7 +854,7 @@ STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv)
 #else
 
 File gid_File_Lib_Mozbootstrap
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -902,7 +902,7 @@ STD_LIB_FILE(gid_File_Lib_Officebean, officebean)
 #if defined(WNT) && !defined(DISABLE_ATL)
 
 File gid_File_Lib_Ole
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "oleautobridge.uno.dll";
@@ -933,13 +933,13 @@ STD_LIB_FILE( gid_File_Lib_Pl , pl)
 #if defined(UNX) && ! defined(QUARTZ)
 File gid_File_Lib_Desktop_Detector
     Name = LIBNAME(desktop_detector);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 File gid_File_Lib_Vclplug_Gen
     Name = LIBNAME(vclplug_gen);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -949,7 +949,7 @@ End
 #ifdef ENABLE_GTK
 File gid_File_Lib_Vclplug_Gtk
     Name = LIBNAME(vclplug_gtk);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -957,7 +957,7 @@ End
 #ifdef ENABLE_GTK3
 File gid_File_Lib_Vclplug_Gtk3
     Name = LIBNAME(vclplug_gtk3);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -966,7 +966,7 @@ End
 #ifndef MACOSX
 File gid_File_Lib_Vclplug_Kde
     Name = LIBNAME(vclplug_kde);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -976,7 +976,7 @@ End
 #ifndef MACOSX
 File gid_File_Lib_Vclplug_Kde4
     Name = LIBNAME(vclplug_kde4);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -987,7 +987,7 @@ End
 #if defined(QUARTZ)
 File gid_File_Lib_AppleRemote
     Name = LIBNAME(AppleRemote);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -996,7 +996,7 @@ End
 #if defined(QUARTZ)
 File gid_File_Lib_Basebmp
     Name = LIBNAME(basebmp);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -1010,7 +1010,7 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #if defined UNX && ! defined MACOSX
 
 File gid_File_Lib_Recentfile
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
@@ -1021,14 +1021,14 @@ End
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_Reg4allmsdoc
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "reg4allmsdoc.dll";
 End
 
 File gid_File_Lib_Qslnkmsi
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "qslnkmsi.dll";
@@ -1036,7 +1036,7 @@ End
 
 
 File gid_File_Lib_Sdqsmsi
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "sdqsmsi.dll";
@@ -1046,13 +1046,13 @@ End
 
 File gid_File_Lib_Res
     Name = LIBNAME(res);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
 
 File gid_File_Lib_Expwrap_Uno
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED,DONT_OVERWRITE);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1063,7 +1063,7 @@ File gid_File_Lib_Expwrap_Uno
 End
 
 File gid_File_Lib_Fastsax_Uno
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED,DONT_OVERWRITE);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1082,7 +1082,7 @@ STD_LIB_FILE( gid_File_Lib_Sb , sb)
 STD_LIB_FILE( gid_File_Lib_Scn, scn)
 
 File gid_File_Lib_Scriptframe
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     #ifdef MACOSX
        Name = "libscriptframe.dylib";
@@ -1100,7 +1100,7 @@ STD_LIB_FILE( gid_File_Lib_Sd , sd)
 STD_LIB_FILE( gid_File_Lib_Sdui, sdui)
 
 File gid_File_Lib_Slideshow
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1111,7 +1111,7 @@ File gid_File_Lib_Slideshow
 End
 
 File gid_File_Lib_Sdbc_2
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1127,7 +1127,7 @@ STD_LIB_FILE( gid_File_Lib_Sf_Prothdlr, protocolhandler )
 
 File gid_File_Lib_Sfx
     Name = LIBNAME(sfx);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -1135,7 +1135,7 @@ End
 #ifdef WNT
 
 File gid_File_Lib_Instooofiltmsi
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "instooofiltmsi.dll";
@@ -1146,7 +1146,7 @@ End
 #ifdef WNT
 
 File gid_File_Lib_Smplmail
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "smplmail.uno.dll";
@@ -1160,7 +1160,7 @@ STD_LIB_FILE( gid_File_Lib_Sot, sot )
 
 File gid_File_Lib_Spa
     Name = LIBNAME(spa);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -1168,7 +1168,7 @@ End
 #endif
 
 File gid_File_Lib_Spell
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Name = LIBNAME(spell);
     Dir = SCP2_OOO_BIN_DIR;
@@ -1205,7 +1205,7 @@ STD_LIB_FILE( gid_File_Lib_Merged, merged )
 
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "sysdtrans.dll";
@@ -1229,7 +1229,7 @@ STD_LIB_FILE( gid_File_Lib_Acc, acc )
 STD_LIB_FILE( gid_File_Lib_Tools, tl )
 
 File gid_File_Lib_Tvhlp1
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1240,7 +1240,7 @@ File gid_File_Lib_Tvhlp1
 End
 
 File gid_File_Lib_Ucb1
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1251,7 +1251,7 @@ File gid_File_Lib_Ucb1
 End
 
 File gid_File_Lib_Ucbhelper
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Styles = (PACKED);
   #ifdef UNX
@@ -1262,7 +1262,7 @@ File gid_File_Lib_Ucbhelper
 End
 
 File gid_File_Lib_Ucpchelp1
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libucpchelp1,UNXSUFFIX));
   #else
@@ -1300,14 +1300,14 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
 
 File gid_File_Lib_Lnth
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Name = LIBNAME(lnth);
     Dir = SCP2_OOO_BIN_DIR;
 End
 
 File gid_File_Lib_Hyph
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Name = LIBNAME(hyphen);
     Dir = SCP2_OOO_BIN_DIR;
@@ -1321,7 +1321,7 @@ STD_LIB_FILE( gid_File_Lib_BaseGfx, basegfx )
 
 File gid_File_Lib_Vcl
     Name = LIBNAME(vcl);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -1332,7 +1332,7 @@ STD_LIB_FILE( gid_File_Lib_Xof , xof)
 
 File gid_File_Lib_Xo
     Name = LIBNAME(xo);
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 End
@@ -1352,7 +1352,7 @@ STD_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
 
 #ifndef SYSTEM_LIBXSLT
 File gid_File_Lib_Xslt
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1386,7 +1386,7 @@ SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
 #endif
 
 File gid_File_Lib_XSec_XMLSecurity
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
 	#ifdef UNX
         Name = STRING(CONCAT2(libxmlsecurity,UNXSUFFIX));
     #else
@@ -1397,7 +1397,7 @@ File gid_File_Lib_XSec_XMLSecurity
 End
 
 File gid_File_Lib_XSec_Framework
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
 	#ifdef UNX
         Name = STRING(CONCAT2(libxsec_fw,UNXSUFFIX));
     #else
@@ -1409,7 +1409,7 @@ End
 
 #if defined(ENABLE_XMLSEC)
 File gid_File_Lib_XSec_XmlSec
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     #ifdef UNX
         Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX));
     #else
@@ -1421,7 +1421,7 @@ End
 
 #ifdef WNT
 File gid_File_Lib_LibXMLSec_xmlseccore
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     #ifdef _gcc3
       Name = "libxmlsec1.dll";
     #else
@@ -1432,7 +1432,7 @@ File gid_File_Lib_LibXMLSec_xmlseccore
 End
 
 File gid_File_Lib_LibXMLSec_xmlsecmscrypto
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef _gcc3
     Name = "libxmlsec1-mscrypto.dll";
   #else
@@ -1445,7 +1445,7 @@ End
 #endif
 
 File gid_File_Lib_Migrationoo2
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1456,7 +1456,7 @@ File gid_File_Lib_Migrationoo2
 End
 
 File gid_File_Lib_Migrationoo3
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1468,7 +1468,7 @@ End
 
 #if defined(WNT) && !defined(SYSTEM_LIBEXTTEXTCAT)
 File gid_File_Lib_Libtextcat
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "libexttextcat.dll";
@@ -1483,7 +1483,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno )
 
 #ifdef WNT
 File gid_File_Lib_Onlinecheck
-    BIN_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "onlinecheck.dll";
@@ -1492,7 +1492,7 @@ End
 
 #ifndef SYSTEM_OPENSSL
 File gid_File_Lib_Openssl
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef WNT
@@ -1503,7 +1503,7 @@ End
 
 #ifndef SYSTEM_OPENSSL
 File gid_File_Lib_Crypto
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 
@@ -1514,14 +1514,14 @@ End
 #endif
 
 File gid_File_Lib_Soffice
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Name = SCP2_URE_DL_NORMAL("sofficeapp");
     Styles = (PACKED);
 End
 
 File gid_File_Lib_Unopkgapp
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Name = SCP2_URE_DL_NORMAL("unopkgapp");
     Styles = (PACKED);
@@ -1533,13 +1533,13 @@ STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
         // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
         // gid_Brand_File_Lib_Msvcr80
 File gid_File_Moz_Msvcp80
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Name = SCP2_URE_DL_NORMAL("msvcp80");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 File gid_File_Moz_Msvcr80
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_OOO_BIN_DIR;
     Name = SCP2_URE_DL_NORMAL("msvcr80");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -1554,7 +1554,7 @@ End
 
 #ifndef SYSTEM_REDLAND
 File gid_File_Lib_Raptor
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1573,7 +1573,7 @@ File gid_File_Lib_Raptor
 End
 
 File gid_File_Lib_Rasqal
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1592,7 +1592,7 @@ File gid_File_Lib_Rasqal
 End
 
 File gid_File_Lib_Rdf
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
@@ -1619,7 +1619,7 @@ STD_LIB_FILE( gid_File_Lib_Forui, forui)
 // RSVG and dependencies
 #if ! defined (SYSTEM_GETTEXT)
 File gid_File_Lib_Intl
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     #ifdef MACOSX
@@ -1632,7 +1632,7 @@ End
 
 #if ! defined SYSTEM_GLIB
 File gid_File_Lib_Glib
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     #ifdef MACOSX
@@ -1642,7 +1642,7 @@ File gid_File_Lib_Glib
     #endif
 End
 File gid_File_Lib_Gthread
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     #ifdef MACOSX
@@ -1652,7 +1652,7 @@ File gid_File_Lib_Gthread
     #endif
 End
 File gid_File_Lib_Gobject
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     #ifdef MACOSX
@@ -1662,7 +1662,7 @@ File gid_File_Lib_Gobject
     #endif
 End
 File gid_File_Lib_Gio
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     #ifdef MACOSX
@@ -1672,7 +1672,7 @@ File gid_File_Lib_Gio
     #endif
 End
 File gid_File_Lib_Gmodule
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     #ifdef MACOSX
@@ -1687,7 +1687,7 @@ End
 
 #if ! defined SYSTEM_GDKPIXBUF
 File gid_File_Lib_Gdkpixbuf
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     #ifdef MACOSX
@@ -1700,7 +1700,7 @@ End
 
 #if ! defined SYSTEM_LIBCROCO
 File gid_File_Lib_Libcroco
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     #ifdef MACOSX
@@ -1713,7 +1713,7 @@ End
 
 #if ! defined SYSTEM_PANGO
 File gid_File_Lib_Libpango
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     #ifdef MACOSX
@@ -1723,7 +1723,7 @@ File gid_File_Lib_Libpango
     #endif
 End
 File gid_File_Lib_Libpangocairo
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     #ifdef MACOSX
@@ -1734,7 +1734,7 @@ File gid_File_Lib_Libpangocairo
 End
 #if defined WNT
 File gid_File_Lib_Libpangowin32
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "pangowin32lo.dll";
@@ -1744,7 +1744,7 @@ End
 
 #if ! defined SYSTEM_LIBGSF
 File gid_File_Lib_Libgsf
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
 #ifdef WNT
@@ -1755,7 +1755,7 @@ End
 
 #if ! defined SYSTEM_LIBRSVG
 File gid_File_Lib_Librsvg
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
     #ifdef MACOSX
@@ -1771,7 +1771,7 @@ End
 #if defined(WNT) && defined(HAVE_WINDOWS_SDK)
 
 File gid_File_Lib_sellangmsi
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
     Dir = gid_Brand_Dir_Program;
     Name = "sellangmsi.dll";
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 50298ab..aece726 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -171,7 +171,7 @@ End
 // Public Dynamic Libraries:
 
 File gid_File_Dl_Cppu
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_VER("cppu", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -189,7 +189,7 @@ End
 #endif
 
 File gid_File_Dl_Cppuhelper
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -207,7 +207,7 @@ End
 #endif
 
 File gid_File_Dl_PurpEnvHelper
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -225,7 +225,7 @@ End
 #endif
 
 File gid_File_Dl_Sal
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_VER("sal", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -243,14 +243,14 @@ End
 #endif
 
 File gid_File_Dl_Sal_TextEnc
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("sal_textenc");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
 
 File gid_File_Dl_Salhelper
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -270,7 +270,7 @@ End
 // Private Dynamic Libraries:
 
 File gid_File_Dl_Profile_Uno
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = PROFILENAME(/ure/uno);
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -278,7 +278,7 @@ File gid_File_Dl_Profile_Uno
 End
 
 File gid_File_Dl_Reg
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_VER("reg", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -298,7 +298,7 @@ End
 
 
 File gid_File_Dl_Store
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_VER("store", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -307,7 +307,7 @@ End
 
 
 File gid_File_Dl_Xmlreader
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("xmlreader");
     Styles = (PACKED);
@@ -326,7 +326,7 @@ End
 #endif
 
 File gid_File_Dl_Jvmaccess
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -344,7 +344,7 @@ End
 #endif
 
 File gid_File_Dl_Jvmfwk
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_VER("jvmfwk", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -363,7 +363,7 @@ End
 
 #if defined SOLAR_JAVA
 File gid_File_Dl_Sunjavaplugin
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("sunjavaplugin");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -390,7 +390,7 @@ File gid_File_Dl_Profile_Jvmfwk3rc
 End
 
 File gid_File_Dl_ComnameUno
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL(STRING(COMNAME) "_uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -399,7 +399,7 @@ End
 
 #if defined SOLAR_JAVA
 File gid_File_Dl_JavaUno
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("java_uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -417,7 +417,7 @@ End
 #endif
 
 File gid_File_Dl_UnsafeUnoUno
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("unsafe_uno_uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -425,7 +425,7 @@ File gid_File_Dl_UnsafeUnoUno
 End
 
 File gid_File_Dl_AffineUnoUno
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("affine_uno_uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -433,7 +433,7 @@ File gid_File_Dl_AffineUnoUno
 End
 
 File gid_File_Dl_LogUnoUno
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("log_uno_uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -441,7 +441,7 @@ End
 
 #if defined WNT && defined _MSC
 File gid_File_Dl_Cli_Uno
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("cli_uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -635,7 +635,7 @@ End
 
 #if defined SOLAR_JAVA
 File gid_File_Dl_Jpipe
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_JDL_NORMAL("jpipe");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -645,7 +645,7 @@ End
 
 #if defined SOLAR_JAVA && defined WNT
 File gid_File_Dl_Jpipx
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("jpipx");
     Styles = (PACKED);
@@ -654,7 +654,7 @@ End
 
 #if defined SOLAR_JAVA
 File gid_File_Dl_Juh
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("juh");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -664,7 +664,7 @@ End
 
 #if defined SOLAR_JAVA
 File gid_File_Dl_Juhx
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("juhx");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -673,7 +673,7 @@ End
 #endif
 
 File gid_File_Dl_Acceptor
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("acceptor.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -681,14 +681,14 @@ File gid_File_Dl_Acceptor
 End
 
 File gid_File_Dl_Binaryurp
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("binaryurp.uno");
     Styles = (PACKED);
 End
 
 File gid_File_Dl_Bootstrap
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("bootstrap.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -696,7 +696,7 @@ File gid_File_Dl_Bootstrap
 End
 
 File gid_File_Dl_Connector
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("connector.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -704,7 +704,7 @@ File gid_File_Dl_Connector
 End
 
 File gid_File_Dl_Introspection
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("introspection.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -712,7 +712,7 @@ File gid_File_Dl_Introspection
 End
 
 File gid_File_Dl_Invocadapt
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("invocadapt.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -720,7 +720,7 @@ File gid_File_Dl_Invocadapt
 End
 
 File gid_File_Dl_Invocation
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("invocation.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -730,7 +730,7 @@ End
 
 #if defined SOLAR_JAVA
 File gid_File_Dl_Javaloader
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("javaloader.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -740,7 +740,7 @@ End
 
 #if defined SOLAR_JAVA
 File gid_File_Dl_Javavm
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("javavm.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -749,7 +749,7 @@ End
 #endif
 
 File gid_File_Dl_Namingservice
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("namingservice.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -757,7 +757,7 @@ File gid_File_Dl_Namingservice
 End
 
 File gid_File_Dl_Stocservices
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("stocservices.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -765,7 +765,7 @@ File gid_File_Dl_Stocservices
 End
 
 File gid_File_Dl_Proxyfac
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("proxyfac.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -773,7 +773,7 @@ File gid_File_Dl_Proxyfac
 End
 
 File gid_File_Dl_Reflection
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("reflection.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -781,7 +781,7 @@ File gid_File_Dl_Reflection
 End
 
 File gid_File_Dl_Streams
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("streams.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -789,7 +789,7 @@ File gid_File_Dl_Streams
 End
 
 File gid_File_Dl_Textinstream
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("textinstream.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -797,7 +797,7 @@ File gid_File_Dl_Textinstream
 End
 
 File gid_File_Dl_Textoutstream
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("textoutstream.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -805,7 +805,7 @@ File gid_File_Dl_Textoutstream
 End
 
 File gid_File_Dl_Uuresolver
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_BARE("uuresolver.uno");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -814,7 +814,7 @@ End
 
 #if !defined SYSTEM_LIBXML
 File gid_File_Dl_Libxml2
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
 #if defined WNT
 #if defined _gcc3
@@ -844,7 +844,7 @@ End
 
 #if defined WITH_STLPORT
 File gid_File_Dl_Stlport
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
 #if defined _gcc3 && defined WNT
 #if defined _DEBUG_RUNTIME
@@ -883,7 +883,7 @@ End
 #if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
 File gid_File_Dl_GccS
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
 #ifdef AIX
     Name = "libgcc_s.a";
@@ -899,7 +899,7 @@ End
 	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
 File gid_File_Dl_Stdcpp
     Dir = SCP2_URE_DL_DIR;
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
 #ifdef AIX
     Name = "libstdc++.a";
 #else
@@ -915,7 +915,7 @@ End
 #if defined(MINGW_GCCDLL)
 
 File gid_File_Lib_Mingw_GccS_Ure
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = MINGW_GCCDLL;
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -926,7 +926,7 @@ End
 #if defined(MINGW_GXXDLL)
 
 File gid_File_Lib_Mingw_Stdcpp_Ure
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = MINGW_GXXDLL;
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
@@ -938,7 +938,7 @@ End
 
 #if defined WNT
 File gid_File_Dl_Uwinapi
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
     Name = SCP2_URE_DL_NORMAL("uwinapi");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index be8cbe2..ba83a9c 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -30,7 +30,7 @@
 #ifndef DISABLE_PYUNO
 
 File gid_File_Lib_Pyuno
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
   #ifdef UNX
     Name = STRING(CONCAT2(libpyuno,UNXSUFFIX));
   #else
@@ -41,7 +41,7 @@ File gid_File_Lib_Pyuno
 End
 
 File gid_File_Lib_Pythonloader
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
   #ifdef UNX
     Name = STRING(CONCAT2(pythonloader.uno,UNXSUFFIX));
@@ -125,7 +125,7 @@ End
 #ifndef SYSTEM_PYTHON
 #ifndef MACOSX
 File gid_File_Lib_Python_So
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
     Name = STRING(PY_FULL_DLL_NAME);
     Styles = (PACKED);
@@ -292,7 +292,7 @@ End
 #ifdef UNX
 
 File gid_File_Pyuno
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
 #ifdef MACOSX
     // note: Mac OS X use .dylib, even for python modules
     Name = "pyuno.dylib";
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index 97a8981..59a0099 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -33,7 +33,7 @@ Directory gid_Dir_Shlxthdl
 End
 
 File gid_File_Lib_OOoFilt
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Shlxthdl;
     Name = "ooofilt.dll";
@@ -42,7 +42,7 @@ End
 #ifdef BUILD_X64
 
 File gid_File_Lib_OOoFilt64
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Shlxthdl;
     Name = "ooofilt_x64.dll";
@@ -52,7 +52,7 @@ End
 #endif
 
 File gid_File_Lib_Shlxthdl
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Shlxthdl;
     Name = "shlxthdl.dll";
@@ -60,7 +60,7 @@ End
 
 #ifdef BUILD_X64
 	File gid_File_Lib_Shlxthdl64
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Shlxthdl;
     Name = "shlxthdl_x64.dll";
@@ -70,7 +70,7 @@ End
 #endif
 
 File gid_File_Lib_PropertyHdl
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Shlxthdl;
     Name = "propertyhdl.dll";
@@ -78,7 +78,7 @@ End
 
 #ifdef BUILD_X64
 	File gid_File_Lib_PropertyHdl64
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED);
     Dir = gid_Dir_Shlxthdl;
     Name = "propertyhdl_x64.dll";
@@ -88,14 +88,14 @@ End
 #endif
 
 File gid_File_Lib_Shlxtmsi
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "shlxtmsi.dll";
 End
 
 File gid_File_Lib_Reg64
-    TXT_FILE_BODY;
+    LIB_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
     Dir = SCP2_OOO_BIN_DIR;
     Name = "reg64msi.dll";
commit 0056224aee18d6c04ece998e9fb6e3cff06b8719
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Nov 30 16:40:30 2011 +0100

    Use more reasonable permissions also the profile files

diff --git a/solenv/bin/modules/installer/profiles.pm b/solenv/bin/modules/installer/profiles.pm
index 3feef2e..2b794ce 100644
--- a/solenv/bin/modules/installer/profiles.pm
+++ b/solenv/bin/modules/installer/profiles.pm
@@ -107,7 +107,7 @@ sub add_profile_into_filelist
     $profile{'ismultilingual'} = 0;
     $profile{'sourcepath'} = $completeprofilename;
     $profile{'Name'} = $oneprofile->{'Name'};
-    $profile{'UnixRights'} = "444";
+    $profile{'UnixRights'} = "644";
     $profile{'gid'} = $oneprofile->{'gid'};
     $profile{'Dir'} = $oneprofile->{'Dir'};
     $profile{'destination'} = $oneprofile->{'destination'};


More information about the Libreoffice-commits mailing list