diff options
author | Kai Sommerfeld <kso@openoffice.org> | 2009-12-10 10:15:20 +0100 |
---|---|---|
committer | Kai Sommerfeld <kso@openoffice.org> | 2009-12-10 10:15:20 +0100 |
commit | 54ec9fae86d86f27fd2b4decfcb0e50571d8303c (patch) | |
tree | 1823f8ff5765fe6b2410a31b36208942c19a232d /scp2/source/ooo | |
parent | f938cca20e7f33cabfcae99447683013aa8b9868 (diff) | |
parent | cc594ee25eb26a01a52b3906fd769fae005cd57e (diff) |
merged with DEV300_m67
Diffstat (limited to 'scp2/source/ooo')
-rw-r--r-- | scp2/source/ooo/common_brand.scp | 3 | ||||
-rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 5 | ||||
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 52 | ||||
-rw-r--r-- | scp2/source/ooo/makefile.mk | 8 | ||||
-rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 3 | ||||
-rw-r--r-- | scp2/source/ooo/registryitem_ooo.scp | 61 | ||||
-rw-r--r-- | scp2/source/ooo/vc_redist.scp | 16 | ||||
-rwxr-xr-x | scp2/source/ooo/windowscustomaction_ooo.scp | 18 |
8 files changed, 96 insertions, 70 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index bef45bf348d2..bfb171387aa3 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -101,12 +101,9 @@ Module gid_Module_Root_Brand gid_Brand_File_Lib_Npsoplugin, gid_Brand_File_Lib_Subscrib_C05, gid_Brand_File_Oo_Office_Compatibility_Xcu, - gid_Brand_File_Registry_Spool_Oo_Inet_defaultsearchengine_Xcu_C01, gid_Brand_File_Registry_Spool_Oo_Setup_Brand_Xcu, gid_Brand_File_Registry_Spool_Oo_Office_Common_Brand_Xcu, gid_Brand_File_Registry_Spool_Oo_Office_Ui_Brand_Xcu, - gid_Brand_File_Registry_Spool_Oo_Office_Writer_directcursor_Xcu_C01, - gid_Brand_File_Registry_Spool_Oo_Office_Writer_defaultfontarial_Xcu_C01, gid_Brand_File_Script_Unopkg, gid_Brand_File_Share_Registry_Modules_Oo_Office_Jobs_Registration, gid_Brand_File_Share_Xdg_Base, diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 62b569e8f730..ce9fd987d038 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -892,11 +892,6 @@ Directory gid_Dir_Share_Registry_Modules_Oo_Setup HostName = "Setup"; End -Directory gid_Dir_Share_Registry_Modules_Oo_Inet - ParentID = gid_Dir_Share_Registry_Modules_Oo; - HostName = "Inet"; -End - Directory gid_Dir_Share_Registry_Modules_Oo_Office_Accelerators ParentID = gid_Dir_Share_Registry_Modules_Oo_Office; HostName = "Accelerators"; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 16855101dfd2..be5ca61b0563 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -399,7 +399,42 @@ File gid_File_Lib_Vbaobj #endif End +File gid_File_Lib_Vbaswobj + TXT_FILE_BODY; + Styles = (PACKED,UNO_COMPONENT); + RegistryID = gid_Starregistry_Services_Rdb; + Dir = gid_Dir_Program; + #ifdef UNX + Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX)); + #else + Name = STRING(CONCAT4(vbaswobj,DLLPOSTFIX,.uno,.dll)); + #endif +End + +File gid_File_Lib_Vbamsforms + TXT_FILE_BODY; + Styles = (PACKED,UNO_COMPONENT); + RegistryID = gid_Starregistry_Services_Rdb; + Dir = gid_Dir_Program; + #ifdef UNX + Name = STRING(CONCAT4(libmsforms,DLLPOSTFIX,.uno,UNXSUFFIX)); + #else + Name = STRING(CONCAT4(msforms,DLLPOSTFIX,.uno,.dll)); + #endif +End + #endif // VBA_EXTENSION +File gid_File_Lib_Vbahelper + TXT_FILE_BODY; + Styles = (PACKED); + RegistryID = gid_Starregistry_Services_Rdb; + Dir = SCP2_OOO_BIN_DIR; + #ifdef UNX + Name = STRING(CONCAT3(libvbahelper,DLLPOSTFIX,UNXSUFFIX)); + #else + Name = STRING(CONCAT3(vbahelper,DLLPOSTFIX,.dll)); + #endif +End #endif // ENABLE_VBA @@ -1410,20 +1445,6 @@ End #ifdef WNT -File gid_File_Lib_OOoFilt - TXT_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - Name = "ooofilt.dll"; -End - -File gid_File_Lib_OOoFiltProxy - TXT_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - Name = "ooofiltproxy.dll"; -End - File gid_File_Lib_Instooofiltmsi TXT_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); @@ -1561,6 +1582,9 @@ End #ifndef DISABLE_NEON SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1) + #ifndef SYSTEM_NEON + SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) + #endif #endif SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1) diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 0d85cc529b63..345f28a8762c 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -53,6 +53,11 @@ SCPDEFS+=-DENABLE_CRASHDUMP SCPDEFS+=-DBUILD_SPECIAL .ENDIF +.IF "$(BUILD_X64)"!="" +SCPDEFS+=-DBUILD_X64 +.ENDIF + + SCPDEFS+=-DINCLUDE_JAVA_ACCESSBRIDGE .IF "$(PROF_EDITION)"!="" @@ -212,6 +217,9 @@ SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR) .IF "$(DISABLE_NEON)" == "TRUE" SCPDEFS+=-DDISABLE_NEON .ENDIF +.IF "$(SYSTEM_NEON)" == "YES" +SCPDEFS+=-DSYSTEM_NEON +.ENDIF # if yes or unset (neon not used) -> do not install openssl library! .IF $(SYSTEM_OPENSSL) != "YES" diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 9607c88b6e0c..e20308572219 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -360,6 +360,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Ucbhelper, gid_File_Lib_Ucpchelp1, gid_File_Lib_Ucpdav1, + gid_File_Lib_Neon, gid_File_Lib_Ucpfile1, gid_File_Lib_Ucpftp1, gid_File_Lib_Ucphier1, @@ -410,8 +411,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Reg4allmsdoc, gid_File_Lib_Qslnkmsi, gid_File_Lib_Sdqsmsi, - gid_File_Lib_OOoFilt, - gid_File_Lib_OOoFiltProxy, gid_File_Lib_Instooofiltmsi, gid_File_Lib_Smplmail, gid_File_Lib_Gconfebe, diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index 4e34805e33ec..d06c4bd3864c 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -37,6 +37,13 @@ RegistryItem gid_Regitem_Bau Value = "soffice.StarConfigFile.6"; End +RegistryItem gid_Regitem_AppID__df595024_3257_41b3_bcf1_a51515ad205e + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + Subkey = "AppID\{82154420-0FBF-11d4-8313-005004526AB4}"; + ModuleID = gid_Module_Root; + Value = "%PRODUCTNAME Service Manager"; +End + RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}"; @@ -44,6 +51,14 @@ RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_ Value = "%PRODUCTNAME Service Manager (Ver 1.0)"; End +RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af_AppID + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}"; + ModuleID = gid_Module_Root; + Name = "AppID"; + Value = "{82154420-0FBF-11d4-8313-005004526AB4}"; +End + RegistryItem gid_Regitem_Clsid__3ecf78f0_B1_11d2_8ebe_005ad848af__Localserver32 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "CLSID\{82154420-0FBF-11d4-8313-005004526AB4}\LocalServer32"; @@ -518,52 +533,6 @@ RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded Value = "<progpath>\program"; End -// Begin registry items for the MS Indexing server filter component - -RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Root; - Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; -// Better?: "OpenOffice.org Format Filter" -// old: Value = "opendocument.org Filter"; - Value = "OpenDocument Format Filter"; - Styles = (); -End - -RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Root; - Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32"; - Value = "[BASISINSTALLLOCATION]program\ooofiltproxy.dll"; -End - -RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Root; - Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32"; - Name = "ThreadingModel"; - Value = "Apartment"; -End - -RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262 - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Root; - Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}"; -//? Better: "OpenOffice.org Persistent Handler" -// old: Value = "opendocument.org Persistent Handler"; - Value = "OpenDocument Format Persistent Handler"; - Styles = (); -End - -RegistryItem gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Root; - Subkey = "CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}"; - Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}"; -End - -// End registry items for the MS Indexing server filter component - // "OpenWith" Windows Registry keys for extensions supported by OOo // new oxt file extension for office extension packages diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 427f698bd467..cefdd69ce034 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -40,6 +40,16 @@ WindowsCustomAction gid_Customaction_InstallRuntime Assignment1 = ("InstallUISequence", "VersionNT >= 600 and VersionNT < 700 And OLDPRODUCTSSAMEMAJOR And Not REMOVE=\"ALL\" And Not PATCH", "ExecuteAction"); End +WindowsCustomAction gid_Customaction_InstallRuntime_X64 + Name = "InstallRuntimeX64"; + Typ = "98"; + Source = "SystemFolder"; + Target = "[SourceDir]redist\vcredist_x64.exe /qb"; + Inbinarytable = 0; + Styles = (NO_FILE); + Assignment1 = ("InstallUISequence", "Not REMOVE=\"ALL\" And Not PATCH And VersionNT64", "ExecuteAction"); +End + ScpAction scp_Copy_vcredist_x86 #if defined(BUILD_SPECIAL) Copy = "vcredist_x86_9.0.21022.218.exe"; @@ -49,4 +59,10 @@ ScpAction scp_Copy_vcredist_x86 Name = "vcredist_x86.exe"; Subdir = "redist"; End + +ScpAction scp_Copy_vcredist_x64 + Copy = "vcredist_x64.exe"; + Name = "vcredist_x64.exe"; + Subdir = "redist"; +End #endif diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp index d5ececcbac73..b4ddac39799b 100755 --- a/scp2/source/ooo/windowscustomaction_ooo.scp +++ b/scp2/source/ooo/windowscustomaction_ooo.scp @@ -75,6 +75,24 @@ WindowsCustomAction gid_Customaction_Regactivexdll2 Assignment1 = ("InstallExecuteSequence", "\&FEATURETEMPLATE=2 And \!FEATURETEMPLATE=3 And Not PATCH", "RemoveExistingProducts"); End +WindowsCustomAction gid_Customaction_Reg64dll1 + Name = "Reg64dll1"; + Typ = "65"; + Source = "reg64msi.dll"; + Target = "InstallReg64"; + Inbinarytable = 1; + Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" and VersionNT64", "end"); +End + +WindowsCustomAction gid_Customaction_Reg64dll2 + Name = "Reg64dll2"; + Typ = "65"; + Source = "reg64msi.dll"; + Target = "DeinstallReg64"; + Inbinarytable = 1; + Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and VersionNT64", "end"); +End + WindowsCustomAction gid_Customaction_Jfregcadll1 Name = "Jfregcadll1"; Typ = "65"; |