diff options
| author | sb <sb@openoffice.org> | 2010-04-07 13:14:23 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-07 13:14:23 +0200 |
| commit | b1158104abbda340bc19d276bc3dc32a71f16293 (patch) | |
| tree | e7b41d81ed39297178db6b1dd6384fc6251658ef | |
| parent | ac427da5f24b84bc725733d5b0856116def1f2b2 (diff) | |
| parent | 8bfbf472c29017fba913f78e84900950c7589f69 (diff) | |
sb118: merged in re/DEV300_next towards DEV300_m76
49 files changed, 695 insertions, 388 deletions
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp Binary files differindex 5078e379c37d..d7f7f635917e 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Banner.bmp diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp Binary files differindex e69b561f9165..515f8faecc7a 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp Binary files differindex 5078e379c37d..d7f7f635917e 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Banner.bmp diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp Binary files differindex e69b561f9165..515f8faecc7a 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp Binary files differindex 5078e379c37d..d7f7f635917e 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Banner.bmp diff --git a/instsetoo_native/res/DS_Store b/instsetoo_native/res/DS_Store Binary files differindex 3b7c9f7794b9..632e6aff95be 100644 --- a/instsetoo_native/res/DS_Store +++ b/instsetoo_native/res/DS_Store diff --git a/instsetoo_native/res/osxdndinstall.png b/instsetoo_native/res/osxdndinstall.png Binary files differindex 6d6e7dc596b0..1d981820b8b2 100644 --- a/instsetoo_native/res/osxdndinstall.png +++ b/instsetoo_native/res/osxdndinstall.png diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 7897327d8de8..abcc2e3f0b32 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -25,10 +25,11 @@ Globals POOLPRODUCT 1 REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb REGISTRATIONURL http://survey.services.openoffice.org/user/index.php - PROGRESSBARCOLOR 4,68,155 - PROGRESSSIZE 412,7 - PROGRESSPOSITION 14,230 - PROGRESSFRAMECOLOR 58,159,232 + PROGRESSBARCOLOR 14,133,205 + PROGRESSSIZE 320,7 + PROGRESSPOSITION 185,206 + PROGRESSFRAMECOLOR 207,208,211 + NATIVEPROGRESS true REGISTRYLAYERNAME Layers SERVICEPACK 1 UPDATE_DATABASE 1 @@ -36,6 +37,7 @@ Globals UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt WINDOWSPATCHLEVEL 6 + OPENSOURCE 1 } } } @@ -92,6 +94,7 @@ OpenOffice STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -156,6 +159,7 @@ OpenOffice_wJRE STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -227,6 +231,7 @@ OpenOffice_Dev STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -270,6 +275,7 @@ URE STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk PACKAGEMAP package_names_ext.txt } @@ -315,6 +321,7 @@ OpenOffice_SDK STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 } active 1 compression 5 @@ -364,6 +371,7 @@ OpenOffice_Dev_SDK STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/OpenOffice.org/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/OpenOffice.org/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/OpenOffice.org/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 } active 1 compression 5 @@ -392,6 +400,7 @@ BrOffice PROGRESSSIZE PROGRESSPOSITION PROGRESSFRAMECOLOR + NATIVEPROGRESS UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt @@ -427,6 +436,7 @@ BrOffice STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -459,6 +469,7 @@ BrOffice_wJRE PROGRESSSIZE PROGRESSPOSITION PROGRESSFRAMECOLOR + NATIVEPROGRESS UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt @@ -495,6 +506,7 @@ BrOffice_wJRE STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } @@ -529,6 +541,7 @@ BrOffice_Dev PROGRESSSIZE PROGRESSPOSITION PROGRESSFRAMECOLOR + NATIVEPROGRESS BASISPACKAGEPREFIX ooobasis-dev UREPACKAGEPREFIX ooodev SOLSUREPACKAGEPREFIX ooodev @@ -569,6 +582,7 @@ BrOffice_Dev STARTCENTER_ADDFEATURE_URL http://tools.services.openoffice.org/forward/BrOffice/extensions.jsp?cid=920794 STARTCENTER_INFO_URL http://tools.services.openoffice.org/forward/BrOffice/homepage.jsp STARTCENTER_TEMPLREP_URL http://tools.services.openoffice.org/forward/BrOffice/templates.jsp?cid=926383 + STARTCENTER_LAYOUT_STYLE 0 REGISTRATION_PRODUCT OpenOffice.org REGISTRATION_CID 926117 } diff --git a/instsetoo_native/util/pack.lst b/instsetoo_native/util/pack.lst index 9f5fbfd93246..c19039118909 100755 --- a/instsetoo_native/util/pack.lst +++ b/instsetoo_native/util/pack.lst @@ -19,6 +19,6 @@ OpenOffice_Dev_SDK unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci1 #URE unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12 en-US ure OpenOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de ooolanguagepack OpenOfficeLanguagepack unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi de ooolanguagepack -OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de|fr|ja|ar ooodevlanguagepack +OpenOfficeDevLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro de|fr|ja|ar|ru ooodevlanguagepack #BrOfficeLanguagepack unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro pt-BR broolanguagepack diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 4d8f0b3903be..48a1ae148777 100755..100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -501,7 +501,17 @@ End ModuleID = modid; \ Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \ Name = STRING(CONCAT2(.,key)); \ - Value = STRING(CONCAT3(opendocument.,doc_type,Document.1)); \ + Value = STRING(CONCAT3(soffice.Star,doc_type,Document.6)); \ + Styles = (); \ + End + +#define REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \ + RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_,name) \ + ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ + ModuleID = modid; \ + Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \ + Name = STRING(CONCAT2(.,key)); \ + Value = STRING(CONCAT3(soffice.Star,doc_type,Template.6)); \ Styles = (); \ End @@ -518,6 +528,19 @@ End REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \ REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \ +#define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \ + CONDITIONAL_MODULE_ENTRY(name,modid) \ + REGISTRY_ENTRY_OPEN_WITH(name,cond,doc_type,modid,key) \ + CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \ + REGISTRY_ENTRY_DOC(name,modid,disp_name) \ + REGISTRY_ENTRY_ICON(name,modid,icon_id) \ + REGISTRY_ENTRY_SHELL(name,default,modid) \ + REGISTRY_ENTRY_NEW_CMD(name,modid,app) \ + REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \ + REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \ + REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \ + REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \ + // --------------------------------------- #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \ diff --git a/scp2/source/binfilter/registryitem_binfilter.scp b/scp2/source/binfilter/registryitem_binfilter.scp index 7640e83ec20a..fa4e2297516d 100644 --- a/scp2/source/binfilter/registryitem_binfilter.scp +++ b/scp2/source/binfilter/registryitem_binfilter.scp @@ -816,7 +816,7 @@ RegistryItem gid_Regitem_OpenOffice_SDW_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sdw\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.WriterDocument.1"; + Name = "soffice.StarWriterDocument.5"; Value = " "; End @@ -825,7 +825,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".vor\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.WriterDocument.1"; + Name = "soffice.StarWriterDocument.5"; Value = " "; End @@ -834,7 +834,7 @@ RegistryItem gid_Regitem_OpenOffice_SGL_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sgl\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.WriterDocument.1"; + Name = "soffice.StarWriterGlobalDocument.5"; Value = " "; End @@ -843,7 +843,7 @@ RegistryItem gid_Regitem_OpenOffice_SDC_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sdc\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.5"; Value = " "; End @@ -852,7 +852,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".vor\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.5"; Value = " "; End @@ -861,7 +861,7 @@ RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Impress ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sdd\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.ImpressDocument.1"; + Name = "soffice.StarImpressDocument.5"; Value = " "; End @@ -870,7 +870,7 @@ RegistryItem gid_Regitem_OpenOffice_SDP_OpenWith_Impress ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sdp\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.ImpressDocument.1"; + Name = "soffice.StarImpressDocument.5"; Value = " "; End @@ -879,7 +879,7 @@ RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Impress ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sda\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.ImpressDocument.1"; + Name = "soffice.StarImpressDocument.5"; Value = " "; End @@ -888,7 +888,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Impress ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".vor\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.ImpressDocument.1"; + Name = "soffice.StarImpressDocument.5"; Value = " "; End @@ -897,7 +897,7 @@ RegistryItem gid_Regitem_OpenOffice_SDA_OpenWith_Draw ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sda\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.DrawDocument.1"; + Name = "soffice.StarDrawDocument.5"; Value = " "; End @@ -906,7 +906,7 @@ RegistryItem gid_Regitem_OpenOffice_SDD_OpenWith_Draw ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sdd\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.DrawDocument.1"; + Name = "soffice.StarDrawDocument.5"; Value = " "; End @@ -915,7 +915,7 @@ RegistryItem gid_Regitem_OpenOffice_VOR_OpenWith_Draw ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".vor\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.DrawDocument.1"; + Name = "soffice.StarDrawDocument.5"; Value = " "; End @@ -924,7 +924,7 @@ RegistryItem gid_Regitem_OpenOffice_SMF_OpenWith_Math ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".smf\OpenWithProgIDs"; ModuleID = gid_Module_Optional_Binfilter; - Name = "opendocument.MathDocument.1"; + Name = "soffice.StarMathDocument.5"; Value = " "; End diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index 31742152cee1..e2504579e0a0 100755..100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -345,7 +345,7 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Calc_Bin; Subkey = "soffice.StarCalcDocument.6\shell\open\command"; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\scalc.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Shell_Print_Command @@ -408,7 +408,7 @@ RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "soffice.StarCalcTemplate.6\shell\open\command"; ModuleID = gid_Module_Prg_Calc_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\scalc.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_Shell_Print_Command @@ -716,13 +716,6 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_New_Command Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; End -// RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command -// ParentID = PREDEFINED_HKEY_CLASSES_ROOT; -// ModuleID = gid_Module_Prg_Calc_Bin; -// Subkey = "opendocument.CalcDocument.1\shell\open\command"; -// Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -// End - RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Calc_Bin; @@ -837,7 +830,7 @@ RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.CalcTemplate.1\shell\open\command"; ModuleID = gid_Module_Prg_Calc_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\scalc.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Openoffice_Calctemplate_1_Shell_Print_Command @@ -879,7 +872,7 @@ RegistryItem gid_Regitem_OpenOffice_SXC_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sxc\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -888,7 +881,7 @@ RegistryItem gid_Regitem_OpenOffice_STC_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".stc\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcTemplate.6"; Value = " "; End @@ -897,7 +890,7 @@ RegistryItem gid_Regitem_OpenOffice_DIF_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".dif\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -906,7 +899,7 @@ RegistryItem gid_Regitem_OpenOffice_DBF_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".dbf\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -915,7 +908,7 @@ RegistryItem gid_Regitem_OpenOffice_XLW_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".xlw\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -924,7 +917,7 @@ RegistryItem gid_Regitem_OpenOffice_RTF_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".rtf\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -933,7 +926,7 @@ RegistryItem gid_Regitem_OpenOffice_SLK_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".slk\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -942,7 +935,7 @@ RegistryItem gid_Regitem_OpenOffice_CSV_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".csv\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -951,7 +944,7 @@ RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".txt\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -960,7 +953,7 @@ RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".htm\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -969,7 +962,7 @@ RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".html\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -978,7 +971,7 @@ RegistryItem gid_Regitem_OpenOffice_WK1_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".wk1\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -987,7 +980,7 @@ RegistryItem gid_Regitem_OpenOffice_WKS_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".wks\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -996,7 +989,7 @@ RegistryItem gid_Regitem_OpenOffice_123_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".123\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End @@ -1005,16 +998,18 @@ RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Calc ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".xml\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Calc_Bin; - Name = "opendocument.CalcDocument.1"; + Name = "soffice.StarCalcDocument.6"; Value = " "; End +// "FileAssociations" entries + RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Stc ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Calc_Bin; Name = ".stc"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcTemplate.6"; Styles = (); End @@ -1023,7 +1018,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Calc_Bin; Name = ".dif"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End @@ -1032,7 +1027,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Calc_Bin; Name = ".dbf"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End @@ -1041,7 +1036,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Calc_Bin; Name = ".slk"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End @@ -1050,7 +1045,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Calc_Bin; Name = ".csv"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End @@ -1059,7 +1054,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Calc_Bin; Name = ".xlw"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End @@ -1068,7 +1063,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Calc_Bin; Name = ".wk1"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End @@ -1077,7 +1072,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Calc_Bin; Name = ".wks"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End @@ -1086,10 +1081,11 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Calc_Bin; Name = ".123"; - Value = "opendocument.CalcDocument.1"; + Value = "soffice.StarCalcDocument.6"; Styles = (); End + RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Scalc_Exe ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\scalc.exe"; @@ -1114,11 +1110,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( stc ) // registering the mso file types -CONDITIONAL_REGISTER_DOC_EXTENSION( Xls, gid_Module_Prg_Calc_Bin, xls, XLS, MS_EXCEL_WORKSHEET_OLD, 3, scalc.exe, open, Calc ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_Bin, xlsx, XLSX, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_Bin, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_Bin, xlsb, XLSB, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Xlt, gid_Module_Prg_Calc_Bin, xlt, XLT, MS_EXCEL_TEMPLATE_OLD, 4, scalc.exe, new, Calc ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Xltx, gid_Module_Prg_Calc_Bin, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Xltm, gid_Module_Prg_Calc_Bin, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Xls, gid_Module_Prg_Calc_Bin, xls, XLS, MS_EXCEL_WORKSHEET_OLD, 29, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_Bin, xlsx, XLSX, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_Bin, xlsm, XLSM, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_Bin, xlsb, XLSB, MS_EXCEL_WORKSHEET, 29, scalc.exe, open, Calc ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt, gid_Module_Prg_Calc_Bin, xlt, XLT, MS_EXCEL_TEMPLATE_OLD, 30, scalc.exe, new, Calc ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_Bin, xltx, XLTX, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_Bin, xltm, XLTM, MS_EXCEL_TEMPLATE, 30, scalc.exe, new, Calc ) diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp index 013f2cfaa9b9..0ecb21536613 100755..100644 --- a/scp2/source/draw/registryitem_draw.scp +++ b/scp2/source/draw/registryitem_draw.scp @@ -313,7 +313,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Draw_Bin; Subkey = "soffice.StarDrawDocument.6\shell\open\command"; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Shell_Print_Command @@ -410,7 +410,7 @@ RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "soffice.StarDrawTemplate.6\shell\open\command"; ModuleID = gid_Module_Prg_Draw_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_Shell_Print_Command @@ -682,13 +682,6 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_New_Command Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; End -// RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command -// ParentID = PREDEFINED_HKEY_CLASSES_ROOT; -// ModuleID = gid_Module_Prg_Draw_Bin; -// Subkey = "opendocument.DrawDocument.1\shell\open\command"; -// Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -// End - RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Draw_Bin; @@ -837,7 +830,7 @@ RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.DrawTemplate.1\shell\open\command"; ModuleID = gid_Module_Prg_Draw_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\sdraw.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_Shell_Print_Command @@ -879,7 +872,7 @@ RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Draw ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sxd\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Draw_Bin; - Name = "opendocument.DrawDocument.1"; + Name = "soffice.StarDrawDocument.6"; Value = " "; End @@ -888,10 +881,11 @@ RegistryItem gid_Regitem_OpenOffice_STD_OpenWith_Draw ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".std\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Draw_Bin; - Name = "opendocument.DrawDocument.1"; + Name = "soffice.StarDrawDocument.6"; Value = " "; End + RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Otg ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; @@ -906,7 +900,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Draw_Bin; Name = ".std"; - Value = "opendocument.DrawDocument.1"; + Value = "soffice.StarDrawTemplate.6"; Styles = (); End diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index cf4ba3ccbcb6..689dcd7e1526 100755..100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -347,7 +347,7 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Impress_Bin; Subkey = "soffice.StarImpressDocument.6\shell\open\command"; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\simpress.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Shell_Print_Command @@ -424,7 +424,7 @@ RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "soffice.StarImpressTemplate.6\shell\open\command"; ModuleID = gid_Module_Prg_Impress_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\simpress.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_Shell_Print_Command @@ -731,13 +731,6 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_New_Command Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; End -// RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command -// ParentID = PREDEFINED_HKEY_CLASSES_ROOT; -// ModuleID = gid_Module_Prg_Impress_Bin; -// Subkey = "opendocument.ImpressDocument.1\shell\open\command"; -// Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -// End - RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Impress_Bin; @@ -866,7 +859,7 @@ RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.ImpressTemplate.1\shell\open\command"; ModuleID = gid_Module_Prg_Impress_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\simpress.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_Shell_Print_Command @@ -908,7 +901,7 @@ RegistryItem gid_Regitem_OpenOffice_SXI_OpenWith_Impress ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sxi\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Impress_Bin; - Name = "opendocument.ImpressDocument.1"; + Name = "soffice.StarImpressDocument.6"; Value = " "; End @@ -917,7 +910,7 @@ RegistryItem gid_Regitem_OpenOffice_STI_OpenWith_Impress ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sti\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Impress_Bin; - Name = "opendocument.ImpressDocument.1"; + Name = "soffice.StarImpressDocument.6"; Value = " "; End @@ -926,7 +919,7 @@ RegistryItem gid_Regitem_OpenOffice_SXD_OpenWith_Impress ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sxd\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Impress_Bin; - Name = "opendocument.ImpressDocument.1"; + Name = "soffice.StarImpressDocument.6"; Value = " "; End @@ -954,7 +947,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Impress_Bin; Name = ".sti"; - Value = "opendocument.ImpressDocument.1"; + Value = "soffice.StarImpressDocument.6"; Styles = (); End @@ -982,10 +975,10 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sti ) // registering the mso file types -CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt, gid_Module_Prg_Impress_Bin, ppt, PPT, MS_POWERPOINT_PRESENTATION_OLD, 7, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_Bin, pps, PPS, MS_POWERPOINT_SHOW, 7, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 7, simpress.exe, open, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Pot, gid_Module_Prg_Impress_Bin, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 8, simpress.exe, new, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 8, simpress.exe, new, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Ppt, gid_Module_Prg_Impress_Bin, ppt, PPT, MS_POWERPOINT_PRESENTATION_OLD, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Pps, gid_Module_Prg_Impress_Bin, pps, PPS, MS_POWERPOINT_SHOW, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Pptx, gid_Module_Prg_Impress_Bin, pptx, PPTX, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Pptm, gid_Module_Prg_Impress_Bin, pptm, PPTM, MS_POWERPOINT_PRESENTATION, 33, simpress.exe, open, Impress ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Pot, gid_Module_Prg_Impress_Bin, pot, POT, MS_POWERPOINT_TEMPLATE_OLD, 34, simpress.exe, new, Impress ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potx, gid_Module_Prg_Impress_Bin, potx, POTX, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_Bin, potm, POTM, MS_POWERPOINT_TEMPLATE, 34, simpress.exe, new, Impress ) diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp index a1c71702fc42..b87e5b940356 100755..100644 --- a/scp2/source/math/registryitem_math.scp +++ b/scp2/source/math/registryitem_math.scp @@ -346,7 +346,7 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Math_Bin; Subkey = "soffice.StarMathDocument.6\shell\open\command"; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\smath.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Shell_Print_Command @@ -600,13 +600,6 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_New_Command Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; End -// RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Open_Command -// ParentID = PREDEFINED_HKEY_CLASSES_ROOT; -// ModuleID = gid_Module_Prg_Math_Bin; -// Subkey = "opendocument.MathDocument.1\shell\open\command"; -// Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -// End - RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Math_Bin; @@ -645,7 +638,7 @@ RegistryItem gid_Regitem_OpenOffice_SXM_OpenWith_Math ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sxm\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Math_Bin; - Name = "opendocument.MathDocument.1"; + Name = "soffice.StarMathDocument.6"; Value = " "; End @@ -654,18 +647,18 @@ RegistryItem gid_Regitem_OpenOffice_MML_OpenWith_Math ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".mml\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Math_Bin; - Name = "opendocument.MathDocument.1"; + Name = "soffice.StarMathDocument.6"; Value = " "; End -// RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Mml -// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; -// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; -// ModuleID = gid_Module_Prg_Math_Bin; -// Name = ".mml"; -// Value = "opendocument.MathDocument.1"; -// Styles = (); -// End +RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Mml + ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; + Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; + ModuleID = gid_Module_Prg_Math_Bin; + Name = ".mml"; + Value = "soffice.StarMathDocument.6"; + Styles = (); +End RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Smath_Exe ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index c96313ddb834..9be400ed2d39 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -818,6 +818,15 @@ ProfileItem gid_Brand_Profileitem_Soffice_ProgressFrameColor_So Value = "${PROGRESSFRAMECOLOR}"; End +ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So + ProfileID = gid_Brand_Profile_Soffice_Ini; + ModuleID = gid_Module_Root_Brand; + Section = "Bootstrap"; + Order = 6; + Key = "NativeProgress"; + Value = "${NATIVEPROGRESS}"; +End + #ifdef WNT ProfileItem gid_Brand_Profileitem_Soffice_Hideeula ProfileID = gid_Brand_Profile_Soffice_Ini; @@ -832,6 +841,20 @@ ProfileItem gid_Brand_Profileitem_Soffice_Hideeula End #endif +#ifdef WNT +ProfileItem gid_Brand_Profileitem_Soffice_Startlang + ProfileID = gid_Brand_Profile_Soffice_Ini; + ModuleID = gid_Module_Root_Brand; + Section = "Bootstrap"; + Order = 8; + Key = "STARTLANG"; + Value = "[STARTLANG]"; + Inifiletablekey = "STARTLANG"; + Inifiletableaction = "1"; + Styles = (INIFILETABLE); +End +#endif + ProfileItem gid_Brand_Profileitem_Version_Buildid ProfileID = gid_Brand_Profile_Version_Ini; ModuleID = gid_Module_Root_Brand; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index d21afbc07c5a..9b60afe3d308 100644..100755 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -2098,7 +2098,7 @@ End File gid_File_Extension_Dictionary_Sr Dir = gid_Brand_Dir_Share_Extension_Install; Name = "dict-sr.oxt"; - Styles = (PACKED); + Styles = (PACKED, FORCELANGUAGEPACK); UnixRights = 444; End #endif diff --git a/scp2/source/ooo/folderitem_ooo.ulf b/scp2/source/ooo/folderitem_ooo.ulf index 25443ea9253d..93d938531abe 100644 --- a/scp2/source/ooo/folderitem_ooo.ulf +++ b/scp2/source/ooo/folderitem_ooo.ulf @@ -32,4 +32,4 @@ en-US = "From Template" en-US = "Open Document" [STR_FI_TOOLTIP_SOFFICE] -en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Sun Microsystems." +en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Oracle." diff --git a/scp2/source/ooo/module_systemint.scp b/scp2/source/ooo/module_systemint.scp index ea9faa7e765c..f02b5be04368 100644 --- a/scp2/source/ooo/module_systemint.scp +++ b/scp2/source/ooo/module_systemint.scp @@ -41,7 +41,7 @@ Module gid_Module_Optional_Systemintegration Styles = (SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE); #endif #if (defined(LINUX)) || (defined(SOLARIS)) - PackageName = "%UNIXPRODUCTNAME-desktop-integration.tar.gz"; + PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz"; #else PackageName = ""; #endif diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp index bb3a9ecd4126..ebd0b87fbabd 100644 --- a/scp2/source/ooo/profileitem_ooo.scp +++ b/scp2/source/ooo/profileitem_ooo.scp @@ -148,13 +148,22 @@ ProfileItem gid_Profileitem_Soffice_ProgressPosition Value = "-1,-1"; End +ProfileItem gid_Profileitem_Soffice_NativeProgress + ProfileID = gid_Profile_Soffice_Ini; + ModuleID = gid_Module_Root; + Section = "Bootstrap"; + Order = 6; + Key = "NativeProgress"; + Value = "true"; +End + #ifdef WNT ProfileItem gid_Profileitem_Soffice_Hideeula ProfileID = gid_Profile_Soffice_Ini; ModuleID = gid_Module_Root; Section = "Bootstrap"; - Order = 7; + Order = 8; Key = "HideEula"; Value = "[HIDEEULA]"; Inifiletablekey = "HideEula"; diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index 04162a200ccf..5d8673ef9855 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -140,13 +140,6 @@ RegistryItem gid_Regitem_Soffice_Starconfigfile_6 REG_VALUE_LNG(SO60_CONFIGFILE) End -RegistryItem gid_Regitem_Soffice_Starconfigfile_6_Defaulticon - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - ModuleID = gid_Module_Root; - Subkey = "soffice.StarConfigFile.6\DefaultIcon"; - Value = "<progpath>\program\soffice.exe,17"; -End - RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Apppaths_Soffice_Exe ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\Microsoft\Windows\CurrentVersion\App Paths\soffice.exe"; diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp index b6497f889630..a1233bb1792f 100755..100644 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -346,7 +346,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; Subkey = "soffice.StarWriterDocument.6\shell\open\command"; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\swriter.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Shell_Print_Command @@ -416,7 +416,7 @@ RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "soffice.StarWriterGlobalDocument.6\shell\open\command"; ModuleID = gid_Module_Prg_Wrt_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\swriter.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_Shell_Print_Command @@ -486,7 +486,7 @@ RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "soffice.StarWriterTemplate.6\shell\open\command"; ModuleID = gid_Module_Prg_Wrt_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\swriter.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_Shell_Print_Command @@ -838,13 +838,6 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_New_Command Value = "\"<progpath>\program\soffice.exe\" -n \"%1\""; End -// RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command -// ParentID = PREDEFINED_HKEY_CLASSES_ROOT; -// ModuleID = gid_Module_Prg_Wrt_Bin; -// Subkey = "opendocument.WriterDocument.1\shell\open\command"; -// Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; -// End - RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; ModuleID = gid_Module_Prg_Wrt_Bin; @@ -982,7 +975,7 @@ RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.WriterTemplate.1\shell\open\command"; ModuleID = gid_Module_Prg_Wrt_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\swriter.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Openoffice_Writertemplate_1_Shell_Print_Command @@ -1106,7 +1099,7 @@ RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.WriterGlobalDocument.1\shell\open\command"; ModuleID = gid_Module_Prg_Wrt_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\swriter.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_Shell_Print_Command @@ -1222,7 +1215,7 @@ RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Open_Command ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = "opendocument.WriterWebTemplate.1\shell\open\command"; ModuleID = gid_Module_Prg_Wrt_Bin; - Value = "\"<progpath>\program\soffice.exe\" -o \"%1\""; + Value = "\"<progpath>\program\swriter.exe\" -o \"%1\""; End RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_Shell_Print_Command @@ -1267,12 +1260,30 @@ RegistryItem gid_Regitem_OpenOffice_OTT_OpenWith_Writer Value = " "; End +// .OTH +RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + Subkey = ".oth\OpenWithProgIDs"; + ModuleID = gid_Module_Prg_Wrt_Bin; + Name = "opendocument.WriterDocument.1"; + Value = " "; +End + +// .ODM +RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer + ParentID = PREDEFINED_HKEY_CLASSES_ROOT; + Subkey = ".odm\OpenWithProgIDs"; + ModuleID = gid_Module_Prg_Wrt_Bin; + Name = "opendocument.WriterDocument.1"; + Value = " "; +End + // .SXW RegistryItem gid_Regitem_OpenOffice_SXW_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sxw\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Wrt_Bin; - Name = "opendocument.WriterDocument.1"; + Name = "soffice.StarWriterDocument.6"; Value = " "; End @@ -1281,7 +1292,7 @@ RegistryItem gid_Regitem_OpenOffice_STW_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".stw\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Wrt_Bin; - Name = "opendocument.WriterDocument.1"; + Name = "soffice.StarWriterTemplate.6"; Value = " "; End @@ -1290,7 +1301,7 @@ RegistryItem gid_Regitem_OpenOffice_TXT_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".txt\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Wrt_Bin; - Name = "opendocument.WriterDocument.1"; + Name = "soffice.StarWriterDocument.6"; Value = " "; End @@ -1299,7 +1310,7 @@ RegistryItem gid_Regitem_OpenOffice_HTM_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".htm\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Wrt_Bin; - Name = "opendocument.WriterWebDocument.1"; + Name = "soffice.StarWriterDocument.6"; Value = " "; End @@ -1308,7 +1319,7 @@ RegistryItem gid_Regitem_OpenOffice_HTML_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".html\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Wrt_Bin; - Name = "opendocument.WriterWebDocument.1"; + Name = "soffice.StarWriterDocument.6"; Value = " "; End @@ -1317,7 +1328,7 @@ RegistryItem gid_Regitem_OpenOffice_XML_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".xml\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Wrt_Bin; - Name = "opendocument.WriterDocument.1"; + Name = "soffice.StarWriterDocument.6"; Value = " "; End @@ -1326,7 +1337,7 @@ RegistryItem gid_Regitem_OpenOffice_WPD_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".wpd\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Wrt_Bin; - Name = "opendocument.WriterDocument.1"; + Name = "soffice.StarWriterDocument.6"; Value = " "; End @@ -1335,25 +1346,7 @@ RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".hwp\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Wrt_Bin; - Name = "opendocument.WriterDocument.1"; - Value = " "; -End - -// .OTH -RegistryItem gid_Regitem_OpenOffice_OTH_OpenWith_Writer - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".oth\OpenWithProgIDs"; - ModuleID = gid_Module_Prg_Wrt_Bin; - Name = "opendocument.WriterDocument.1"; - Value = " "; -End - -// .ODM -RegistryItem gid_Regitem_OpenOffice_ODM_OpenWith_Writer - ParentID = PREDEFINED_HKEY_CLASSES_ROOT; - Subkey = ".odm\OpenWithProgIDs"; - ModuleID = gid_Module_Prg_Wrt_Bin; - Name = "opendocument.WriterDocument.1"; + Name = "soffice.StarWriterDocument.6"; Value = " "; End @@ -1362,10 +1355,11 @@ RegistryItem gid_Regitem_OpenOffice_SXG_OpenWith_Writer ParentID = PREDEFINED_HKEY_CLASSES_ROOT; Subkey = ".sxg\OpenWithProgIDs"; ModuleID = gid_Module_Prg_Wrt_Bin; - Name = "opendocument.WriterDocument.1"; + Name = "soffice.StarWriterGlobalDocument.6"; Value = " "; End + RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Ott ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; @@ -1380,7 +1374,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Wrt_Bin; Name = ".stw"; - Value = "opendocument.WriterDocument.1"; + Value = "soffice.StarWriterDocument.6"; Styles = (); End @@ -1389,7 +1383,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Wrt_Bin; Name = ".txt"; - Value = "opendocument.WriterDocument.1"; + Value = "soffice.StarWriterDocument.6"; Styles = (); End @@ -1398,7 +1392,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Wrt_Bin; Name = ".htm"; - Value = "opendocument.WriterWebDocument.1"; + Value = "soffice.StarWriterDocument.6"; Styles = (); End @@ -1407,7 +1401,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Wrt_Bin; Name = ".html"; - Value = "opendocument.WriterWebDocument.1"; + Value = "soffice.StarWriterDocument.6"; Styles = (); End @@ -1416,7 +1410,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Wrt_Bin; Name = ".xml"; - Value = "opendocument.WriterDocument.1"; + Value = "soffice.StarWriterDocument.6"; Styles = (); End @@ -1425,7 +1419,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Wrt_Bin; Name = ".wpd"; - Value = "opendocument.WriterDocument.1"; + Value = "soffice.StarWriterDocument.6"; Styles = (); End @@ -1434,33 +1428,33 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Wrt_Bin; Name = ".hwp"; - Value = "opendocument.WriterDocument.1"; + Value = "soffice.StarWriterDocument.6"; Styles = (); End -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oth +RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sxg ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Wrt_Bin; - Name = ".oth"; - Value = "opendocument.WriterDocument.1"; + Name = ".sxg"; + Name = "soffice.StarWriterGlobalDocument.6"; Styles = (); End -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odm +RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Oth ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Wrt_Bin; - Name = ".odm"; + Name = ".oth"; Value = "opendocument.WriterDocument.1"; Styles = (); End -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Sxg +RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_Odm ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations"; ModuleID = gid_Module_Prg_Wrt_Bin; - Name = ".sxg"; + Name = ".odm"; Value = "opendocument.WriterDocument.1"; Styles = (); End @@ -1494,11 +1488,11 @@ REGISTER_PROPERTY_HANDLER_FOR_EXTENSION( sxg ) // registering the mso file types // CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid, key, cond, disp_name, icon_id, app, default, dox_type) -CONDITIONAL_REGISTER_DOC_EXTENSION( Doc, gid_Module_Prg_Wrt_Bin, doc, DOC, MS_WORD_DOCUMENT_OLD, 1, swriter.exe, open, Writer ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_Bin, docx, DOCX, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_Bin, docm, DOCM, MS_WORD_DOCUMENT, 1, swriter.exe, open, Writer ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Dot, gid_Module_Prg_Wrt_Bin, dot, DOT, MS_WORD_TEMPLATE_OLD, 2, swriter.exe, new, Writer ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Dotx, gid_Module_Prg_Wrt_Bin, dotx, DOTX, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Dotm, gid_Module_Prg_Wrt_Bin, dotm, DOTM, MS_WORD_TEMPLATE, 2, swriter.exe, new, Writer ) -CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf, gid_Module_Prg_Wrt_Bin, rtf, RTF, MS_RTF_DOCUMENT, 1, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Doc, gid_Module_Prg_Wrt_Bin, doc, DOC, MS_WORD_DOCUMENT_OLD, 27, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Docx, gid_Module_Prg_Wrt_Bin, docx, DOCX, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Docm, gid_Module_Prg_Wrt_Bin, docm, DOCM, MS_WORD_DOCUMENT, 27, swriter.exe, open, Writer ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dot, gid_Module_Prg_Wrt_Bin, dot, DOT, MS_WORD_TEMPLATE_OLD, 28, swriter.exe, new, Writer ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotx, gid_Module_Prg_Wrt_Bin, dotx, DOTX, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer ) +CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Dotm, gid_Module_Prg_Wrt_Bin, dotm, DOTM, MS_WORD_TEMPLATE, 28, swriter.exe, new, Writer ) +CONDITIONAL_REGISTER_DOC_EXTENSION( Rtf, gid_Module_Prg_Wrt_Bin, rtf, RTF, MS_RTF_DOCUMENT, 27, swriter.exe, open, Writer ) diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index 5775468d0ead..442dcba26946 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -342,102 +342,19 @@ sub rename_file { }; sub generate_config_file { - my $source_config = SourceConfig -> new(); - $source_config_file = $source_config->get_config_file_path(); - my $temp_config_file = File::Temp::tmpnam($ENV{TMP}); - my @config_content_new = (); - my $addition_message; - my $removal_message; - my %present_modules = (); - if ($source_config_file) { - open(SOURCE_CONFIG_FILE, $source_config_file); - my @config_content = <SOURCE_CONFIG_FILE>; - close SOURCE_CONFIG_FILE; - my ($module_section, $repository_section); - foreach (@config_content) { - if ((!/^\S+/)||(/^\s*#+/)) { - push(@config_content_new, $_); - next; - } - if (/^\[repositories\]\s*(\s+#)*/) { - if ($module_section) { - $addition_message = add_modules_to_source_config(\%add_to_config, \@config_content_new); - }; - $module_section = 0; - $repository_section = 1; - push(@config_content_new, $_); - next; - }; - if (/^\[modules\]\s*(\s+#)*/) { - $module_section = 1; - $repository_section = 0; - push(@config_content_new, $_); - next; - }; - if ($module_section && /\s*(\S+)=active\s*(\s+#)*/) { - if ($clear_config || defined $remove_from_config{$1}) { - delete $remove_from_config{$1}; - $removal_message .= "$1 "; - } else { - push(@config_content_new, $_); - if (defined $add_to_config{$1} && !$prepare) { - push(@warnings, "Module $1 already activated in $source_config_file\n"); - delete $add_to_config{$1}; - } - }; - } else { - push(@config_content_new, $_); - }; - }; - if (keys %add_to_config) { - if (!$module_section) { - push(@config_content_new, "[modules]\n"); - }; - $addition_message = add_modules_to_source_config(\%add_to_config, \@config_content_new); - }; - } else { - if ($clear_config || scalar %remove_from_config) { - print_error('No source config file found'); - }; - $source_config_file = $source_config->get_config_file_default_path(); - push(@config_content_new, "[modules]\n"); - $addition_message = add_modules_to_source_config(\%add_to_config, \@config_content_new); - }; - die("Cannot open $temp_config_file") if (!open(NEW_CONFIG, ">$temp_config_file")); - print NEW_CONFIG $_ foreach (@config_content_new); - close NEW_CONFIG; - rename_file($temp_config_file, $source_config_file, 1); - foreach (keys %remove_from_config) { - push(@warnings, "Module(s) $_ not found in " . $source_config_file . "\n"); - }; - print_warnings(); - print $addition_message if ($addition_message); - print "Module(s):\n$removal_message\nremoved from $source_config_file\n" if ($removal_message); + my $source_config = SourceConfig->new(); + $source_config->add_active_modules([keys %add_to_config], 1) if (scalar %add_to_config); + $source_config->remove_activated_modules([keys %remove_from_config], 1) if (scalar %remove_from_config); + $source_config->remove_all_activated_modules() if ($clear_config); }; -# -# Add modules from the passed hash to the array of config strigns -# -sub add_modules_to_source_config { - my ($modules_hash_ref, $config_content_new) = @_; - my $message; - foreach (keys %$modules_hash_ref) { - push(@$config_content_new, "$_=active\n"); - $message .= "$_ "; - }; - if ($message) { - return "Module(s):\n" .$message . "\nare added to the " . $source_config_file . "\n\n"; - } else { - return ''; - }; -}; sub start_interactive { $pid = open(HTML_PIPE, "-|"); print "Pipe is open\n"; if ($pid) { # parent - # make file handle non-bloking + # make file handle non-blocking my $flags = ''; fcntl(HTML_PIPE, F_GETFL, $flags); $flags |= O_NONBLOCK; @@ -1675,7 +1592,7 @@ sub get_options { }; sub get_module_and_buildlist_paths { - if ($build_all_parents) { + if ($build_all_parents || $checkparents) { my $source_config = SourceConfig -> new($StandDir); $source_config_file = $source_config->get_config_file_path(); $active_modules{$_}++ foreach ($source_config->get_active_modules()); @@ -2371,7 +2288,9 @@ sub prepare_incompatible_build { @modules_built = keys %$deps_hash; %add_to_config = %$deps_hash; if ($prepare) { - generate_config_file() if ((!defined $ENV{UPDATER}) || (defined $ENV{CWS_WORK_STAMP})); + if ((!defined $ENV{UPDATER}) || (defined $ENV{CWS_WORK_STAMP})) { + SourceConfig->new()->add_active_modules([keys %add_to_config], 0); + } clear_delivered(); } my $old_output_tree = ''; diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index a2f552eceb8d..bde0763e4564 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -394,9 +394,14 @@ if ( $installer::globals::globallogging ) { installer::files::save_hash($logging installer::setupscript::add_forced_properties($allvariableshashref); if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables5.log", $allvariableshashref); } +# Replacing preset properties, not using the default mechanisms (for example for UNIXPRODUCTNAME) +installer::setupscript::replace_preset_properties($allvariableshashref); +if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables6.log", $allvariableshashref); } + installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref, $allvariableshashref); if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscript3.log" ,$setupscriptref); } + installer::logger::log_hashref($allvariableshashref); installer::logger::print_message( "... analyzing directories ... \n" ); diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm index 88aa226f68a9..c3503221b8fa 100644 --- a/solenv/bin/modules/SourceConfig.pm +++ b/solenv/bin/modules/SourceConfig.pm @@ -38,10 +38,12 @@ package SourceConfig; use strict; use constant SOURCE_CONFIG_FILE_NAME => 'source_config'; +use constant SOURCE_CONFIG_VERSION => 2; use Carp; use Cwd; use File::Basename; +use File::Temp qw(tmpnam); my $debug = 0; @@ -62,20 +64,28 @@ sub new { } else { $source_root = $ENV{SOURCE_ROOT_DIR}; }; - $source_root = Cwd::realpath($source_root); + $self->{SOURCE_ROOT} = Cwd::realpath($source_root); $self->{DEBUG} = 0; - $self->{SOURCE_ROOT} = $source_root; + $self->{VERBOSE} = 0; $self->{REPOSITORIES} = {}; + $self->{ACTIVATED_REPOSITORIES} = {}; $self->{MODULE_PATHS} = {}; $self->{MODULE_BUILD_LIST_PATHS} = {}; $self->{ACTIVATED_MODULES} = {}; $self->{MODULE_REPOSITORY} = {}; $self->{REAL_MODULES} = {}; + $self->{NEW_MODULES} = []; + $self->{REMOVE_MODULES} = {}; + $self->{REMOVE_REPOSITORIES} = {}; + $self->{NEW_REPOSITORIES} = []; + $self->{WARNINGS} = []; + $self->{REPORT_MESSAGES} = []; + $self->{CONFIG_FILE_CONTENT} = []; if (defined $self->{USER_SOURCE_ROOT}) { ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT}; }; - $self->{SOURCE_CONFIG_FILE} = get_config_file($source_root); - $self->{SOURCE_CONFIG_DEFAULT} = $source_root .'/'.SOURCE_CONFIG_FILE_NAME; + $self->{SOURCE_CONFIG_FILE} = get_config_file($self->{SOURCE_ROOT}); + $self->{SOURCE_CONFIG_DEFAULT} = $self->{SOURCE_ROOT} .'/'.SOURCE_CONFIG_FILE_NAME; read_config_file($self); bless($self, $class); return $self; @@ -83,6 +93,10 @@ sub new { ##### methods ##### +sub get_version { + return SOURCE_CONFIG_VERSION; +}; + sub get_repositories { my $self = shift; @@ -249,8 +263,11 @@ sub read_config_file { my $repository_section = 0; my $module_section = 0; my $line = 0; + my @file_content = (); + if (open(SOURCE_CONFIG_FILE, $self->{SOURCE_CONFIG_FILE})) { foreach (<SOURCE_CONFIG_FILE>) { + push (@{$self->{CONFIG_FILE_CONTENT}}, $_); $line++; chomp; next if (!/^\S+/); @@ -270,6 +287,10 @@ sub read_config_file { if (/\s*(\S+)=active\s*(\s+#)*/) { if ($repository_section) { ${$self->{REPOSITORIES}}{$1} = $self->{SOURCE_ROOT} . "/$1"; + ${$self->{ACTIVATED_REPOSITORIES}}{$1}++; + if (defined $ENV{UPDMINOREXT}) { + ${$self->{REPOSITORIES}}{$1} .= $ENV{UPDMINOREXT}; + }; next; } if ($module_section) { @@ -290,6 +311,187 @@ sub read_config_file { }; }; +sub remove_all_activated_repositories { + my $self = shift; + $self->remove_activated_repositories([keys %{$self->{ACTIVATED_REPOSITORIES}}]); +}; + +sub remove_activated_repositories { + my $self = shift; + my $new_repositories_ref = shift; + push(@{$self->{WARNINGS}}, "\nWARNING: Empty repository list passed for removing from source_config\n") if (!scalar @$new_repositories_ref); + $self->{VERBOSE} = shift; + $self->{REMOVE_REPOSITORIES} = {}; + foreach (@$new_repositories_ref) { + if (!defined ${$self->{ACTIVATED_REPOSITORIES}}{$_}) { + push (@{$self->{WARNINGS}}, "\nWARNING: repository $_ is not activated in ". $self->get_config_file_default_path()."\n"); + } else { + ${$self->{REMOVE_REPOSITORIES}}{$_}++; + delete ${$self->{ACTIVATED_REPOSITORIES}}{$_}; + }; + }; + generate_config_file($self); +}; + +sub remove_all_activated_modules { + my $self = shift; + $self->remove_activated_modules([keys %{$self->{ACTIVATED_MODULES}}]); +}; + +sub remove_activated_modules { + my $self = shift; + my $new_modules_ref = shift; + push(@{$self->{WARNINGS}}, "\nWARNING: Empty module list passed for removing from source_config\n") if (!scalar @$new_modules_ref); + $self->{VERBOSE} = shift; + $self->{REMOVE_MODULES} = {}; + foreach (@$new_modules_ref) { + if (!defined ${$self->{ACTIVATED_MODULES}}{$_}) { + push (@{$self->{WARNINGS}}, "\nWARNING: module $_ is not activated in ". $self->get_config_file_default_path()."\n"); + } else { + ${$self->{REMOVE_MODULES}}{$_}++; + delete ${$self->{ACTIVATED_MODULES}}{$_}; + }; + }; + generate_config_file($self); +}; + +sub add_active_repositories { + my $self = shift; + $self->{NEW_REPOSITORIES} = shift; + croak('Empty module list passed for adding to source_config') if (!scalar @{$self->{NEW_REPOSITORIES}}); + $self->{VERBOSE} = shift; + generate_config_file($self); +}; + +sub add_active_modules { + my $self = shift; + $self->{NEW_MODULES} = shift; + croak('Empty module list passed for adding to source_config') if (!scalar @{$self->{NEW_MODULES}}); + $self->{VERBOSE} = shift; + generate_config_file($self); +}; + +sub add_content { + my $self = shift; + my $content = shift; + my $entries_to_add = shift; + return if (!scalar @$entries_to_add); + my $message; + my $message_part1; + my $warning_message; + my $activated_entries; + + if ($entries_to_add == $self->{NEW_MODULES}) { + $self->{NEW_MODULES} = []; + $message_part1 = "Module(s):\n"; + $activated_entries = $self->{ACTIVATED_MODULES}; + } elsif ($entries_to_add == $self->{NEW_REPOSITORIES}) { + $self->{NEW_REPOSITORIES} = []; + $message_part1 = "Repositories:\n"; + $activated_entries = $self->{ACTIVATED_REPOSITORIES}; + }; + foreach my $entry (@$entries_to_add) { + if (defined $$activated_entries{$entry}) { + $warning_message .= "$entry " + } else { + push(@$content, "$entry=active\n"); + ${$activated_entries}{$entry}++; + $message .= "$entry " + }; + }; + + push(@{$self->{REPORT_MESSAGES}}, "\n$message_part1 $message\nhave been added to the ". $self->get_config_file_default_path()."\n") if ($message); + push (@{$self->{WARNINGS}}, "\nWARNING: $message_part1 $warning_message\nare already added to the ". $self->get_config_file_default_path()."\n") if ($warning_message); +}; + +sub generate_config_file { + my $self = shift; + my @config_content_new = (); + my ($module_section, $repository_section); + my %removed_modules = (); + my %removed_repositories = (); + foreach (@{$self->{CONFIG_FILE_CONTENT}}) { + if (/^\[repositories\]\s*(\s+#)*/) { + if ($module_section) { + $self->add_content(\@config_content_new, $self->{NEW_MODULES}); + }; + $module_section = 0; + $repository_section = 1; + }; + if (/^\[modules\]\s*(\s+#)*/) { + if ($repository_section) { + $self->add_content(\@config_content_new, $self->{NEW_REPOSITORIES}); + }; + $module_section = 1; + $repository_section = 0; + }; + if ($module_section && /\s*(\S+)=active\s*(\s+#)*/) { + if (defined ${$self->{REMOVE_MODULES}}{$1}) { + $removed_modules{$1}++; + next; + }; + } + if ($repository_section && /\s*(\S+)=active\s*(\s+#)*/) { + if (defined ${$self->{REMOVE_REPOSITORIES}}{$1}) { + $removed_repositories{$1}++; + next; + }; + } + push(@config_content_new, $_); + }; + if (scalar @{$self->{NEW_MODULES}}) { + push(@config_content_new, "[modules]\n") if (!$module_section); + $self->add_content(\@config_content_new, $self->{NEW_MODULES}); + }; + if (scalar @{$self->{NEW_REPOSITORIES}}) { + push(@config_content_new, "[repositories]\n") if (!$repository_section); + $self->add_content(\@config_content_new, $self->{NEW_REPOSITORIES}); + }; + if (scalar keys %removed_modules) { + my @deleted_modules = keys %removed_modules; + push(@{$self->{REPORT_MESSAGES}}, "\nModules: @deleted_modules\nhave been removed from the ". $self->get_config_file_default_path()."\n"); + + }; + if (scalar keys %removed_repositories) { + my @deleted_repositories = keys %removed_repositories; + push(@{$self->{REPORT_MESSAGES}}, "\nRepositories: @deleted_repositories\nhave been removed from the ". $self->get_config_file_default_path()."\n"); + + }; + + # Writing file, printing warnings and reports + + #check if we need to write a new file + my $write_needed = 0; + if ((scalar @{$self->{CONFIG_FILE_CONTENT}}) != (scalar @config_content_new)) { + $write_needed++; + } else { + foreach my $i (0 .. $#{$self->{CONFIG_FILE_CONTENT}}) { + if (${$self->{CONFIG_FILE_CONTENT}}[$i] ne $config_content_new[$i]) { + $write_needed++; + last; + }; + }; + }; + if ($write_needed) { + my $temp_config_file = File::Temp::tmpnam($ENV{TMP}); + die("Cannot open $temp_config_file") if (!open(NEW_CONFIG, ">$temp_config_file")); + print NEW_CONFIG $_ foreach (@config_content_new); + close NEW_CONFIG; + rename($temp_config_file, $self->get_config_file_default_path()) or system("mv", $temp_config_file, $self->get_config_file_default_path()); + if (-e $temp_config_file) { + system("rm -rf $temp_config_file") if (!unlink $temp_config_file); + }; + $self->{CONFIG_FILE_CONTENT} = \@config_content_new; + }; + if ($self->{VERBOSE}) { + print $_ foreach (@{$self->{WARNINGS}}); + $self->{VERBOSE} = 0; + }; + $self->{WARNINGS} = []; + print $_ foreach (@{$self->{REPORT_MESSAGES}}); + $self->{REPORT_MESSAGES} = []; +}; + ##### finish ##### 1; # needed by use or require @@ -325,6 +527,10 @@ SourceConfig::new() Creates a new instance of SourceConfig. Can't fail. +SourceConfig::get_version() + +Returns version number of the module. Can't fail. + SourceConfig::get_repositories() @@ -364,9 +570,35 @@ SourceConfig::is_active() Returns 1 (TRUE) if a module is active Returns 0 (FALSE) if a module is not active +SourceConfig::add_active_modules($module_array_ref) + +Adds modules from the @$module_array_ref as active to the source_config file + +SourceConfig::add_active_repositories($repository_array_ref) + +Adds repositories from the @$repository_array_ref as active to the source_config file + +SourceConfig::remove_activated_modules($module_array_ref) + +Removes modules from the @$module_array_ref from the source_config file + +SourceConfig::remove_all_activated_modules() + +Removes all activated modules from the source_config file + +SourceConfig::remove_activated_repositories($repository_array_ref) + +Removes repositories from the @$repository_array_ref from the source_config file + +SourceConfig::remove_all_activated_repositories() + +Removes all activated repositories from the source_config file + + =head2 EXPORT SourceConfig::new() +SourceConfig::get_version() SourceConfig::get_repositories() SourceConfig::get_active_modules() SourceConfig::get_all_modules() @@ -376,6 +608,12 @@ SourceConfig::get_module_repository($module) SourceConfig::get_config_file_path() SourceConfig::get_config_file_default_path() SourceConfig::is_active($module) +SourceConfig::add_active_modules($module_array_ref) +SourceConfig::add_active_repositories($repository_array_ref) +SourceConfig::remove_activated_modules($module_array_ref) +SourceConfig::remove_all_activated_modules() +SourceConfig::remove_activated_repositories($repository_array_ref) +SourceConfig::remove_all_activated_repositories() =head1 AUTHOR diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 95f661160a0e..ffe79136b57e 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -2544,6 +2544,7 @@ sub create_packages_without_epm my $dir = getcwd; my $buildroot = $dir . "/" . $epmdir . "buildroot/"; $buildrootstring = "--buildroot=$buildroot"; + mkdir($buildroot = $dir . "/" . $epmdir . "BUILD/"); } my $systemcall = "$rpmcommand -bb --define \"_unpackaged_files_terminate_build 0\" $specfilename --target $target $buildrootstring 2\>\&1 |"; @@ -2719,6 +2720,15 @@ sub remove_temporary_epm_files my $returnvalue = system($systemcall); + $removedir = $epmdir . "BUILD"; + + $systemcall = "rm -rf $removedir"; + + installer::logger::print_message( "... $systemcall ...\n" ); + + $returnvalue = system($systemcall); + + my $infoline = "Systemcall: $systemcall\n"; push( @installer::globals::logfileinfo, $infoline); diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 1836e451a4be..b646b071dda0 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -180,7 +180,7 @@ BEGIN $installertypedir = ""; $controlledmakecabversion = "5"; $saved_packages_path = ""; - $max_lang_length = 50; + $max_lang_length = 65; $globalblock = "Globals"; $rootmodulegid = ""; %alllangmodules = (); @@ -268,7 +268,7 @@ BEGIN $isopensourceproduct = 1; $manufacturer = ""; $longmanufacturer = ""; - $sundirname = "Sun"; + $sundirname = ""; $codefilename = "codes.txt"; $componentfilename = "components.txt"; $productcode = ""; diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm index e266832e6ba6..9da5340f915f 100644 --- a/solenv/bin/modules/installer/setupscript.pm +++ b/solenv/bin/modules/installer/setupscript.pm @@ -156,13 +156,28 @@ sub add_lowercase_productname_setupscriptvariable push(@{$variablesref} ,$newline); $value = $original; $value =~ s/\s/\_/g; + # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; } $newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n"; push(@{$variablesref} ,$newline); + $newline = "\%SYSTEMINTUNIXPACKAGENAME " . lc($value) . "\n"; + push(@{$variablesref} ,$newline); + # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; } + # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $2 . $4; } + $newline = "\%UNIXPACKAGENAME " . lc($value) . "\n"; + push(@{$variablesref} ,$newline); $value = $original; $value =~ s/\s/\_/g; $value =~ s/\.//g; + # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; } $newline = "\%WITHOUTDOTUNIXPRODUCTNAME " . lc($value) . "\n"; push(@{$variablesref} ,$newline); + # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; } + # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $2 . $4; } + $newline = "\%WITHOUTDOTUNIXPACKAGENAME " . lc($value) . "\n"; + push(@{$variablesref} ,$newline); + $newline = "\%SOLARISBRANDPACKAGENAME " . lc($value) . "\n"; + push(@{$variablesref} ,$newline); + $value = $original; } elsif ( $key eq "PRODUCTEXTENSION" ) { @@ -482,4 +497,38 @@ sub add_forced_properties } } +##################################################################################### +# Some properties are created automatically. It should be possible to +# overwrite them, with PRESET properties. For example UNIXPRODUCTNAME +# with PRESETUNIXPRODUCTNAME, if this is defined and the automatic process +# does not deliver the desired results. +##################################################################################### + +sub replace_preset_properties +{ + my ($allvariables) = @_; + + # SOLARISBRANDPACKAGENAME + # needs to be replaced by + # PRESETSOLARISBRANDPACKAGENAME + + my @presetproperties = (); + push(@presetproperties, "SOLARISBRANDPACKAGENAME"); + push(@presetproperties, "SYSTEMINTUNIXPACKAGENAME"); + # push(@presetproperties, "UNIXPACKAGENAME"); + # push(@presetproperties, "WITHOUTDOTUNIXPACKAGENAME"); + # push(@presetproperties, "UNIXPRODUCTNAME"); + # push(@presetproperties, "WITHOUTDOTUNIXPRODUCTNAME"); + + + foreach $property ( @presetproperties ) + { + my $presetproperty = "PRESET" . $property; + if (( exists($allvariables->{$presetproperty}) ) && ( $allvariables->{$presetproperty} ne "" )) + { + $allvariables->{$property} = $allvariables->{$presetproperty}; + } + } +} + 1; diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 043ef72ff386..9afccdbd005d 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -111,7 +111,7 @@ sub register_extensions { my $oneextension = $extensiondir . $installer::globals::separator . ${$allextensions}[$i]; - # my $systemcall = $unopkgfile . " add --shared " . "\"" . $oneextension . "\""; + # my $systemcall = $unopkgfile . " add --shared --suppress-license " . "\"" . $oneextension . "\""; if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); } if ( ! -f $oneextension ) { installer::exiter::exit_program("ERROR: $oneextension not found!", "register_extensions"); } @@ -131,7 +131,7 @@ sub register_extensions $localtemppath =~ s/\\/\//g; $localtemppath = "/".$localtemppath; } - my $systemcall = $unopkgfile . " add --shared --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " -env:UNO_JAVA_JFW_ENV_JREHOME=true -env:UNO_JAVA_JFW_ENV_CLASSPATH=true 2\>\&1 |"; + my $systemcall = $unopkgfile . " add --shared --suppress-license --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " -env:UNO_JAVA_JFW_ENV_JREHOME=true -env:UNO_JAVA_JFW_ENV_CLASSPATH=true 2\>\&1 |"; print "... $systemcall ...\n"; diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm index 2ad207731b51..2a9463f508a1 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -320,6 +320,7 @@ sub add_root_directories if ( $allvariableshashref->{'SUNDIR'} ) { + if ( $allvariableshashref->{'SUNDIRNAME'} ) { $installer::globals::sundirname = $allvariableshashref->{'SUNDIRNAME'}; } $oneline = "sundirectory\t$installer::globals::programfilesfolder\t$installer::globals::sundirname$sourcediraddon\n"; push(@{$directorytableref}, $oneline); diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 66731f860092..9f2d21f8b7f8 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -58,7 +58,7 @@ sub write_ddf_file_header push(@{$ddffileref} ,$oneline); $oneline = ".Set ReservePerCabinetSize=128\n"; # This reserves space for a digital signature. push(@{$ddffileref} ,$oneline); - $oneline = ".Set MaxDiskSize=CDROM\n"; # This allows the .cab file to be as large as needed. + $oneline = ".Set MaxDiskSize=2147483648\n"; # This allows the .cab file to get a size of 2 GB. push(@{$ddffileref} ,$oneline); $oneline = ".Set CompressionType=LZX\n"; push(@{$ddffileref} ,$oneline); diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index 4679e0e19a1b..7b890d06d58f 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -540,7 +540,7 @@ sub set_languages_in_property_table if ($installer::globals::sofficeiconadded) # set in shortcut.pm { - $onepropertyline = "ARPPRODUCTICON" . "\t" . "soffice.exe" . "\n"; + $onepropertyline = "ARPPRODUCTICON" . "\t" . "soffice.ico" . "\n"; push(@{$propertyfile}, $onepropertyline); } diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm index dac740bcd9de..b15c7418352f 100644 --- a/solenv/bin/modules/installer/windows/shortcut.pm +++ b/solenv/bin/modules/installer/windows/shortcut.pm @@ -665,40 +665,25 @@ sub create_shortcut_table } } - # if it is part of the product, the soffice.exe has to be included into the icon table + # The soffice.ico has to be included into the icon table # as icon for the ARP applet - my $sofficefile = "soffice.exe"; - my $onefile = get_file_by_name($filesref, $sofficefile); + my $onefile = ""; + my $sofficefile = "soffice.ico"; - if ( $onefile ne "" ) - { - my $sourcepath = $onefile->{'sourcepath'}; - if (! installer::existence::exists_in_array($sourcepath, $iconfilecollector)) - { - unshift(@{$iconfilecollector}, $sourcepath); - $installer::globals::sofficeiconadded = 1; - } - } + my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$sofficefile, $includepatharrayref, 0); - # For language packs and patches the soffice.exe has to be included, even if it is not part of the product. - # Also as part of the ARP applet (no substitution needed for ProductName, because the file is not installed!) + if ($$sourcepathref eq "") { installer::exiter::exit_program("ERROR: Could not find $sofficefile as icon!", "create_shortcut_table"); } - if (( $onefile eq "" ) && (( $installer::globals::languagepack ) || ( $installer::globals::patch ))) + if (! installer::existence::exists_in_array($$sourcepathref, $iconfilecollector)) { - my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$sofficefile, $includepatharrayref, 1); - if ($$sourcepathref eq "") { installer::exiter::exit_program("ERROR: Could not find $sofficefile as icon in language pack!", "create_shortcut_table"); } - - if (! installer::existence::exists_in_array($$sourcepathref, $iconfilecollector)) - { - unshift(@{$iconfilecollector}, $$sourcepathref); - $installer::globals::sofficeiconadded = 1; - } - - my $localinfoline = "Added icon file $$sourcepathref for language pack into icon file collector.\n"; - push(@installer::globals::logfileinfo, $localinfoline); + unshift(@{$iconfilecollector}, $$sourcepathref); + $installer::globals::sofficeiconadded = 1; } + my $localinfoline = "Added icon file $$sourcepathref for language pack into icon file collector.\n"; + push(@installer::globals::logfileinfo, $localinfoline); + # Saving the file my $shortcuttablename = $basedir . $installer::globals::separator . "Shortcut.idt" . "." . $onelanguage; diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm index 81ba78c8b218..70954bd9f5b1 100644 --- a/solenv/bin/modules/installer/windows/sign.pm +++ b/solenv/bin/modules/installer/windows/sign.pm @@ -929,7 +929,7 @@ sub get_ddf_file_header push(@{$ddffileref} ,$oneline); $oneline = ".Set ReservePerCabinetSize=128\n"; # This reserves space for a digital signature. push(@{$ddffileref} ,$oneline); - $oneline = ".Set MaxDiskSize=CDROM\n"; # This allows the .cab file to be as large as needed. + $oneline = ".Set MaxDiskSize=2147483648\n"; # This allows the .cab file to get a size of 2 GB. push(@{$ddffileref} ,$oneline); $oneline = ".Set CompressionType=LZX\n"; push(@{$ddffileref} ,$oneline); diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm index d9d371fc1b56..49479b26bf49 100644 --- a/solenv/bin/modules/installer/windows/upgrade.pm +++ b/solenv/bin/modules/installer/windows/upgrade.pm @@ -47,7 +47,7 @@ sub create_upgrade_table # fix for problematic OOo 1.9 versions my $include_ooo_fix = 0; my $ooomaxnew = ""; - if (($installer::globals::product =~ /OpenOffice/i ) && ( ! ( $installer::globals::product =~ /SDK/i )) && ( ! $installer::globals::languagepack )) + if (($installer::globals::product =~ /^\s*OpenOffice/i ) && ( ! ( $installer::globals::product =~ /SDK/i )) && ( ! $installer::globals::languagepack )) { $include_ooo_fix = 1; $ooomaxnew = "34.0.0"; diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index b5b6af308d0e..ff1d172c9b8f 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -3022,6 +3022,24 @@ sub key_in_a_is_also_key_in_b return $returnvalue; } +###################################################### +# Getting the first entry from a list of languages +###################################################### + +sub get_first_from_list +{ + my ( $list ) = @_; + + my $first = $list; + + if ( $list =~ /^\s*(.+?),(.+)\s*$/) # "?" for minimal matching + { + $first = $1; + } + + return $first; +} + ################################################ # Setting all spellchecker languages ################################################ @@ -3054,16 +3072,29 @@ sub set_spellcheckerlanguages { my $onelang = $1; my $languagelist = $2; - $spellcheckhash{$onelang} = $languagelist; - # Special handling for language packs. Do only include that one language of the language pack, no further language. - # And this only, if the language of the language pack is also already part of the language list + # Special handling for language packs. Only include the first language of the language list. + # If no spellchecker shall be included, the keyword "EMPTY" can be used. if ( $installer::globals::languagepack ) { - if ( $languagelist =~ /\b$onelang\b/ ) { $spellcheckhash{$onelang} = $onelang; } - else { $spellcheckhash{$onelang} = ""; } + my $first = get_first_from_list($languagelist); + + if ( $first eq "EMPTY" ) # no spellchecker into language pack + { + $languagelist = ""; + } + else + { + $languagelist = $first; + } + } + else # no language pack, so EMPTY is not required + { + $languagelist =~ s/^\s*EMPTY\s*,//; # removing the entry EMPTY } + + $spellcheckhash{$onelang} = $languagelist; } } diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index a434163b0dd9..00de1709473b 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -644,7 +644,8 @@ sub set_manufacturer my ($allvariables) = @_; my $openofficeproductname = "OpenOffice.org"; - my $sunname = "Sun Microsystems"; + my $sunname = ""; + if ( $allvariables->{'OPENSOURCE'} && $allvariables->{'OPENSOURCE'} == 1 ) { @@ -655,6 +656,8 @@ sub set_manufacturer else { $installer::globals::isopensourceproduct = 0; + if (( $allvariables->{'DEFINEDMANUFACTURER'} ) && ( $allvariables->{'DEFINEDMANUFACTURER'} ne "" )) { $sunname = $allvariables->{'DEFINEDMANUFACTURER'}; } + else { installer::exiter::exit_program("ERROR: Property DEFINEDMANUFACTURER has to be set for this product!", "set_manufacturer"); } $installer::globals::manufacturer = $sunname; $installer::globals::longmanufacturer = $sunname . ", Inc."; } diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index bc820fc095d5..51a4d354a80d 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -197,8 +197,8 @@ finish } common_1 { - BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy - BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple + BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy + BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple DPKG %BUILD_TOOLS%$/dpkg OOO_JUNIT_JAR %SOLARROOT%$/btools$/junit-4.8.1.jar PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH% @@ -207,6 +207,7 @@ finish SOLARLIB -L%SOLARVER%/%INPATH%/lib%UPDMINOREXT% %JDKLIBS% %SOLAREXTRALIB% SOLARSRC %SRC_ROOT% SOURCE_ROOT_DIR $expand(%SOLARSRC%/..) + ANT_HOME %COMMON_BUILD_TOOLS%$/apache-ant-1.7.1 DBGSV_INIT %SOLARENV%/bin/dbgsv.ini } common_2:0 IF X%CWS_WORK_STAMP%X == XX @@ -2658,7 +2659,6 @@ wntmsci11 *s cdd %SOLARVERSION% *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl BIG_SVX - BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl DMAKEROOT %SOLARENV%$/inc$/startup @@ -2920,7 +2920,6 @@ wntmsci12 *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl BIG_SVX - BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl @@ -3262,7 +3261,6 @@ wntmsci13 *zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl *z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl BIG_SVX - BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index 55e44f3b3a90..3d91783988b9 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -291,16 +291,20 @@ $(SHL1TARGETN) : \ .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(SHL1ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def - @echo dlltool --input-def $(SHL1DEF) \ - --dllname $(SHL1TARGET)$(DLLPOST) \ + @echo dlltool --dllname $(SHL1TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_1.cmd @noop $(assign ALL1OBJLIST:=$(STDOBJ) $(SHL1OBJS) $(SHL1LINKRESO) $(shell $(TYPE) /dev/null $(SHL1LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB1NAME)"!="" # do not have to include objs @noop $(assign DEF1OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) @noop $(foreach,i,$(DEF1OBJLIST) $(assign ALL1OBJLIST:=$(ALL1OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB1NAME)"!="" - @echo --output-exp $(MISC)/$(@:b)_exp.o \ - $(ALL1OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_1.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_1.cmd +.IF "$(SHL1DEF)"!="" + @echo --input-def $(SHL1DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_1.cmd +.ELSE + @echo $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_1.cmd +.ENDIF + @echo $(ALL1OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_1.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \ `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ @@ -839,16 +843,20 @@ $(SHL2TARGETN) : \ .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(SHL2ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def - @echo dlltool --input-def $(SHL2DEF) \ - --dllname $(SHL2TARGET)$(DLLPOST) \ + @echo dlltool --dllname $(SHL2TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_2.cmd @noop $(assign ALL2OBJLIST:=$(STDOBJ) $(SHL2OBJS) $(SHL2LINKRESO) $(shell $(TYPE) /dev/null $(SHL2LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB2NAME)"!="" # do not have to include objs @noop $(assign DEF2OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) @noop $(foreach,i,$(DEF2OBJLIST) $(assign ALL2OBJLIST:=$(ALL2OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB2NAME)"!="" - @echo --output-exp $(MISC)/$(@:b)_exp.o \ - $(ALL2OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_2.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_2.cmd +.IF "$(SHL2DEF)"!="" + @echo --input-def $(SHL2DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_2.cmd +.ELSE + @echo $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_2.cmd +.ENDIF + @echo $(ALL2OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_2.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \ `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ @@ -1387,16 +1395,20 @@ $(SHL3TARGETN) : \ .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(SHL3ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def - @echo dlltool --input-def $(SHL3DEF) \ - --dllname $(SHL3TARGET)$(DLLPOST) \ + @echo dlltool --dllname $(SHL3TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_3.cmd @noop $(assign ALL3OBJLIST:=$(STDOBJ) $(SHL3OBJS) $(SHL3LINKRESO) $(shell $(TYPE) /dev/null $(SHL3LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB3NAME)"!="" # do not have to include objs @noop $(assign DEF3OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) @noop $(foreach,i,$(DEF3OBJLIST) $(assign ALL3OBJLIST:=$(ALL3OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB3NAME)"!="" - @echo --output-exp $(MISC)/$(@:b)_exp.o \ - $(ALL3OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_3.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_3.cmd +.IF "$(SHL3DEF)"!="" + @echo --input-def $(SHL3DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_3.cmd +.ELSE + @echo $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_3.cmd +.ENDIF + @echo $(ALL3OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_3.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \ `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ @@ -1935,16 +1947,20 @@ $(SHL4TARGETN) : \ .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(SHL4ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def - @echo dlltool --input-def $(SHL4DEF) \ - --dllname $(SHL4TARGET)$(DLLPOST) \ + @echo dlltool --dllname $(SHL4TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_4.cmd @noop $(assign ALL4OBJLIST:=$(STDOBJ) $(SHL4OBJS) $(SHL4LINKRESO) $(shell $(TYPE) /dev/null $(SHL4LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB4NAME)"!="" # do not have to include objs @noop $(assign DEF4OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) @noop $(foreach,i,$(DEF4OBJLIST) $(assign ALL4OBJLIST:=$(ALL4OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB4NAME)"!="" - @echo --output-exp $(MISC)/$(@:b)_exp.o \ - $(ALL4OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_4.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_4.cmd +.IF "$(SHL4DEF)"!="" + @echo --input-def $(SHL4DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_4.cmd +.ELSE + @echo $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_4.cmd +.ENDIF + @echo $(ALL4OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_4.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \ `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ @@ -2483,16 +2499,20 @@ $(SHL5TARGETN) : \ .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(SHL5ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def - @echo dlltool --input-def $(SHL5DEF) \ - --dllname $(SHL5TARGET)$(DLLPOST) \ + @echo dlltool --dllname $(SHL5TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_5.cmd @noop $(assign ALL5OBJLIST:=$(STDOBJ) $(SHL5OBJS) $(SHL5LINKRESO) $(shell $(TYPE) /dev/null $(SHL5LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB5NAME)"!="" # do not have to include objs @noop $(assign DEF5OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) @noop $(foreach,i,$(DEF5OBJLIST) $(assign ALL5OBJLIST:=$(ALL5OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB5NAME)"!="" - @echo --output-exp $(MISC)/$(@:b)_exp.o \ - $(ALL5OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_5.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_5.cmd +.IF "$(SHL5DEF)"!="" + @echo --input-def $(SHL5DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_5.cmd +.ELSE + @echo $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_5.cmd +.ENDIF + @echo $(ALL5OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_5.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \ `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ @@ -3031,16 +3051,20 @@ $(SHL6TARGETN) : \ .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(SHL6ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def - @echo dlltool --input-def $(SHL6DEF) \ - --dllname $(SHL6TARGET)$(DLLPOST) \ + @echo dlltool --dllname $(SHL6TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_6.cmd @noop $(assign ALL6OBJLIST:=$(STDOBJ) $(SHL6OBJS) $(SHL6LINKRESO) $(shell $(TYPE) /dev/null $(SHL6LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB6NAME)"!="" # do not have to include objs @noop $(assign DEF6OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) @noop $(foreach,i,$(DEF6OBJLIST) $(assign ALL6OBJLIST:=$(ALL6OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB6NAME)"!="" - @echo --output-exp $(MISC)/$(@:b)_exp.o \ - $(ALL6OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_6.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_6.cmd +.IF "$(SHL6DEF)"!="" + @echo --input-def $(SHL6DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_6.cmd +.ELSE + @echo $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_6.cmd +.ENDIF + @echo $(ALL6OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_6.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \ `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ @@ -3579,16 +3603,20 @@ $(SHL7TARGETN) : \ .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(SHL7ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def - @echo dlltool --input-def $(SHL7DEF) \ - --dllname $(SHL7TARGET)$(DLLPOST) \ + @echo dlltool --dllname $(SHL7TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_7.cmd @noop $(assign ALL7OBJLIST:=$(STDOBJ) $(SHL7OBJS) $(SHL7LINKRESO) $(shell $(TYPE) /dev/null $(SHL7LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB7NAME)"!="" # do not have to include objs @noop $(assign DEF7OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) @noop $(foreach,i,$(DEF7OBJLIST) $(assign ALL7OBJLIST:=$(ALL7OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB7NAME)"!="" - @echo --output-exp $(MISC)/$(@:b)_exp.o \ - $(ALL7OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_7.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_7.cmd +.IF "$(SHL7DEF)"!="" + @echo --input-def $(SHL7DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_7.cmd +.ELSE + @echo $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_7.cmd +.ENDIF + @echo $(ALL7OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_7.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \ `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ @@ -4127,16 +4155,20 @@ $(SHL8TARGETN) : \ .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(SHL8ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def - @echo dlltool --input-def $(SHL8DEF) \ - --dllname $(SHL8TARGET)$(DLLPOST) \ + @echo dlltool --dllname $(SHL8TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_8.cmd @noop $(assign ALL8OBJLIST:=$(STDOBJ) $(SHL8OBJS) $(SHL8LINKRESO) $(shell $(TYPE) /dev/null $(SHL8LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB8NAME)"!="" # do not have to include objs @noop $(assign DEF8OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) @noop $(foreach,i,$(DEF8OBJLIST) $(assign ALL8OBJLIST:=$(ALL8OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB8NAME)"!="" - @echo --output-exp $(MISC)/$(@:b)_exp.o \ - $(ALL8OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_8.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_8.cmd +.IF "$(SHL8DEF)"!="" + @echo --input-def $(SHL8DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_8.cmd +.ELSE + @echo $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_8.cmd +.ENDIF + @echo $(ALL8OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_8.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \ `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ @@ -4675,16 +4707,20 @@ $(SHL9TARGETN) : \ .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(SHL9ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def - @echo dlltool --input-def $(SHL9DEF) \ - --dllname $(SHL9TARGET)$(DLLPOST) \ + @echo dlltool --dllname $(SHL9TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_9.cmd @noop $(assign ALL9OBJLIST:=$(STDOBJ) $(SHL9OBJS) $(SHL9LINKRESO) $(shell $(TYPE) /dev/null $(SHL9LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB9NAME)"!="" # do not have to include objs @noop $(assign DEF9OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) @noop $(foreach,i,$(DEF9OBJLIST) $(assign ALL9OBJLIST:=$(ALL9OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB9NAME)"!="" - @echo --output-exp $(MISC)/$(@:b)_exp.o \ - $(ALL9OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_9.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_9.cmd +.IF "$(SHL9DEF)"!="" + @echo --input-def $(SHL9DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_9.cmd +.ELSE + @echo $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_9.cmd +.ENDIF + @echo $(ALL9OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_9.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \ `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ @@ -5223,16 +5259,20 @@ $(SHL10TARGETN) : \ .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(SHL10ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def - @echo dlltool --input-def $(SHL10DEF) \ - --dllname $(SHL10TARGET)$(DLLPOST) \ + @echo dlltool --dllname $(SHL10TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_10.cmd @noop $(assign ALL10OBJLIST:=$(STDOBJ) $(SHL10OBJS) $(SHL10LINKRESO) $(shell $(TYPE) /dev/null $(SHL10LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB10NAME)"!="" # do not have to include objs @noop $(assign DEF10OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) @noop $(foreach,i,$(DEF10OBJLIST) $(assign ALL10OBJLIST:=$(ALL10OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB10NAME)"!="" - @echo --output-exp $(MISC)/$(@:b)_exp.o \ - $(ALL10OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_10.cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_10.cmd +.IF "$(SHL10DEF)"!="" + @echo --input-def $(SHL10DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_10.cmd +.ELSE + @echo $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_10.cmd +.ENDIF + @echo $(ALL10OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_10.cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \ `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk index d840e4457f61..5a28b242967d 100644 --- a/solenv/inc/antsettings.mk +++ b/solenv/inc/antsettings.mk @@ -28,10 +28,6 @@ .IF "$(SOLAR_JAVA)"!="" -.IF "$(ANT_HOME)" == "" -ANT_HOME*:=$(COMMON_BUILD_TOOLS)/apache-ant-1.7.0 -.EXPORT : ANT_HOME -.ENDIF ANT_LIB*:=$(ANT_HOME)/lib ANT_CLASSPATH:=$(ANT_LIB)/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)/ant.jar diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 6e6607f779e1..ca9b6bf01e13 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m74(Build:9487) -BUILD=9487 -LAST_MINOR=m74 +RSCREVISION=300m75(Build:9488) +BUILD=9488 +LAST_MINOR=m75 SOURCEVERSION=DEV300 diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index b3c3cb5283dd..457041378f85 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -220,7 +220,7 @@ $(SLO)/%.obj : %.cpp .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cxx - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx @@ -245,7 +245,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx .ENDIF # "$(nodep)"=="" $(SLO)/%.obj : $(MISC)/%.cc - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc @@ -411,7 +411,7 @@ $(OBJ)/%.obj : $(MISC)/%.m # Objective-C files $(SLO)/%.obj : $(MISC)/%.m - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m @@ -472,7 +472,7 @@ $(OBJ)/%.obj : $(MISC)/%.mm # Objective-C++ files $(SLO)/%.obj : $(MISC)/%.mm - @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(COMPILE_ECHO_FILE) + @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE) .IF "$(OS)"=="MACOSX" @$(RM) $@ $(@:s/.obj/.o/) $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 1d4c1d50422f..6136e21acc96 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -931,7 +931,7 @@ MKDEPFLAGS+=$(MKDEPSOLVER) MKDEPFLAGS+=$(MKDEPLOCAL) #.ENDIF -BISON=bison +BISON*=bison YACCFLAGS*=-d SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/svidl diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc index 86257dc843a0..3e090272408d 100644 --- a/solenv/inc/shlinfo.rc +++ b/solenv/inc/shlinfo.rc @@ -79,7 +79,7 @@ VS_VERSION_INFO versioninfo value "FileVersion", PPS(VER_LEVEL) "\0" value "OriginalFilename", PPS(ORG_NAME) "\0" value "InternalName", PPS(INTERNAL_NAME) "\0" - value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0" + value "LegalCopyright", S_CRIGHT " Oracle, Inc.\0" ADDITIONAL_VERINFO1 ADDITIONAL_VERINFO2 ADDITIONAL_VERINFO3 @@ -92,7 +92,7 @@ VS_VERSION_INFO versioninfo value "FileVersion", PPS(VER_LEVEL) "\0" value "OriginalFilename", PPS(ORG_NAME) "\0" value "InternalName", PPS(INTERNAL_NAME) "\0" - value "LegalCopyright", S_CRIGHT " Sun Microsystems, Inc.\0" + value "LegalCopyright", S_CRIGHT " Oracle, Inc.\0" ADDITIONAL_VERINFO1 ADDITIONAL_VERINFO2 ADDITIONAL_VERINFO3 diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 0fd97edfe8b0..170947c21c4a 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -320,16 +320,20 @@ $(SHL$(TNR)TARGETN) : \ .ENDIF # "$(COM)"=="GCC" .ENDIF # "$(SHL$(TNR)ALLRES)"!="" .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def - @echo dlltool --input-def $(SHL$(TNR)DEF) \ - --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \ + @echo dlltool --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \ --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @noop $(assign ALL$(TNR)OBJLIST:=$(STDOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) $(shell $(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g)) .IF "$(DEFLIB$(TNR)NAME)"!="" # do not have to include objs @noop $(assign DEF$(TNR)OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) @noop $(foreach,i,$(DEF$(TNR)OBJLIST) $(assign ALL$(TNR)OBJLIST:=$(ALL$(TNR)OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB$(TNR)NAME)"!="" - @echo --output-exp $(MISC)/$(@:b)_exp.o \ - $(ALL$(TNR)OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd + @echo --output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd +.IF "$(SHL$(TNR)DEF)"!="" + @echo --input-def $(SHL$(TNR)DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd +.ELSE + @echo $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd +.ENDIF + @echo $(ALL$(TNR)OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \ $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \ `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \ diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index 96aadabd753f..7e12a9e2b225 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -172,7 +172,6 @@ MKDIRHIER*=mkdir$E -p RMDIR*=rmdir XARGS*=xargs GNUTAR*:=tar -TAR*:=tar RM+=$(RMFLAGS) ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/adjustvisibility diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk index 1d331b7f1e94..abb2bb25e34d 100755..100644 --- a/solenv/inc/wntgcci.mk +++ b/solenv/inc/wntgcci.mk @@ -77,7 +77,7 @@ CFLAGSNOOPT=-O0 # Compiler flags for describing the output path CFLAGSOUTOBJ=-o #plattform hart setzen -CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED +CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED -D_MSC_EXTENSIONS -D_FORCENAMELESSUNION .IF "$(DYNAMIC_CRT)"!="" CDEFS+=-D_DLL .ENDIF diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk index b4221d310b74..6ed8327c8506 100644 --- a/solenv/inc/wntmsci10.mk +++ b/solenv/inc/wntmsci10.mk @@ -209,8 +209,7 @@ MODULES_WITH_WARNINGS := \ lingucomponent \ soldep -CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -DWINVER=0x400 -D_WIN32_IE=0x400 -CDEFS+=-D_MT +CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500 COMMENTFLAG=/COMMENT:"$(PRJNAME)_$(UPD)_$(VCSID)_" diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk index a04dbd881798..b270a6a25cfe 100755..100644 --- a/solenv/inc/wntmsci11.mk +++ b/solenv/inc/wntmsci11.mk @@ -219,12 +219,10 @@ CFLAGSWERRCC=-WX MODULES_WITH_WARNINGS := \ soldep -CDEFS+=-DSTLPORT_VERSION=400 -D_MT +CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500 .IF "$(COMEX)" == "11" -CDEFS+=-DWINVER=0x0400 -D_WIN32_IE=0x0400 _VC_MANIFEST_BASENAME=__VC80 .ELSE -CDEFS+=-DWINVER=0x0500 -D_WIN32_IE=0x0500 _VC_MANIFEST_BASENAME=__VC90 .ENDIF |
