[Libreoffice-commits] core.git: 2 commits - Repository.mk scp2/source
Andras Timar
atimar at suse.com
Thu Aug 29 13:39:15 PDT 2013
Repository.mk | 14 +++------
scp2/source/ooo/file_library_ooo.scp | 52 ++++++++++++++++++++++++++++++++--
scp2/source/ooo/module_hidden_ooo.scp | 5 +++
scp2/source/ooo/ure.scp | 24 +++++++--------
4 files changed, 72 insertions(+), 23 deletions(-)
New commits:
commit a794f66071796fcfa2f6ad7c3c6214325ac30258
Author: Andras Timar <atimar at suse.com>
Date: Thu Aug 29 13:38:49 2013 -0700
scp2: remove obsolete DONTRENAMEINPATCH flag
Change-Id: I4e40f29df1583c551fb7606d41b609d529db036a
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 583e458..39dc1cc 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -41,7 +41,7 @@ End
File gid_File_Lib_Cli_Oootypes_Assembly
TXT_FILE_BODY;
- Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSEMBLY);
Name = "cli_oootypes.dll";
Dir = gid_Brand_Dir_Program;
Assemblyname = "cli_oootypes";
@@ -57,7 +57,7 @@ End
#if defined _MSC_VER
File gid_File_Lib_Policy_Cli_Oootypes_Assembly
TXT_FILE_BODY;
- Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSEMBLY);
Name = "${CLI_OOOTYPES_POLICY_ASSEMBLY}.dll";
Dir = gid_Brand_Dir_Program;
Assemblyname = "${CLI_OOOTYPES_POLICY_ASSEMBLY}";
@@ -74,7 +74,7 @@ End
File gid_File_Lib_Policy_Cli_Oootypes_Config
TXT_FILE_BODY;
- Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSIGNCOMPOMENT);
Name = "cli_oootypes.config";
Dir = gid_Brand_Dir_Program;
AssignComponent = gid_File_Lib_Policy_Cli_Oootypes_Assembly;
@@ -509,7 +509,7 @@ End
File gid_File_Lib_sn_tools
LIB_FILE_BODY;
- Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
Dir = SCP2_OOO_LIB_DIR;
Name = "sn_tools.dll";
End
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 206e265..2c4e7f6 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -304,7 +304,7 @@ End
File gid_File_Dl_Cli_Ure_Assembly
TXT_FILE_BODY;
- Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSEMBLY);
Name = "cli_ure.dll";
Dir = SCP2_URE_DL_DIR;
Assemblyname = "cli_ure";
@@ -317,7 +317,7 @@ End
File gid_File_Dl_Policy_Cli_Ure_Assembly
TXT_FILE_BODY;
- Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSEMBLY);
Name = "${CLI_URE_POLICY_ASSEMBLY}.dll";
Dir = SCP2_URE_DL_DIR;
Assemblyname = "${CLI_URE_POLICY_ASSEMBLY}";
@@ -330,7 +330,7 @@ End
File gid_File_Dl_Policy_Cli_Ure_Config
TXT_FILE_BODY;
- Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSIGNCOMPOMENT);
Name = "cli_ure.config";
Dir = SCP2_URE_DL_DIR;
AssignComponent = gid_File_Dl_Policy_Cli_Ure_Assembly;
@@ -338,7 +338,7 @@ End
File gid_File_Dl_Cli_Basetypes_Assembly
TXT_FILE_BODY;
- Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSEMBLY);
Name = "cli_basetypes.dll";
Dir = SCP2_URE_DL_DIR;
Assemblyname = "cli_basetypes";
@@ -351,7 +351,7 @@ End
File gid_File_Dl_Policy_Cli_Basetypes_Assembly
TXT_FILE_BODY;
- Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSEMBLY);
Name = "${CLI_BASETYPES_POLICY_ASSEMBLY}.dll";
Dir = SCP2_URE_DL_DIR;
Assemblyname = "${CLI_BASETYPES_POLICY_ASSEMBLY}";
@@ -364,7 +364,7 @@ End
File gid_File_Dl_Policy_Cli_Basetypes_Config
TXT_FILE_BODY;
- Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSIGNCOMPOMENT);
Name = "cli_basetypes.config";
Dir = SCP2_URE_DL_DIR;
AssignComponent = gid_File_Dl_Policy_Cli_Basetypes_Assembly;
@@ -372,7 +372,7 @@ End
File gid_File_Dl_Cli_Uretypes_Assembly
TXT_FILE_BODY;
- Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSEMBLY);
Name = "cli_uretypes.dll";
Dir = SCP2_URE_DL_DIR;
Assemblyname = "cli_uretypes";
@@ -385,7 +385,7 @@ End
File gid_File_Dl_Policy_Cli_Uretypes_Assembly
TXT_FILE_BODY;
- Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSEMBLY);
Name = "${CLI_URETYPES_POLICY_ASSEMBLY}.dll";
Dir = SCP2_URE_DL_DIR;
Assemblyname = "${CLI_URETYPES_POLICY_ASSEMBLY}";
@@ -398,7 +398,7 @@ End
File gid_File_Dl_Policy_Cli_Uretypes_Config
TXT_FILE_BODY;
- Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSIGNCOMPOMENT);
Name = "cli_uretypes.config";
Dir = SCP2_URE_DL_DIR;
AssignComponent = gid_File_Dl_Policy_Cli_Uretypes_Assembly;
@@ -406,7 +406,7 @@ End
File gid_File_Lib_Cli_Cppuhelper_Assembly
TXT_FILE_BODY;
- Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSEMBLY);
Name = "assembly/cli_cppuhelper.dll";
Dir = SCP2_URE_DL_DIR;
Assemblyname = "cli_cppuhelper";
@@ -419,7 +419,7 @@ End
File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
TXT_FILE_BODY;
- Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSEMBLY);
Name = "${CLI_CPPUHELPER_POLICY_ASSEMBLY}.dll";
Dir = SCP2_URE_DL_DIR;
Assemblyname = "${CLI_CPPUHELPER_POLICY_ASSEMBLY}";
@@ -432,7 +432,7 @@ End
File gid_File_Lib_Policy_Cli_Cppuhelper_Config
TXT_FILE_BODY;
- Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
+ Styles = (PACKED, ASSIGNCOMPOMENT);
Name = "cli_cppuhelper.config";
Dir = SCP2_URE_DL_DIR;
AssignComponent = gid_File_Lib_Policy_Cli_Cppuhelper_Assembly;
commit 4b600518e061436fa0384578a1e7b25f44788297
Author: Andras Timar <atimar at suse.com>
Date: Thu Aug 29 12:54:45 2013 -0700
take out MSI CustomAction dlls from AutoInstall
BINARYTABLE, BINARYTABLE_ONLY flags were not handled
Change-Id: Ic6a0233e4f4213b9ea83a491949ab05c299a9201
diff --git a/Repository.mk b/Repository.mk
index 8c62763..3c52399 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -550,14 +550,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(DISABLE_ATL),,\
inprocserv \
) \
- $(if $(WINDOWS_SDK_HOME),\
- instooofiltmsi \
- qslnkmsi \
- reg4allmsdoc \
- sdqsmsi \
- sellangmsi \
- sn_tools \
- ) \
) \
))
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
@@ -579,16 +571,22 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
fop \
+ instooofiltmsi \
jfregca \
ooofilt \
ooofilt_x64 \
propertyhdl \
propertyhdl_x64 \
+ qslnkmsi \
+ reg4allmsdoc \
regactivex \
regpatchactivex \
+ sdqsmsi \
+ sellangmsi \
shlxthdl \
shlxthdl_x64 \
shlxtmsi \
+ sn_tools \
so_activex \
so_activex_x64 \
sysdtrans \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a86e8d7..583e458 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -504,3 +504,49 @@ File gid_File_Lib_Rdf
#endif
End
#endif // SYSTEM_REDLAND
+
+#if defined(WNT) && defined(HAVE_WINDOWS_SDK)
+
+File gid_File_Lib_sn_tools
+ LIB_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
+ Dir = SCP2_OOO_LIB_DIR;
+ Name = "sn_tools.dll";
+End
+
+File gid_File_Lib_Reg4allmsdoc
+ LIB_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "reg4allmsdoc.dll";
+End
+
+File gid_File_Lib_Qslnkmsi
+ LIB_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "qslnkmsi.dll";
+End
+
+File gid_File_Lib_Sdqsmsi
+ LIB_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "sdqsmsi.dll";
+End
+
+File gid_File_Lib_Instooofiltmsi
+ LIB_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+ Dir = SCP2_OOO_BIN_DIR;
+ Name = "instooofiltmsi.dll";
+End
+
+File gid_File_Lib_sellangmsi
+ LIB_FILE_BODY;
+ Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+ Dir = gid_Brand_Dir_Program;
+ Name = "sellangmsi.dll";
+End
+
+#endif /* WNT && HAVE_WINDOWS_SDK */
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index f05cc5b..8d90f12 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -207,7 +207,12 @@ Module gid_Module_Root_Files_5
gid_File_Lib_I18n,
gid_File_Lib_Accessbridge,
gid_File_Lib_Dl,
+ gid_File_Lib_sn_tools,
GID_FILE_LIB_WPD,
+ gid_File_Lib_Reg4allmsdoc,
+ gid_File_Lib_Qslnkmsi,
+ gid_File_Lib_Sdqsmsi,
+ gid_File_Lib_Instooofiltmsi,
gid_File_Lib_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Assembly,
gid_File_Lib_Policy_Cli_Oootypes_Config);
More information about the Libreoffice-commits
mailing list