summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scp2/inc/macros.inc18
-rw-r--r--scp2/source/activex/file_activex.scp6
-rw-r--r--scp2/source/canvas/cairocanvas.scp2
-rw-r--r--scp2/source/gnome/file_gnome.scp6
-rw-r--r--scp2/source/impress/module_ogltrans.scp2
-rw-r--r--scp2/source/javafilter/file_javafilter.scp4
-rw-r--r--scp2/source/kde/file_kde.scp2
-rw-r--r--scp2/source/ooo/common_brand.scp5
-rw-r--r--scp2/source/ooo/file_library_ooo.scp316
-rw-r--r--scp2/source/ooo/file_ooo.scp6
-rw-r--r--scp2/source/ooo/module_hidden_ooo.scp5
-rw-r--r--scp2/source/ooo/shortcut_ooo.scp10
-rw-r--r--scp2/source/python/file_python.scp1
-rw-r--r--scp2/source/winexplorerext/file_winexplorerext.scp2
-rw-r--r--scp2/source/writer/file_writer.scp2
-rw-r--r--solenv/bin/modules/installer/globals.pm2
-rw-r--r--solenv/bin/modules/installer/servicesfile.pm81
17 files changed, 206 insertions, 264 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index cdbc6f8ce20d..7d9cdbd1d027 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -85,6 +85,12 @@
#define EXTRAFILENAME(name,lang) STRING(CONCAT3(name,lang,.zip))
#define CONFIGLANGFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext))
+#if defined WNT
+#define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program
+#else
+#define SCP2_OOO_BIN_DIR gid_Dir_Program
+#endif
+
#define BIN_FILE_BODY \
UnixRights = 555
@@ -121,12 +127,12 @@
#define PACKED_LIB_FILE_BODY \
TXT_FILE_BODY; \
Styles = (PACKED); \
- Dir = gid_Dir_Program
+ Dir = SCP2_OOO_BIN_DIR
#define PACKED_LIB_FILE_BODY_PATCH \
TXT_FILE_BODY; \
Styles = (PACKED,PATCH); \
- Dir = gid_Dir_Program
+ Dir = SCP2_OOO_BIN_DIR
#define PACKED_FILTER_FILE_BODY \
TXT_FILE_BODY; \
@@ -307,13 +313,13 @@
#define PACKED_UNO_LIB_FILE_BODY \
TXT_FILE_BODY; \
Styles = (PACKED,UNO_COMPONENT); \
- Dir = gid_Dir_Program; \
+ Dir = SCP2_OOO_BIN_DIR; \
RegistryID = gid_Starregistry_Services_Rdb
#define PACKED_UNO_LIB_FILE_BODY_PATCH \
TXT_FILE_BODY; \
Styles = (PACKED,UNO_COMPONENT,PATCH); \
- Dir = gid_Dir_Program; \
+ Dir = SCP2_OOO_BIN_DIR; \
RegistryID = gid_Starregistry_Services_Rdb
#define STD_UNO_LIB_FILE(id,name) \
@@ -374,7 +380,7 @@
File id \
TXT_FILE_BODY; \
Name = LIBNAME(name); \
- Dir = gid_Dir_Program; \
+ Dir = SCP2_OOO_BIN_DIR; \
Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS); \
End
@@ -382,7 +388,7 @@
File id \
TXT_FILE_BODY; \
Name = LIBNAME(name); \
- Dir = gid_Dir_Program; \
+ Dir = SCP2_OOO_BIN_DIR; \
Styles = (PACKED, NO_WARNING_IF_NOT_EXISTS, UNO_COMPONENT); \
RegistryID = gid_Starregistry_Services_Rdb; \
End
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index 6dcb531a6d7f..8cc1c45e17e7 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -33,21 +33,21 @@
File gid_File_Lib_Soactivex
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "so_activex.dll";
End
File gid_File_Lib_Regactivex_Msi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "regactivex.dll";
End
File gid_File_Lib_Regpatchactivex_Msi
TXT_FILE_BODY;
Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "regpatchactivex.dll";
End
diff --git a/scp2/source/canvas/cairocanvas.scp b/scp2/source/canvas/cairocanvas.scp
index 51ee7863dd9c..f3251634c53d 100644
--- a/scp2/source/canvas/cairocanvas.scp
+++ b/scp2/source/canvas/cairocanvas.scp
@@ -34,7 +34,7 @@ File gid_File_Lib_CairoCanvas
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(cairocanvas.uno,UNXSUFFIX));
#else
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index 0161e06545c6..a7fdf1196ac3 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -33,7 +33,7 @@
File gid_File_Lib_GIO
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(ucpgio1.uno,UNXSUFFIX));
RegistryID = gid_Starregistry_Services_Rdb;
Regmergefile = "ucpgio-ucd.txt";
@@ -44,7 +44,7 @@ End
File gid_File_Lib_Gnomevfs
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(ucpgvfs1.uno,UNXSUFFIX));
RegistryID = gid_Starregistry_Services_Rdb;
Regmergefile = "ucpgvfs-ucd.txt";
@@ -55,7 +55,7 @@ End
File gid_File_Lib_Gconfbe
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
RegistryID = gid_Starregistry_Services_Rdb;
Regmergefile = "gconfbe1-ucd.txt";
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index 17d5c31e5a12..18425e88033a 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -43,7 +43,7 @@ File gid_File_Lib_OpenGLTransitions
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX));
#else
diff --git a/scp2/source/javafilter/file_javafilter.scp b/scp2/source/javafilter/file_javafilter.scp
index 01f68c9b3e4c..3cd33ece0b26 100644
--- a/scp2/source/javafilter/file_javafilter.scp
+++ b/scp2/source/javafilter/file_javafilter.scp
@@ -35,7 +35,7 @@
File gid_File_Lib_Xmergesync
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "xmergesync.dll";
End
@@ -46,7 +46,7 @@ End
File gid_File_Lib_Jfregca
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "jfregca.dll";
End
diff --git a/scp2/source/kde/file_kde.scp b/scp2/source/kde/file_kde.scp
index 1835a39819b5..4cd9de0b240c 100644
--- a/scp2/source/kde/file_kde.scp
+++ b/scp2/source/kde/file_kde.scp
@@ -33,7 +33,7 @@
File gid_File_Lib_Kdebe
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(kdebe1.uno,UNXSUFFIX));
RegistryID = gid_Starregistry_Services_Rdb;
Regmergefile = "kdebe1-ucd.txt";
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7863b39788ea..60ba10716480 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -502,7 +502,10 @@ File gid_Brand_File_Bin_Unopkg
Name = "unopkg.bin";
End
-#if defined WNT && defined M1310
+#if defined WNT && \
+ (defined M1310 || \
+ ((defined M1400 || defined M1500) && \
+ !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA)))
File gid_Brand_File_Bin_Msvcr71
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Program;
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index f7ed5904e033..6c81b0f14928 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -33,7 +33,7 @@
File gid_File_Lib_Accessbridge
BIN_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "java_uno_accessbridge.dll";
End
#endif
@@ -63,7 +63,7 @@ File gid_File_Lib_Basprov
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT4(basprov,DLLPOSTFIX,.uno,UNXSUFFIX));
#else
@@ -77,7 +77,7 @@ File gid_File_Lib_Cached1
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libcached1,UNXSUFFIX));
#else
@@ -89,7 +89,7 @@ File gid_File_Lib_Configmgr2
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(configmgr2.uno,UNXSUFFIX));
#else
@@ -101,7 +101,7 @@ File gid_File_Lib_Sysmgr1
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(sysmgr1.uno,UNXSUFFIX));
#else
@@ -113,7 +113,7 @@ File gid_File_Lib_Behelper
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(behelper.uno,UNXSUFFIX));
#else
@@ -126,7 +126,7 @@ File gid_File_Lib_Ldapbe2
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(ldapbe2.uno,UNXSUFFIX));
#else
@@ -203,7 +203,7 @@ File gid_File_Lib_Comphelper2
#else
Name = STRING(CONCAT3(comphelp4,COMID,.dll));
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -217,7 +217,7 @@ STD_LIB_FILE_PATCH( gid_File_Lib_Cui, cui)
File gid_File_Lib_Curl
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
#ifdef MACOSX
Name = STRING(CONCAT2(libcurl.3,UNXSUFFIX));
@@ -240,7 +240,7 @@ End
File gid_File_Lib_Db
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libdb-4.7,UNXSUFFIX));
#else
@@ -256,7 +256,7 @@ End
File gid_File_Lib_Egg_Tray
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX));
End
@@ -264,7 +264,7 @@ File gid_File_Lib_QStart_Gtk
Name = LIBNAME(qstart_gtk);
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
End
#endif
#endif
@@ -294,7 +294,7 @@ File gid_File_Lib_Dbpool
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libdbpool2,UNXSUFFIX));
#else
@@ -313,7 +313,7 @@ File gid_File_Lib_Dict_Ja
#else
Name = "dict_ja.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -324,7 +324,7 @@ File gid_File_Lib_Dict_Zh
#else
Name = "dict_zh.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -335,7 +335,7 @@ File gid_File_Lib_Collator_Data
#else
Name = "collator_data.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -346,7 +346,7 @@ File gid_File_Lib_Index_Data
#else
Name = "index_data.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -357,7 +357,7 @@ File gid_File_Lib_Textconv_Dict
#else
Name = "textconv_dict.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -365,7 +365,7 @@ File gid_File_Lib_Dlgprov
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT4(dlgprov,DLLPOSTFIX,.uno,UNXSUFFIX));
#else
@@ -377,7 +377,7 @@ File gid_File_Lib_Stringresource
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT4(stringresource,DLLPOSTFIX,.uno,UNXSUFFIX));
#else
@@ -392,7 +392,7 @@ File gid_File_Lib_Vbaobj
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT4(libvbaobj,DLLPOSTFIX,.uno,UNXSUFFIX));
#else
@@ -410,7 +410,7 @@ File gid_File_Lib_Dnd
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "dnd.dll";
End
@@ -421,7 +421,7 @@ End
File gid_File_Lib_Dtrans
TXT_FILE_BODY;
Name = "dtrans.dll";
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED, UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -443,7 +443,7 @@ STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Emser, emser )
File gid_File_Lib_Inprocserv
TXT_FILE_BODY;
Styles = (PACKED,PATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "inprocserv.dll";
End
@@ -462,14 +462,14 @@ File gid_File_Lib_Kab_1
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(libkab1,UNXSUFFIX));
End
File gid_File_Lib_Kab_Drv_1
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(libkabdrv1,UNXSUFFIX));
End
@@ -486,14 +486,14 @@ File gid_File_Lib_Macab_1
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(libmacab1,UNXSUFFIX));
End
File gid_File_Lib_Macab_Drv_1
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX));
End
@@ -517,7 +517,7 @@ File gid_File_Lib_Evtatt
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libevtatt,UNXSUFFIX));
#else
@@ -530,7 +530,7 @@ SPECIAL_UNO_LIB_FILE(gid_File_Lib_Fileacc,fileacc)
File gid_File_Lib_Filterconfig1
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,PATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
Name = SPECIAL_NAME(filterconfig1);
End
@@ -549,7 +549,7 @@ File gid_File_Lib_Fop
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "fop.dll";
End
@@ -561,7 +561,7 @@ File gid_File_Lib_Fps
TXT_FILE_BODY;
Styles = (PACKED,PATCH,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "fps.dll";
End
@@ -572,7 +572,7 @@ End
File gid_File_Lib_Desktopbe
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(desktopbe1.uno,UNXSUFFIX));
RegistryID = gid_Starregistry_Services_Rdb;
Regmergefile = "desktopbe1-ucd.txt";
@@ -584,7 +584,7 @@ File gid_File_Lib_Fps_Gnome
TXT_FILE_BODY;
Styles = (PACKED);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = SPECIAL_COMPONENT_LIB_NAME(fps_gnome.uno);
Regmergefile = "fps-gnome-ucd.txt";
End
@@ -610,7 +610,7 @@ File gid_File_Lib_Fps_Aqua
TXT_FILE_BODY;
Styles = (PACKED,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = SPECIAL_COMPONENT_LIB_NAME(fps_aqua.uno);
Regmergefile = "fps-aqua-ucd.txt";
End
@@ -620,7 +620,7 @@ File gid_File_Lib_MacOSXSpell
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Name = LIBNAME(MacOSXSpell);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
End
File gid_File_Lib_avmediaQuickTime
@@ -628,7 +628,7 @@ File gid_File_Lib_avmediaQuickTime
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
Name = LIBNAME(avmediaQuickTime);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
End
#endif
#endif
@@ -642,7 +642,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
File gid_File_Lib_Cairo
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
#ifdef MACOSX
Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX));
@@ -670,7 +670,7 @@ File gid_File_Lib_Ftransl
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "ftransl.dll";
End
@@ -684,7 +684,7 @@ File gid_File_Lib_Fwk
Name = LIBNAME(fwk);
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,PATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -696,7 +696,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Fwm , fwm)
File gid_File_Lib_Gdiplus
BIN_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "gdiplus.dll";
End
#endif
@@ -705,7 +705,7 @@ File gid_File_Lib_Go
Name = LIBNAME(go);
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,PATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -717,7 +717,7 @@ File gid_File_Lib_I18npool
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(i18npool.uno,UNXSUFFIX));
#else
@@ -728,7 +728,7 @@ End
File gid_File_Lib_I18nregexp
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT3(libi18nregexp,COMID,UNXSUFFIX));
#else
@@ -740,7 +740,7 @@ File gid_File_Lib_I18nsearch
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(i18nsearch.uno,UNXSUFFIX));
#else
@@ -764,7 +764,7 @@ File gid_File_Lib_I18nutil
#else
Name = STRING(CONCAT3(i18nutil,COMID,.dll));
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -779,7 +779,7 @@ File gid_File_Lib_Icudata
#else
Name = STRING(CONCAT4(icudt,ICU_MAJOR,ICU_MINOR,.dll));
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -790,7 +790,7 @@ File gid_File_Lib_Icui18n
#else
Name = STRING(CONCAT4(icuin,ICU_MAJOR,ICU_MINOR,.dll));
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -801,7 +801,7 @@ File gid_File_Lib_Icule
#else
Name = STRING(CONCAT4(icule,ICU_MAJOR,ICU_MINOR,.dll));
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -812,7 +812,7 @@ File gid_File_Lib_Icuuc
#else
Name = STRING(CONCAT4(icuuc,ICU_MAJOR,ICU_MINOR,.dll));
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -825,7 +825,7 @@ File gid_File_Lib_J
#else
Name = STRING(CONCAT4(j,DLLPOSTFIX,_g,.dll));
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -852,7 +852,7 @@ File gid_File_Lib_Hsqldb_2
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libhsqldb,UNXSUFFIX));
#else
@@ -867,7 +867,7 @@ End
File gid_File_Lib_Lngpckinsthlp
BIN_FILE_BODY;
Styles = (PACKED, LANGUAGEPACK, BINARYTABLE, BINARYTABLE_ONLY);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "lngpckinsthlp.dll";
End
@@ -878,7 +878,7 @@ End
File gid_File_Lib_sn_tools
BIN_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "sn_tools.dll";
End
@@ -889,7 +889,7 @@ End
File gid_File_Lib_relnotes
BIN_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "relnotes.dll";
End
@@ -900,7 +900,7 @@ End
File gid_File_Lib_Patchmsi
TXT_FILE_BODY;
Name = "patchmsi.dll";
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED,PATCH,PATCH_ONLY,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
End
@@ -911,7 +911,7 @@ End
File gid_File_Lib_Rebasemsi
TXT_FILE_BODY;
Name = "rebase.dll";
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED,PATCH,BINARYTABLE,BINARYTABLE_ONLY,DONTRENAMEINPATCH);
End
@@ -926,7 +926,7 @@ File gid_File_Lib_Localedata_En
#else
Name = "localedata_en.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -937,7 +937,7 @@ File gid_File_Lib_Localedata_Es
#else
Name = "localedata_es.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -948,7 +948,7 @@ File gid_File_Lib_Localedata_Euro
#else
Name = "localedata_euro.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -959,7 +959,7 @@ File gid_File_Lib_Localedata_Others
#else
Name = "localedata_others.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -967,7 +967,7 @@ File gid_File_Lib_Mcnttype
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libmcnttype,UNXSUFFIX));
#else
@@ -997,7 +997,7 @@ File gid_File_Lib_Mozbootstrap
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libmozbootstrap,UNXSUFFIX));
#else
@@ -1013,87 +1013,6 @@ STD_UNO_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
STD_UNO_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
-#ifdef WNT
-#if defined(_gcc3)
-
-File gid_File_Lib_Mingwm10
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Program;
- Name = "mingwm10.dll";
-End
-
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcr80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcr80.dll";
-#else
- Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcp80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcp80.dll";
-#else
- Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcm80
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "msvcm80.dll";
-#else
- Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Msvcm80crt_Manifest
- BIN_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
- Name = "Microsoft.VC80.CRT.manifest";
-#else
- Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
STD_UNO_LIB_FILE(gid_File_Lib_Mysql,mysql)
File gid_File_Oo_Office_Dataaccess_Mysql_Xcu
TXT_FILE_BODY;
@@ -1125,7 +1044,7 @@ STD_UNO_LIB_FILE( gid_File_Lib_Offacc, offacc)
File gid_File_Lib_Officebean
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libofficebean,UNXSUFFIX));
#else
@@ -1142,7 +1061,7 @@ File gid_File_Lib_Ole
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "oleautobridge.uno.dll";
End
@@ -1191,7 +1110,7 @@ File gid_File_Lib_Vclplug_Gen
Name = LIBNAME(vclplug_gen);
TXT_FILE_BODY;
Styles = (PACKED,PATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1201,7 +1120,7 @@ File gid_File_Lib_Vclplug_Gtk
Name = LIBNAME(vclplug_gtk);
TXT_FILE_BODY;
Styles = (PACKED,PATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
End
#endif
#ifdef ENABLE_KDE
@@ -1210,7 +1129,7 @@ File gid_File_Lib_Vclplug_Kde
Name = LIBNAME(vclplug_kde);
TXT_FILE_BODY;
Styles = (PACKED,PATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
End
#endif
#endif
@@ -1231,7 +1150,7 @@ File gid_File_Lib_AppleRemote
Name = LIBNAME(AppleRemote);
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1240,7 +1159,7 @@ File gid_File_Lib_Basebmp
Name = LIBNAME(basebmp);
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1254,7 +1173,7 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
File gid_File_Lib_Recentfile
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(librecentfile,UNXSUFFIX));
End
@@ -1265,7 +1184,7 @@ End
File gid_File_Lib_Reg4allmsdoc
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "reg4allmsdoc.dll";
End
@@ -1276,7 +1195,7 @@ End
File gid_File_Lib_Qslnkmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "qslnkmsi.dll";
End
@@ -1287,7 +1206,7 @@ End
File gid_File_Lib_Sdqsmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "sdqsmsi.dll";
End
@@ -1297,7 +1216,7 @@ File gid_File_Lib_Res
Name = LIBNAME(res);
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,PATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1305,7 +1224,7 @@ File gid_File_Lib_Sax_Uno
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(sax.uno,UNXSUFFIX));
#else
@@ -1317,7 +1236,7 @@ File gid_File_Lib_Fastsax_Uno
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,DONT_OVERWRITE);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(fastsax.uno,UNXSUFFIX));
#else
@@ -1345,7 +1264,7 @@ File gid_File_Lib_Scriptframe
Name = "scriptframe.dll";
#endif
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED,PATCH,UNO_COMPONENT);
End
@@ -1356,7 +1275,7 @@ File gid_File_Lib_Slideshow
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(slideshow.uno,UNXSUFFIX));
#else
@@ -1368,7 +1287,7 @@ File gid_File_Lib_Sdbc_2
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libsdbc2,UNXSUFFIX));
#else
@@ -1384,7 +1303,7 @@ File gid_File_Lib_Sfx
Name = LIBNAME(sfx);
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,PATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1393,21 +1312,21 @@ End
File gid_File_Lib_OOoFilt
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "ooofilt.dll";
End
File gid_File_Lib_OOoFiltProxy
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "ooofiltproxy.dll";
End
File gid_File_Lib_Instooofiltmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "instooofiltmsi.dll";
End
@@ -1419,7 +1338,7 @@ File gid_File_Lib_Smplmail
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "smplmail.uno.dll";
End
@@ -1433,7 +1352,7 @@ File gid_File_Lib_Spa
Name = LIBNAME(spa);
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
End
#endif
@@ -1443,7 +1362,7 @@ File gid_File_Lib_Spell
Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
Name = LIBNAME(spell);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
End
STD_UNO_LIB_FILE( gid_File_Lib_Spl, spl)
@@ -1471,7 +1390,7 @@ File gid_File_Lib_Sysdtrans
TXT_FILE_BODY;
Styles = (PACKED,PATCH,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
#ifdef QUARTZ
Name = STRING(CONCAT3(libdtransaqua,DLLPOSTFIX,UNXSUFFIX));
@@ -1503,7 +1422,7 @@ File gid_File_Lib_Tvhlp1
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libtvhlp1,UNXSUFFIX));
#else
@@ -1515,7 +1434,7 @@ File gid_File_Lib_Ucb1
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libucb1,UNXSUFFIX));
#else
@@ -1525,7 +1444,7 @@ End
File gid_File_Lib_Ucbhelper
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
#ifdef UNX
Name = STRING(CONCAT3(libucbhelper4,COMID,UNXSUFFIX));
@@ -1541,7 +1460,7 @@ File gid_File_Lib_Ucpchelp1
#else
Name = "ucpchelp1.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED, UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1567,7 +1486,7 @@ File gid_File_Lib_Lnth
Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
Name = LIBNAME(lnth);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
End
File gid_File_Lib_Hyph
@@ -1575,7 +1494,7 @@ File gid_File_Lib_Hyph
Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
Name = LIBNAME(hyphen);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
End
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Utl , utl)
@@ -1588,7 +1507,7 @@ File gid_File_Lib_Vcl
Name = LIBNAME(vcl);
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,PATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1599,7 +1518,7 @@ File gid_File_Lib_Vos
#else
Name = STRING(CONCAT3(vos3,COMID,.dll));
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -1613,7 +1532,7 @@ File gid_File_Lib_Xo
Name = LIBNAME(xo);
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT,PATCH);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1633,7 +1552,7 @@ UNO_JAR_FILE( gid_File_Jar_Xsltvalidate, XSLTValidate )
File gid_File_Lib_Xslt
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
#ifdef MACOSX
Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX));
@@ -1674,7 +1593,7 @@ File gid_File_Lib_XSec_Framework
#else
Name = "xsec_fw.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1686,7 +1605,7 @@ File gid_File_Lib_XSec_XmlSec
#else
Name = "xsec_xmlsec.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED,UNO_COMPONENT,PATCH);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1698,7 +1617,7 @@ File gid_File_Lib_XSec_XMLSecurity
#else
Name = "xmlsecurity.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
@@ -1711,7 +1630,7 @@ File gid_File_Lib_LibXMLSec_xmlseccore
#else
Name = "libxmlsec.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
@@ -1722,7 +1641,7 @@ File gid_File_Lib_LibXMLSec_xmlsecmscrypto
#else
Name = "libxmlsec-mscrypto.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
#endif
@@ -1734,7 +1653,7 @@ File gid_File_Lib_Migrationoo2
TXT_FILE_BODY;
Styles = (PACKED,UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(migrationoo2.uno,UNXSUFFIX));
#else
@@ -1745,7 +1664,7 @@ End
File gid_File_Lib_Libtextcat
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
Name = STRING(CONCAT2(libtextcat,UNXSUFFIX));
#else
@@ -1763,7 +1682,7 @@ SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Updatefeed , updatefeed.uno )
File gid_File_Lib_Onlinecheck
BIN_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "onlinecheck.dll";
End
#endif
@@ -1772,7 +1691,7 @@ End
File gid_File_Lib_Openssl
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef WNT
Name = "ssleay32.dll";
#endif
@@ -1783,7 +1702,7 @@ End
File gid_File_Lib_Crypto
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef WNT
Name = "libeay32.dll";
@@ -1793,30 +1712,33 @@ End
File gid_File_Lib_Soffice
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = SCP2_URE_DL_NORMAL("sofficeapp");
Styles = (PACKED);
End
File gid_File_Lib_Unopkgapp
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = SCP2_URE_DL_NORMAL("unopkgapp");
Styles = (PACKED);
End
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Oooimprovecore , oooimprovecore)
-#if defined WNT && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA
+#if defined WNT && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
+ !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
+ // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
+ // gid_Brand_File_Lib_Msvcr80
File gid_File_Moz_Msvcp80
TXT_FILE_BODY;
- Dir = gid_Dir_Program;
+ 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;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = SCP2_URE_DL_NORMAL("msvcr80");
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
End
@@ -1826,7 +1748,7 @@ End
File gid_File_Lib_Raptor
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
#ifdef MACOSX
Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX));
@@ -1845,7 +1767,7 @@ End
File gid_File_Lib_Rasqal
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
#ifdef MACOSX
Name = STRING(CONCAT4(librasqal,.,RASQAL_MAJOR,UNXSUFFIX));
@@ -1864,7 +1786,7 @@ End
File gid_File_Lib_Rdf
TXT_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
#ifdef UNX
#ifdef MACOSX
Name = STRING(CONCAT4(librdf,.,REDLAND_MAJOR,UNXSUFFIX));
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d4306e073e52..211a473c00aa 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1169,7 +1169,7 @@ End
File gid_File_Mozilla_Runtime
TXT_FILE_BODY;
Styles = (ARCHIVE);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "mozruntime.zip";
End
@@ -2732,7 +2732,11 @@ File gid_Starregistry_Services_Rdb
Name = "services.rdb";
Dir = gid_Dir_Program;
Styles = (PACKED, STARREGISTRY, PATCH);
+#if defined WNT
+ NativeServicesURLPrefix = "vnd.sun.star.expand:$BRAND_BASE_DIR/program/";
+#else
NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/";
+#endif
JavaServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/";
End
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 7ee9f755e781..9f4506b80d8a 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -401,13 +401,8 @@ Module gid_Module_Root_Files_5
gid_File_Lib_sn_tools,
gid_File_Lib_relnotes,
GID_FILE_LIB_WPD,
- gid_File_Lib_Mingwm10,
gid_File_Lib_Msvcp70,
gid_File_Lib_Msvcr70,
- gid_File_Lib_Msvcr80,
- gid_File_Lib_Msvcp80,
- gid_File_Lib_Msvcm80,
- gid_File_Msvcm80crt_Manifest,
gid_File_Lib_Ole,
gid_File_Lib_Patchmsi,
gid_File_Lib_Reg4allmsdoc,
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 357f976771b3..3824fe3a0841 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -35,28 +35,28 @@
Shortcut gid_Shortcut_Lib_Icudata
FileID = gid_File_Lib_Icudata;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT5(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icui18n
FileID = gid_File_Lib_Icui18n;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT5(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icule
FileID = gid_File_Lib_Icule;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT5(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
Shortcut gid_Shortcut_Lib_Icuuc
FileID = gid_File_Lib_Icuuc;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT5(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
End
@@ -90,7 +90,7 @@ End
Shortcut gid_Shortcut_Lib_Hsqldb_2
FileID = gid_File_Lib_Hsqldb_2;
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "libhsqldb.jnilib";
Styles = (NETWORK, RELATIVE);
End
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index 403e6385dcfd..d8412b7e2cab 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -50,6 +50,7 @@ File gid_File_Lib_Pythonloader
Name = "pythonloader.uno.dll";
#endif
RegistryID = gid_Starregistry_Services_Rdb;
+ NativeServicesURLPrefix = "vnd.sun.star.expand:$OOO_BASE_DIR/program/";
Styles = (PACKED,UNO_COMPONENT);
End
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index 23ed3b7b2365..e7b3584b32db 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -77,6 +77,6 @@ End
File gid_File_Lib_Shlxtmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Name = "shlxtmsi.dll";
End
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 96960dc6283a..91ff3a33ca0a 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -39,7 +39,7 @@ File gid_File_Lib_Hwpreader
#else
Name = "hwp.dll";
#endif
- Dir = gid_Dir_Program;
+ Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED, UNO_COMPONENT);
RegistryID = gid_Starregistry_Services_Rdb;
End
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 6782e06627b4..d9799069e539 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -397,7 +397,7 @@ BEGIN
%usedtreeconditions = ();
%moduledestination = ();
- $unomaxservices = 25;
+ $unomaxservices = 1800; # regcomp -c argument length
$javamaxservices = 15;
$one_cab_file = 0;
diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm
index 1e21c39cdef3..631db68da9dd 100644
--- a/solenv/bin/modules/installer/servicesfile.pm
+++ b/solenv/bin/modules/installer/servicesfile.pm
@@ -135,50 +135,62 @@ sub register_unocomponents
my $error_occured = 0;
my $filestring = "";
- for ( my $i = 0; $i <= $#{$unocomponents}; )
+ for ( my $i = 0; $i <= $#{$unocomponents}; ++$i )
{
- my $sourcepath = ${$unocomponents}[$i++]->{'sourcepath'};
-
- $filestring = $filestring . make_file_url($sourcepath);
-
- if ( $i % $installer::globals::unomaxservices == 0 || $i > $#{$unocomponents} ) # limiting to $installer::globals::maxservices files
+ my $sourcepath = make_file_url(${$unocomponents}[$i]->{'sourcepath'});
+ my $urlprefix = ${$unocomponents}[$i]->{'NativeServicesURLPrefix'};
+ if (defined($urlprefix))
+ {
+ call_regcomp(
+ $regcompfileref, $servicesfile, $sourcepath, $urlprefix);
+ }
+ else
{
- my @regcompoutput = ();
+ $filestring .= ";" unless $filestring eq "";
+ $filestring .= $sourcepath;
+ }
+ if (length($filestring) > $installer::globals::unomaxservices ||
+ ($i == $#{$unocomponents} && $filestring ne ""))
+ {
+ call_regcomp(
+ $regcompfileref, $servicesfile, $filestring,
+ $nativeservicesurlprefix);
+ $filestring = "";
+ }
+ }
- my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -wop=" . $installer::globals::quote . $nativeservicesurlprefix . $installer::globals::quote . " 2\>\&1 |";
+ return $error_occured;
+}
- open (REG, "$systemcall");
- while (<REG>) {push(@regcompoutput, $_); }
- close (REG);
+sub call_regcomp
+{
+ my ($regcompfileref, $servicesfile, $filestring, $urlprefix) = @_;
+ my @regcompoutput = ();
- my $returnvalue = $?; # $? contains the return value of the systemcall
+ my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -wop=" . $installer::globals::quote . $urlprefix . $installer::globals::quote . " 2\>\&1 |";
- my $infoline = "Systemcall: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
+ open (REG, "$systemcall");
+ while (<REG>) {push(@regcompoutput, $_); }
+ close (REG);
- for ( my $j = 0; $j <= $#regcompoutput; $j++ ) { push( @installer::globals::logfileinfo, "$regcompoutput[$j]"); }
+ my $returnvalue = $?; # $? contains the return value of the systemcall
- if ($returnvalue)
- {
- $infoline = "ERROR: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
- $error_occured = 1;
- }
- else
- {
- $infoline = "SUCCESS: $systemcall\n";
- push( @installer::globals::logfileinfo, $infoline);
- }
+ my $infoline = "Systemcall: $systemcall\n";
+ push( @installer::globals::logfileinfo, $infoline);
- $filestring = "";
- }
- else
- {
- $filestring = $filestring . ";";
- }
- }
+ for ( my $j = 0; $j <= $#regcompoutput; $j++ ) { push( @installer::globals::logfileinfo, "$regcompoutput[$j]"); }
- return $error_occured;
+ if ($returnvalue)
+ {
+ $infoline = "ERROR: $systemcall\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ $error_occured = 1;
+ }
+ else
+ {
+ $infoline = "SUCCESS: $systemcall\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ }
}
################################################################
@@ -343,7 +355,6 @@ sub register_pythoncomponents
$counter++;
}
-# if ((( $counter > 0 ) && ( $counter%$installer::globals::unomaxservices == 0 )) || (( $counter > 0 ) && ( $i == $#{$pythoncomponents} ))) # limiting to $installer::globals::maxservices files
if ( $counter > 0 )
{
$filestring =~ s/\;\s*$//;
generated by cgit (git 2.34.1) at 2025-02-24 03:59:13 +0000