From c166cef2038926bfec05861d0d77c6061f1416ea Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Tue, 8 Feb 2011 10:57:27 +0100 Subject: native361: #i115269# rollback of installation, if unopkg fails --- scp2/source/ooo/windowscustomaction_ooo.scp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scp2') diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 7bd6c18fae99..4db0032367bc 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -201,12 +201,12 @@ End WindowsCustomAction gid_Customaction_Register_Extensions Name = "RegisterExtensions"; - Typ = "65"; + Typ = "1025"; Source = "shlxtmsi.dll"; Target = "RegisterExtensions"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end"); - Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end"); + Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "behind_SetInstalllocation"); + Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "behind_SetInstalllocation"); End WindowsCustomAction gid_Customaction_Remove_Extensions @@ -264,8 +264,8 @@ WindowsCustomAction gid_Customaction_CopyExtensionData Source = "shlxtmsi.dll"; Target = "copyExtensionData"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "RegisterExtensions"); - Assignment2 = ("AdminExecuteSequence", "", "RegisterExtensions"); + Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end"); + Assignment2 = ("AdminExecuteSequence", "", "end"); End WindowsCustomAction gid_Customaction_RegCleanOld -- cgit From a41005410d094f50df54258e30138f36d7175fe0 Mon Sep 17 00:00:00 2001 From: ka Date: Fri, 18 Feb 2011 05:20:51 +0100 Subject: ka102: type changes nneded for DEV300_m100 --- scp2/source/ooo/file_ooo.scp | 12 ++++++++++++ scp2/source/ooo/module_hidden_ooo.scp | 5 ++--- 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'scp2') diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index eab2ebdf1734..0edada0e426c 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -2118,3 +2118,15 @@ End // UnixRights = 444; // End // #endif + +// #if defined WNT || defined MACOSX +// File gid_File_Lib_Librsvg +// Dir = gid_Dir_Program; +// ARCHIVE_TXT_FILE_BODY; +// #if defined WNT +// Name = "librsvg_w32.zip"; +// #else +// Name = "librsvg_mac.zip"; +// #endif +// End +// #endif diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 3810b3126334..5f89b276303e 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -248,7 +248,8 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Lprxw, gid_File_Lib_Libtextcat, gid_File_Lib_Guesslang, - gid_File_Lib_Tfu); + gid_File_Lib_Tfu, + gid_File_Lib_Librsvg); End Module gid_Module_Root_Files_5 @@ -809,5 +810,3 @@ End // Styles = (HIDDEN_ROOT); // End // #endif - - -- cgit From 1ee91da9264726ad2391052726e7f56f5be39714 Mon Sep 17 00:00:00 2001 From: ka Date: Mon, 21 Feb 2011 02:57:37 +0100 Subject: ka102: #i116970# Write extents of exported SVG / syntax --- scp2/source/ooo/file_ooo.scp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'scp2') diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 0edada0e426c..a03af848d8aa 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -2119,14 +2119,14 @@ End // End // #endif -// #if defined WNT || defined MACOSX -// File gid_File_Lib_Librsvg -// Dir = gid_Dir_Program; -// ARCHIVE_TXT_FILE_BODY; -// #if defined WNT -// Name = "librsvg_w32.zip"; -// #else -// Name = "librsvg_mac.zip"; -// #endif -// End -// #endif +#if defined WNT || defined MACOSX +File gid_File_Lib_Librsvg + Dir = gid_Dir_Program; + ARCHIVE_TXT_FILE_BODY; +#if defined WNT + Name = "librsvg_w32.zip"; +#else + Name = "librsvg_mac.zip"; +#endif +End +#endif -- cgit From 3cc35e61a47a4d41c02eaac1fd7776cc3d963908 Mon Sep 17 00:00:00 2001 From: ka Date: Mon, 21 Feb 2011 23:01:01 +0100 Subject: ka102: no packaging of prebundled librsvg --- scp2/source/ooo/file_ooo.scp | 11 ----------- scp2/source/ooo/module_hidden_ooo.scp | 3 +-- 2 files changed, 1 insertion(+), 13 deletions(-) (limited to 'scp2') diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a03af848d8aa..1cc97d8bef12 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -2119,14 +2119,3 @@ End // End // #endif -#if defined WNT || defined MACOSX -File gid_File_Lib_Librsvg - Dir = gid_Dir_Program; - ARCHIVE_TXT_FILE_BODY; -#if defined WNT - Name = "librsvg_w32.zip"; -#else - Name = "librsvg_mac.zip"; -#endif -End -#endif diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 5f89b276303e..25c36f714954 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -248,8 +248,7 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Lprxw, gid_File_Lib_Libtextcat, gid_File_Lib_Guesslang, - gid_File_Lib_Tfu, - gid_File_Lib_Librsvg); + gid_File_Lib_Tfu); End Module gid_Module_Root_Files_5 -- cgit From 1138fad1b357b5dba76670227e785565e42f164b Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Wed, 9 Mar 2011 13:43:38 +0100 Subject: native367: #o11840947# preparing OOO 3.4 --- scp2/source/ooo/windowscustomaction_ooo.scp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scp2') diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index 7bd6c18fae99..a4090b21e553 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -474,8 +474,8 @@ WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties Source = "rebase.dll"; Target = "RebaseLibrariesOnProperties"; Inbinarytable = 1; - Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\"", "end"); - Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end"); + Assignment1 = ("InstallExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end"); + Assignment2 = ("AdminExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end"); End WindowsCustomAction gid_Customaction_ShowSurvey -- cgit From a8167e3b5574a33042ac76bc6c82cf2fc33265ad Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Tue, 29 Mar 2011 14:36:53 +0200 Subject: rsvglibs: conditionally install dependencies --- scp2/source/ooo/file_library_ooo.scp | 148 ++++++++++++++++++++++++++++++++++ scp2/source/ooo/makefile.mk | 33 ++++++++ scp2/source/ooo/module_hidden_ooo.scp | 26 ++++++ scp2/source/ooo/shortcut_ooo.scp | 7 ++ 4 files changed, 214 insertions(+) (limited to 'scp2') diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 0e3eaba90e84..6f2905f47505 100755 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1751,3 +1751,151 @@ STD_LIB_FILE(gid_File_Lib_Unordf, unordf) STD_LIB_FILE( gid_File_Lib_For, for) STD_LIB_FILE( gid_File_Lib_Forui, forui) +// RSVG and dependencies +#if ! defined (SYSTEM_GETTEXT) +File gid_File_Lib_Intl + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = "libintl.8.dylib"; + #elif defined WNT + Name = "intl.dll"; + #endif +End +#endif + +#if ! defined SYSTEM_GLIB +File gid_File_Lib_Glib + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = "libglib-2.0.0.dylib"; + #elif defined WNT + Name = "libglib-2.0-0.dll"; + #endif +End +File gid_File_Lib_Gthread + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = "libgthread-2.0.0.dylib"; + #elif defined WNT + Name = "libgthread-2.0-0.dll"; + #endif +End +File gid_File_Lib_Gobject + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = "libgobject-2.0.0.dylib"; + #elif defined WNT + Name = "libgobject-2.0-0.dll"; + #endif +End +File gid_File_Lib_Gio + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = "libgio-2.0.0.dylib"; + #elif defined WNT + Name = "libgio-2.0-0.dll"; + #endif +End +File gid_File_Lib_Gmodule + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = "libgmodule-2.0.0.dylib"; + #elif defined WNT + Name = "libgmodule-2.0-0.dll"; + #endif +End +#endif + +#if ! defined SYSTEM_GDKPIXBUF +File gid_File_Lib_Gdkpixbuf + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = "libgdk_pixbuf-2.0.0.dylib"; + #elif defined WNT + Name = "libgdk_pixbuf-2.0-0.dll"; + #endif +End +#endif + +#if ! defined SYSTEM_LIBCROCO +File gid_File_Lib_Libcroco + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = "libcroco-0.6.3.0.1.dylib"; + #elif defined WNT + Name = "libcroco-0.6-3.dll"; + #endif +End +#endif + +#if ! defined SYSTEM_PANGO +File gid_File_Lib_Libpango + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = "libpango-1.0.0.dylib"; + #elif defined WNT + Name = "libpango-1.0-0.dll"; + #endif +End +File gid_File_Lib_Libpangocairo + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = "libpangocairo-1.0.0.dylib"; + #elif defined WNT + Name = "libpangocairo-1.0-0.dll"; + #endif +End +#if defined WNT +File gid_File_Lib_Libpangowin32 + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + Name = "libpangowin32-1.0-0.dll"; +End +#endif +#endif + +#if ! defined SYSTEM_LIBGSF +File gid_File_Lib_Libgsf + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; +#ifdef WNT + Name = "gsf-1.dll"; +#endif +End +#endif + +#if ! defined SYSTEM_LIBRSVG +File gid_File_Lib_Librsvg + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = "librsvg-2.2.dylib"; + #elif defined WNT + Name = "librsvg-2-2.dll"; + #endif +End +#endif + diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 77e3456443ab..7a7507c9fcad 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -251,6 +251,39 @@ SCPDEFS+=-DMINGW_GCCDLL=\""$(MINGW_GCCDLL)"\" SCPDEFS+=-DMINGW_GXXDLL=\""$(MINGW_GXXDLL)"\" .ENDIF +.IF "$(SYSTEM_GDKPIXBUF)" == "YES" +SCPDEFS+=-DSYSTEM_GDKPIXBUF +.ENDIF + +.IF "$(SYSTEM_GETTEXT)" == "YES" +SCPDEFS+=-DSYSTEM_GETTEXT +.ENDIF + +.IF "$(SYSTEM_GLIB)" == "YES" +SCPDEFS+=-DSYSTEM_GLIB +.ENDIF + +.IF "$(SYSTEM_LIBCROCO)" == "YES" +SCPDEFS+=-DSYSTEM_LIBCROCO +.ENDIF + +.IF "$(SYSTEM_LIBJPEG)" == "YES" +SCPDEFS+=-DSYSTEM_LIBJPEG +.ENDIF + +.IF "$(SYSTEM_LIBRSVG)" == "YES" +SCPDEFS+=-DSYSTEM_LIBRSVG +.ENDIF + +.IF "$(SYSTEM_PANGO)" == "YES" +SCPDEFS+=-DSYSTEM_PANGO +.ENDIF + +.IF "$(SYSTEM_LIBGSF)" == "YES" +SCPDEFS+=-DSYSTEM_LIBGSF +.ENDIF + + SCP_PRODUCT_TYPE=osl ICUVERSION_DEPENDENT_FILES= \ diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 3810b3126334..40d7721416d9 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -262,6 +262,32 @@ Module gid_Module_Root_Files_5 Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Dat_Root5, +#if ! defined SYSTEM_GETTEXT + gid_File_Lib_Intl, +#endif +#if ! defined SYSTEM_GLIB + gid_File_Lib_Glib, + gid_File_Lib_Gobject, + gid_File_Lib_Gthread, + gid_File_Lib_Gmodule, + gid_File_Lib_Gio, +#endif +#if ! defined SYSTEM_GDKPIXBUF + gid_File_Lib_Gdkpixbuf, +#endif +#if ! defined SYSTEM_LIBCROCO + gid_File_Lib_Libcroco, +#endif +#if ! defined SYSTEM_PANGO + gid_File_Lib_Libpango, + gid_File_Lib_Libpangocairo, +#ifdef WNT + gid_File_Lib_Libpangowin32, +#endif +#endif +#if ! defined SYSTEM_LIBGSF + gid_File_Lib_Libgsf, +#endif gid_File_Lib_Dict_Ja, gid_File_Lib_Dict_Zh, gid_File_Lib_Collator_Data, diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index fb43b041c585..19e0aba77e11 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -92,6 +92,13 @@ Shortcut gid_Shortcut_Lib_Hsqldb_2 Styles = (NETWORK, RELATIVE); End +Shortcut gid_Shortcut_Lib_Libcroco + FileID = gid_File_Lib_Libcroco; + Dir = SCP2_OOO_BIN_DIR; + Name = "libcroco-0.6.3.dylib"; + Styles = (NETWORK, RELATIVE); +End + #endif //i44154 -end- -- cgit