[Libreoffice-commits] core.git: scp2/inc scp2/source
scp2/inc/macros.inc| 10 -- scp2/source/calc/registryitem_calc.scp | 11 ++- 2 files changed, 10 insertions(+), 11 deletions(-) New commits: commit 13bc4a1c044091df08acf56695f2e00f2bd8fc2b Author: Julien Nabet AuthorDate: Thu Mar 7 19:53:57 2019 +0100 Commit: Julien Nabet CommitDate: Fri Mar 8 11:36:38 2019 +0100 Related tdf#111344: fix Bad token \text/x-ms-iqy Noticed this on console: cpp: :1 C:/BLP/core/scp2/source/calc/registryitem_calc.scp:1261 \ Bad token \text/x-ms-iqy produced by ## See https://bugs.documentfoundation.org/show_bug.cgi?id=111344#c9 Change-Id: If6b5b4ae90c1b0fb812a5e2cd87d17fc688d21c6 Reviewed-on: https://gerrit.libreoffice.org/68885 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 4e113f90a7f0..e801253df1f0 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -272,16 +272,6 @@ End ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \ End -#define CONDITIONAL_REGISTRY_ENTRY_MEDIATYPE_DEF_EXT(name,cond,key,mediatype) \ -RegistryItem gid_Regitem__MediaType_DefExt_##name \ -ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ -ModuleID = gid_Module_Root_Reg_##name; \ -Subkey = STRING(CONCAT2(MIME\Database\Content Type\,mediatype)); \ -Name = STRING(Extension); \ -Value = STRING(CONCAT2(.,key)); \ -ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \ -End - #define REGISTRY_ENTRY_DOC(name,modid,disp_name) \ RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index a48a194522ed..ca0fc58921cd 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -1258,7 +1258,16 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLS CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_OPEN_EXTENSION( Iqy, gid_Module_Prg_Calc_MSO_Reg, iqy, IQY, MS_EXCEL_WEBQUERY, 0, scalc.exe, open, Calc ) CONDITIONAL_REGISTRY_ENTRY_EXT_MEDIATYPE( Iqy, IQY, iqy, text/x-ms-iqy ) -CONDITIONAL_REGISTRY_ENTRY_MEDIATYPE_DEF_EXT( Iqy, IQY, iqy, text/x-ms-iqy ) + +RegistryItem gid_Regitem__MediaType_DefExt_Iqy +ParentID = PREDEFINED_HKEY_CLASSES_ROOT; +ModuleID = gid_Module_Root_Reg_Iqy; +Subkey = "MIME\Database\Content Type\text/x-ms-iqy"; +Name = "Extension"; +Value = ".iqy"; +ComponentCondition = "REGISTER_IQY=1"; +End + CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt, gid_Module_Prg_Calc_MSO_Reg, xlt, XLT, MS_EXCEL_TEMPLATE_OLD, 4, scalc.exe, new, Calc ) CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc ) CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc scp2/source
scp2/inc/macros.inc | 10 ++ scp2/source/calc/registryitem_calc.scp |1 + scp2/source/draw/registryitem_draw.scp |1 + scp2/source/impress/registryitem_impress.scp |1 + scp2/source/ooo/registryitem_ooo.scp |1 + scp2/source/writer/registryitem_writer.scp |1 + 6 files changed, 15 insertions(+) New commits: commit ccd7f45d1fb9bc96e17657bed7a76c79f4ad5801 Author: Mike Kaganski Date: Mon May 15 10:42:30 2017 +0300 tdf#100837: advertise app URL capabilities This is required to be able to use handlers when invoked from Office Web Apps (on Win7+) Change-Id: I242111ad365f5cb350b78b75300ddbe8b708b357 Reviewed-on: https://gerrit.libreoffice.org/37624 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index ce6a5caaf1e8..8825fdc55d79 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -388,6 +388,16 @@ End Styles = (); \ End +#define REGISTRY_ENTRY_CAPABILITIES_URL(scheme,name,modid,handler) \ +RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_URLAssociations_,name) \ +ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ +ModuleID = modid; \ +Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\URLAssociations); \ +Name = scheme; \ +Value = handler; \ +Styles = (); \ +End + #define CONDITIONAL_REGISTER_DOC_OPEN_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) \ diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index 214f5b84bd3b..e660c41c5983 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -1263,3 +1263,4 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Wb2, gid_Module_Prg_Calc_Other_Reg, wb2, WB2 // registering ms-excel URI scheme handler CONDITIONAL_REGISTER_URI_HANDLER( ms-excel, ms_excel, gid_Module_Prg_Calc_MSO_Reg, SELECT_EXCEL ) +REGISTRY_ENTRY_CAPABILITIES_URL(ms-excel, ms_excel, gid_Module_Prg_Calc_MSO_Reg, vnd.libreoffice.command) diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp index 94e35437e450..c33b9026433e 100644 --- a/scp2/source/draw/registryitem_draw.scp +++ b/scp2/source/draw/registryitem_draw.scp @@ -1104,3 +1104,4 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( PCD, gid_Module_Prg_Draw_Other_Reg, pcd, P // registering ms-visio URI scheme handler CONDITIONAL_REGISTER_URI_HANDLER( ms-visio, ms_visio, gid_Module_Prg_Draw_MSO_Reg, SELECT_VISIO ) +REGISTRY_ENTRY_CAPABILITIES_URL(ms-visio, ms_visio, gid_Module_Prg_Draw_MSO_Reg, vnd.libreoffice.command) diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index 76370ffbe216..fdaef6c39528 100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -1126,3 +1126,4 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Cgm, gid_Module_Prg_Impress_Other_Reg, cgm, // registering ms-powerpoint URI scheme handler CONDITIONAL_REGISTER_URI_HANDLER( ms-powerpoint, ms_powerpoint, gid_Module_Prg_Impress_MSO_Reg, SELECT_POWERPOINT ) +REGISTRY_ENTRY_CAPABILITIES_URL(ms-powerpoint, ms_powerpoint, gid_Module_Prg_Impress_MSO_Reg, vnd.libreoffice.command) diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index f6c0e49562eb..ed93d2816100 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -679,3 +679,4 @@ End // registering vnd.libreoffice.command URI scheme handler REGISTER_URI_HANDLER( vnd.libreoffice.command, vnd_libreoffice_command, gid_Module_Root ) +REGISTRY_ENTRY_CAPABILITIES_URL(vnd.libreoffice.command, vnd_libreoffice_command, gid_Module_Root, vnd.libreoffice.command) diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp index 61498b4f7b0b..71a06fc0a586 100644 --- a/scp2/source/writer/registryitem_writer.scp +++ b/scp2/source/writer/registryitem_writer.scp @@ -1748,3 +1748,4 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( 602, gid_Module_Prg_Wrt_Other_Reg, 602, 60 // registering ms-word URI scheme handler CONDITIONAL_REGISTER_URI_HANDLER( ms-word, ms_word, gid_Module_Prg_Wrt_MSO_Reg, SELECT_WORD ) +REGISTRY_ENTRY_CAPABILITIES_URL(ms-word, ms_word, gid_Module_Prg_Wrt_MSO_Reg, vnd.libreoffice.command) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aebdeb6541e2feea180f9f632e6a626c6ee14957 Author: Mike Kaganski Date: Tue May 2 15:01:27 2017 +0300 tdf#106359: missing leading dot Change-Id: Ibfcbeb0778d9000dad8097384d7f5c7d75be2252 Reviewed-on: https://gerrit.libreoffice.org/37152 Reviewed-by: Mike Kaganski Tested-by: Mike Kaganski diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index ae1c82ddbfc8..ce6a5caaf1e8 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -280,7 +280,7 @@ End ModuleID = gid_Module_Root_Reg_##name; \ Subkey = STRING(CONCAT2(MIME\Database\Content Type\,mediatype)); \ Name = STRING(Extension); \ -Value = STRING(key); \ +Value = STRING(CONCAT2(.,key)); \ ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \ End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc scp2/source
scp2/inc/macros.inc| 20 scp2/source/calc/registryitem_calc.scp |2 ++ 2 files changed, 22 insertions(+) New commits: commit 82fbc7147183dd27be81c20d7c362937bafc3546 Author: Mike Kaganski Date: Tue Apr 25 15:27:09 2017 +0300 tdf#106359: register text/x-ms-iqy MediaType default extension Change-Id: I63be77c4e148befa8f41086163ea2919b1e8baac Reviewed-on: https://gerrit.libreoffice.org/36942 Reviewed-by: Andras Timar Tested-by: Jenkins diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 730b289779b2..ae1c82ddbfc8 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -264,6 +264,26 @@ End ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \ End +#define CONDITIONAL_REGISTRY_ENTRY_EXT_MEDIATYPE(name,cond,key,mediatype) \ +RegistryItem gid_Regitem__MediaType_##name \ +ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ +ModuleID = gid_Module_Root_Reg_##name; \ +Subkey = STRING(CONCAT2(.,key)); \ +Name = STRING(Content Type); \ +Value = STRING(mediatype); \ +ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \ +End + +#define CONDITIONAL_REGISTRY_ENTRY_MEDIATYPE_DEF_EXT(name,cond,key,mediatype) \ +RegistryItem gid_Regitem__MediaType_DefExt_##name \ +ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ +ModuleID = gid_Module_Root_Reg_##name; \ +Subkey = STRING(CONCAT2(MIME\Database\Content Type\,mediatype)); \ +Name = STRING(Extension); \ +Value = STRING(key); \ +ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \ +End + #define REGISTRY_ENTRY_DOC(name,modid,disp_name) \ RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index 2cb78210a2fa..214f5b84bd3b 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -1250,6 +1250,8 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsx, gid_Module_Prg_Calc_MSO_Reg, xlsx, XLS CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsm, gid_Module_Prg_Calc_MSO_Reg, xlsm, XLSM, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_EXTENSION( Xlsb, gid_Module_Prg_Calc_MSO_Reg, xlsb, XLSB, MS_EXCEL_WORKSHEET, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_OPEN_EXTENSION( Iqy, gid_Module_Prg_Calc_MSO_Reg, iqy, IQY, MS_EXCEL_WEBQUERY, 0, scalc.exe, open, Calc ) +CONDITIONAL_REGISTRY_ENTRY_EXT_MEDIATYPE( Iqy, IQY, iqy, text/x-ms-iqy ) +CONDITIONAL_REGISTRY_ENTRY_MEDIATYPE_DEF_EXT( Iqy, IQY, iqy, text/x-ms-iqy ) CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xlt, gid_Module_Prg_Calc_MSO_Reg, xlt, XLT, MS_EXCEL_TEMPLATE_OLD, 4, scalc.exe, new, Calc ) CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltx, gid_Module_Prg_Calc_MSO_Reg, xltx, XLTX, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc ) CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, xltm, XLTM, MS_EXCEL_TEMPLATE, 4, scalc.exe, new, Calc ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc scp2/source
scp2/inc/macros.inc | 45 +++ scp2/source/calc/registryitem_calc.scp |3 + scp2/source/draw/registryitem_draw.scp |2 + scp2/source/impress/registryitem_impress.scp |3 + scp2/source/ooo/registryitem_ooo.scp |3 + scp2/source/writer/registryitem_writer.scp |4 +- 6 files changed, 58 insertions(+), 2 deletions(-) New commits: commit fdd8686987ca4ee693f5f194c8eb482daa69cfef Author: Mike Kaganski Date: Tue Oct 18 16:02:46 2016 +1000 tdf#100837: Register new URI handlers with installer This patch registers vnd.libreoffice.command unconditionally, and also registerd ms-word, ms-excel, ms-visio and ms-powerpoint handlers according to SELECT_WORD, SELECT_EXCEL, SELECT_VISIO, and SELECT_POWERPOINT properties (that are set in FileTypeDialog). This allows to use these URIs in e.g. SharePoint WebDAV integration Change-Id: I3231a15196858da77f1784a47f86f1729a6044bb Reviewed-on: https://gerrit.libreoffice.org/29988 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 30f6760..4de35db 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -544,5 +544,50 @@ File gid_File_Extra_GallFiles##id \ Name = STRING(CONCAT3(Gallery/Files/,id,.filelist)); \ End +#define REGISTER_URI_HANDLER_IMPL(protocol,protid,modid,cond) \ +RegistryItem CONCAT2(gid_Regitem_,protid) \ +ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ +ModuleID = modid; \ +Subkey = STRING(protocol); \ +Value = "URL:" STRING(protocol) " Protocol"; \ +cond \ +End \ +RegistryItem CONCAT3(gid_Regitem_,protid,_URL_Protocol) \ +ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ +ModuleID = modid; \ +Subkey = STRING(protocol); \ +Name = "URL Protocol"; \ +End \ +RegistryItem CONCAT3(gid_Regitem_,protid,_UseOriginalUrlEncoding) \ +ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ +ModuleID = modid; \ +Subkey = STRING(protocol); \ +Name = "UseOriginalUrlEncoding"; \ +Value = "#1"; \ +End \ +RegistryItem CONCAT3(gid_Regitem_,protid,_DefaultIcon) \ +ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ +ModuleID = modid; \ +Subkey = STRING(CONCAT2(protocol,\DefaultIcon)); \ +Value = "\program\soffice.bin,0"; \ +End \ +RegistryItem CONCAT3(gid_Regitem_,protid,_shell_open_command) \ +ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ +ModuleID = modid; \ +Subkey = STRING(CONCAT2(protocol,\shell\open\command)); \ +Value = "\"\program\soffice.exe\" \"%1\""; \ +End + +#define REG_COND(cond) \ +ComponentCondition = STRING(CONCAT2(cond,=1)); + +#define REG_EMPTY_COND + +#define REGISTER_URI_HANDLER(protocol,protid,modid) \ +REGISTER_URI_HANDLER_IMPL(protocol,protid,modid,REG_EMPTY_COND) + +#define CONDITIONAL_REGISTER_URI_HANDLER(protocol,protid,modid,cond) \ +CONDITIONAL_MODULE_ENTRY(protid,modid) \ + REGISTER_URI_HANDLER_IMPL(protocol,protid,gid_Module_Root_Reg_##protid,REG_COND(cond)) #endif // MACROS_INC diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp index 96c10d7..7259226 100644 --- a/scp2/source/calc/registryitem_calc.scp +++ b/scp2/source/calc/registryitem_calc.scp @@ -1257,3 +1257,6 @@ CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Xltm, gid_Module_Prg_Calc_MSO_Reg, x CONDITIONAL_REGISTER_DOC_EXTENSION( Uos, gid_Module_Prg_Calc_Other_Reg, uos, UOS, UNIFORM_OFFICE_FORMAT_SPREADSHEET, 3, scalc.exe, open, Calc ) CONDITIONAL_REGISTER_DOC_EXTENSION( Wb2, gid_Module_Prg_Calc_Other_Reg, wb2, WB2, QUATTROPRO_SPREADSHEET, 3, scalc.exe, open, Calc ) + +// registering ms-excel URI scheme handler +CONDITIONAL_REGISTER_URI_HANDLER( ms-excel, ms_excel, gid_Module_Prg_Calc_MSO_Reg, SELECT_EXCEL ) diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp index 4323024..94e3543 100644 --- a/scp2/source/draw/registryitem_draw.scp +++ b/scp2/source/draw/registryitem_draw.scp @@ -1102,3 +1102,5 @@ CONDITIONAL_REGISTER_DOC_EXTENSION( Xbm, gid_Module_Prg_Draw_Other_Reg, xbm, X CONDITIONAL_REGISTER_DOC_EXTENSION( Xpm, gid_Module_Prg_Draw_Other_Reg, xpm, XPM, X_PIXMAP, 5, sdraw.exe, open, Draw ) CONDITIONAL_REGISTER_DOC_EXTENSION( PCD, gid_Module_Prg_Draw_Other_Reg, pcd, PCD, KODAK_PHOTO_CD_IMAGE, 5, sdraw.exe, open, Draw ) +// registering ms-visio URI scheme handler +CONDITIONAL_REGISTER_URI_HANDLER( ms-visio, ms_visio, gid_Module_Prg_Draw_MSO_Reg, SELECT_VISIO ) diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp index 23f3fda..76370ff 100644 --- a/scp2/source/impress/registryitem_impress.scp +++ b/scp2/source/impress/registryitem_impress.scp @@ -1123,3 +1123,6 @@ CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION( Potm, gid_Module_Prg_Impress_MSO_Reg CONDITIONAL_REGISTER_DOC_EXTENSION( Uop, gid_Module_Prg_Impress_Other_Reg, uop, UOP, UNIFORM_OFFICE_FORMAT_P
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc | 28 1 file changed, 20 insertions(+), 8 deletions(-) New commits: commit 8ab7db320ff158949d2eadaa6e654115201ddf61 Author: skswales Date: Thu Jun 2 23:58:50 2016 +0100 tdf#97872 File association in Windows registry Fix for double backslashes in paths to programs in shell/open etc. registry entries for all non-native file types such as .doc that are mapped by installer to use scalc.exe/swriter.exe etc. Change-Id: Ice8033d4fee079c0fb6d8f84e00ebd784e85d135 Reviewed-on: https://gerrit.libreoffice.org/25849 Tested-by: Jenkins Reviewed-by: jan iversen diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 7b895b6..30f6760 100644 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -298,7 +298,7 @@ End Value = STRING(default); \ End -#define REGISTRY_ENTRY_NEW_CMD(name,modid,app) \ +#define REGISTRY_ENTRY_NEW_CMD_PPA(name,modid,progpath_program_app) \ RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ @@ -309,33 +309,45 @@ End ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new\command)); \ -Value = "\"\program\\" STRING(app) "\" -n \"%1\""; \ +Value = "\"" STRING(progpath_program_app) "\" -n \"%1\""; \ End -#define REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \ +#define REGISTRY_ENTRY_NEW_CMD(name,modid,app) \ + REGISTRY_ENTRY_NEW_CMD_PPA(name,modid,\program\app) + +#define REGISTRY_ENTRY_OPEN_CMD_PPA(name,modid,progpath_program_app) \ RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\open\command)); \ -Value = "\"\program\\" STRING(app) "\" -o \"%1\""; \ +Value = "\"" STRING(progpath_program_app) "\" -o \"%1\""; \ End -#define REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \ +#define REGISTRY_ENTRY_OPEN_CMD(name,modid,app) \ + REGISTRY_ENTRY_OPEN_CMD_PPA(name,modid,\program\app) + +#define REGISTRY_ENTRY_PRINT_CMD_PPA(name,modid,progpath_program_app) \ RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\print\command)); \ -Value = "\"\program\\" STRING(app) "\" -p \"%1\""; \ +Value = "\"" STRING(progpath_program_app) "\" -p \"%1\""; \ End -#define REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \ +#define REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \ + REGISTRY_ENTRY_PRINT_CMD_PPA(name,modid,\program\app) + +#define REGISTRY_ENTRY_PRINTTO_CMD_PPA(name,modid,progpath_program_app) \ RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\printto\command)); \ -Value = "\"\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \ +Value = "\"" STRING(progpath_program_app) "\" -pt \"%2\" \"%1\""; \ End +#define REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \ + REGISTRY_ENTRY_PRINTTO_CMD_PPA(name,modid,\program\app) + #define REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \ RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_,name) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit cadc2cbed1404b47fd2f73a7e0b6c2a3ee663e27
Author: Chris Sherlock
Date: Sun Sep 28 20:51:27 2014 +1000
Fix 64914e407ccac9 - #endif/#else mixup
Change-Id: Ia99ae45e66984ac0d88b6e9b6ca4514cd68f9634
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 8ea47d9..d2142bd 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -447,7 +447,6 @@ End
End
#else
-#endif
#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) \
RegistryItem
CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension)
\
@@ -458,6 +457,8 @@ End
Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
End
+#endif
+
#else
#define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |4 1 file changed, 4 deletions(-) New commits: commit 57bf88d21cacb025e7bea40da78616bb4d165215 Author: Andras Timar Date: Thu Jul 3 13:35:03 2014 +0200 fdo#77057 quick fix: do not touch KindMap for alien file types Change-Id: Iffc24dc7ce12de07660eadcf8a525e77856593e1 diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 9497473..ac4de16 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -424,7 +424,6 @@ End REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \ REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \ REGISTRY_ENTRY_CAPABILITIES(name,modid,key,doc_type) \ -REGISTRY_ENTRY_KINDMAP(name, modid, key) \ #define CONDITIONAL_REGISTER_DOCTEMPLATE_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \ CONDITIONAL_MODULE_ENTRY(name,modid) \ @@ -439,9 +438,6 @@ End REGISTRY_ENTRY_PRINT_CMD(name,modid,app) \ REGISTRY_ENTRY_PRINTTO_CMD(name,modid,app) \ REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \ -REGISTRY_ENTRY_KINDMAP(name, modid, key) \ - - #ifdef _MSC_VER ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc scp2/source
scp2/inc/macros.inc |6 +++--- scp2/source/ooo/module_pdfimport.scp |2 +- scp2/source/ooo/registryitem_ooo.scp |2 +- 3 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 2434ea5930af9575e84353697d8a654b592098d7 Author: Alexander Wilms Date: Tue Feb 25 20:04:54 2014 +0100 Remove visual noise from scp2 Change-Id: Id333de870389e8b4a074aa07fb2d0af336c5062a Reviewed-on: https://gerrit.libreoffice.org/8304 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 6680cb5..8375644 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -274,7 +274,7 @@ End Name = name; \ End -// --- + #define CONDITIONAL_MODULE_ENTRY(name,modid) \ Module gid_Module_Root_Reg_##name \ ParentID = modid; \ @@ -443,7 +443,7 @@ End REGISTRY_ENTRY_TEMPLATE_CAPABILITIES(name,modid,key,doc_type) \ REGISTRY_ENTRY_KINDMAP(name, modid, key) \ -// --- + #ifdef _MSC_VER @@ -468,7 +468,7 @@ End #define REGISTER_PROPERTY_HANDLER_FOR_EXTENSION(extension) // empty #endif -// --- + #if defined WNT #define SCP2_URE_DL_DIR gid_Dir_Ure_Bin diff --git a/scp2/source/ooo/module_pdfimport.scp b/scp2/source/ooo/module_pdfimport.scp index ee504fc..306ccc3 100644 --- a/scp2/source/ooo/module_pdfimport.scp +++ b/scp2/source/ooo/module_pdfimport.scp @@ -12,7 +12,7 @@ // --with-system-poppler builds it can be advantageous though to package this // module as an individual, optional part, so that the core installation does // not feature a dependency on a poppler package. -// + // The // /org.openoffice.TypeDetection.Types/Types/pdf_Portable_Document_Format // configuration node contained in pdfimport.xcd needs to override a diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index 653b0a5..f5110ac 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -601,7 +601,7 @@ End // - Vista Default Programs // Find more information here: // URL: -// - + RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_ApplicationDescription ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities"; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7eeac88bdb111cc069d208cc2d82a6143748d9d3 Author: Michael Stahl Date: Wed Feb 26 14:40:35 2014 +0100 fdo#75526: argh missing semicolon Change-Id: I4cabdcd3d4d5e4a446a4784d7a657655a4fbdfdc diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 0fc98a3..6680cb5 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -181,7 +181,7 @@ End TXT_FILE_BODY; \ Styles = (PACKED); \ Dir = gid_Dir_Lib_Sdk; \ -Name = name \ +Name = name; \ End #else #define SDK_LIBRARY_LINK(id,name,target) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc scp2/source
scp2/inc/macros.inc|6 - scp2/source/accessories/file_samples_accessories.scp | 12 +-- scp2/source/accessories/file_templates_accessories.scp | 66 - scp2/source/ooo/file_extra_ooo.scp | 18 ++-- scp2/source/ooo/file_ooo.scp | 10 +- 5 files changed, 56 insertions(+), 56 deletions(-) New commits: commit 73f4ef48d065c4108de4af52a4dc7d86815b9b05 Author: Michael Stahl Date: Wed Feb 5 20:20:13 2014 +0100 scp2: stop cargo-culting DONT_OVERWRITE around There appears to be no usage of this Style in the installer Perl code in the git history. Change-Id: I137627505af5c7b33006437e83624b34ca2e3583 diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index c70bafd..9266bb5 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -226,7 +226,7 @@ End TXT_FILE_BODY; \ Name = STRING(CONCAT2(name,.jar)); \ Dir = gid_Dir_Classes; \ -Styles = (PACKED,DONT_OVERWRITE); \ +Styles = (PACKED); \ End #define URE_JAR_FILE(id,name) \ @@ -549,13 +549,13 @@ End File gid_File_Extra_Gall##id \ Dir = FILELIST_DIR; \ TXT_FILE_BODY; \ -Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \ +Styles = (FILELIST, WORKSTATION); \ Name = STRING(CONCAT3(Gallery/,id,.filelist)); \ End \ File gid_File_Extra_GallFiles##id \ Dir = FILELIST_DIR; \ TXT_FILE_BODY; \ -Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); \ +Styles = (FILELIST, WORKSTATION); \ Name = STRING(CONCAT3(Gallery/Files/,id,.filelist)); \ End diff --git a/scp2/source/accessories/file_samples_accessories.scp b/scp2/source/accessories/file_samples_accessories.scp index c495d8d..eb29717 100644 --- a/scp2/source/accessories/file_samples_accessories.scp +++ b/scp2/source/accessories/file_samples_accessories.scp @@ -17,21 +17,21 @@ File gid_File_Extra_Samples_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST, DONT_OVERWRITE); +Styles = (FILELIST); EXTRA_ALL_LANG(accessoriessamples,filelist); End File gid_File_Extra_Samples_Documentations_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST, DONT_OVERWRITE); +Styles = (FILELIST); EXTRA_ALL_LANG(accessoriessamplesdocumentation,filelist); End File gid_File_Extra_Samples_Advertisement_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST, DONT_OVERWRITE); +Styles = (FILELIST); EXTRA_ALL_LANG(accessoriessamplesadvertisement,filelist); End @@ -40,21 +40,21 @@ End File gid_File_Extra_Samples_NONFREE_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST, DONT_OVERWRITE); +Styles = (FILELIST); EXTRA_ALL_LANG(accessoriessamplesnonfree,filelist); End File gid_File_Extra_Samples_NONFREE_Documentations_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST, DONT_OVERWRITE); +Styles = (FILELIST); EXTRA_ALL_LANG(accessoriessamplesnonfreedocumentation,filelist); End File gid_File_Extra_Samples_NONFREE_Advertisement_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST, DONT_OVERWRITE); +Styles = (FILELIST); EXTRA_ALL_LANG(accessoriessamplesnonfreeadvertisement,filelist); End diff --git a/scp2/source/accessories/file_templates_accessories.scp b/scp2/source/accessories/file_templates_accessories.scp index 76100c2..2f570a0 100644 --- a/scp2/source/accessories/file_templates_accessories.scp +++ b/scp2/source/accessories/file_templates_accessories.scp @@ -17,77 +17,77 @@ File gid_File_Extra_Templates_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST, DONT_OVERWRITE); +Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplates,filelist); End File gid_File_Extra_Templates_Layout_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST, DONT_OVERWRITE); +Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplateslayout,filelist); End File gid_File_Extra_Templates_Present_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST, DONT_OVERWRITE); +Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatespresent,filelist); End File gid_File_Extra_Templates_Educate_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST, DONT_OVERWRITE); +Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplateseducate,filelist); End File gid_File_Extra_Templates_Finance_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST, DONT_OVERWRITE); +Styles = (FILELIST); EXTRA_ALL_LANG(accessoriestemplatesfinance,filelist); End File gid_File_Extra_Templates_Forms_Accessories Dir = FILELIST_DIR; TXT_FILE_BODY; -Styles = (FILELIST, DONT_OVERWRITE); +Styles = (FILELIST); EXTRA_ALL_
[Libreoffice-commits] core.git: scp2/inc scp2/source solenv/bin
scp2/inc/macros.inc |4 -
scp2/source/ooo/file_library_ooo.scp |4 -
scp2/source/ooo/module_hidden_ooo.scp | 12 ++---
scp2/source/ooo/ure.scp | 50 +++---
solenv/bin/modules/installer/globals.pm |1
solenv/bin/modules/installer/windows/file.pm |7 ---
solenv/bin/modules/installer/windows/msiglobal.pm | 10
7 files changed, 37 insertions(+), 51 deletions(-)
New commits:
commit a41d72333d15c609f0441bd7df1722b31297756d
Author: Andras Timar
Date: Tue Sep 10 09:10:32 2013 +0200
kill VERSION_INDEPENDENT_COMP_ID
Version independent ComponentID in Component table of MSI means
that the GUID is calculated from the Component name only, the
PRODUCTVERSION is not concatenated to the name. Providing that
name is constant in all versions, the resulting GUID would be
the same e.g. for 4.0, 4.1, 4.2 etc. But what is it good for?
Faster upgrades maybe? But name can also change, we did not
pay attention to keep it constant. So in order to help scp2
cleanup, VERSION_INDEPENDENT_COMP_ID flag was obsoleted and
removed.
Change-Id: I8e1ee450524b02f07d0b0553f6b82d0321dbddcf
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 1080540..deb4c31 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -494,7 +494,7 @@ End
LIB_FILE_BODY; \
Dir = SCP2_URE_DL_DIR; \
Name = name; \
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \
+Styles = (PACKED); \
End
#define URE_EXECUTABLE(id,name) \
@@ -502,7 +502,7 @@ End
BIN_FILE_BODY; \
Dir = GID_DIR_URE_BIN; \
Name = name; \
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \
+Styles = (PACKED); \
End
#define LIBO_EXECUTABLE(id,name) \
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index b5ff166..45d2351 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -436,13 +436,13 @@ File gid_File_Moz_Msvcp80
LIB_FILE_BODY;
Dir = SCP2_OOO_BIN_DIR;
Name = SCP2_URE_DL_NORMAL("msvcp80");
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+Styles = (PACKED);
End
File gid_File_Moz_Msvcr80
LIB_FILE_BODY;
Dir = SCP2_OOO_BIN_DIR;
Name = SCP2_URE_DL_NORMAL("msvcr80");
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+Styles = (PACKED);
End
File gid_File_Moz_Msvc80crt_Manifest
BIN_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp
b/scp2/source/ooo/module_hidden_ooo.scp
index 9fc674b..928cd0c 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -26,7 +26,7 @@ Unixlink gid_Unixlink_File_Lib_Curl
BIN_FILE_BODY;
Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+Styles = (PACKED);
Target = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
End
#endif
@@ -35,7 +35,7 @@ Unixlink gid_Unixlink_File_Lib_Raptor
BIN_FILE_BODY;
Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(libraptor,UNXSUFFIX));
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+Styles = (PACKED);
Target = STRING(CONCAT3(libraptor,UNXSUFFIX,.1));
End
@@ -43,7 +43,7 @@ Unixlink gid_Unixlink_File_Lib_Rasqal
BIN_FILE_BODY;
Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(librasqal,UNXSUFFIX));
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+Styles = (PACKED);
Target = STRING(CONCAT3(librasqal,UNXSUFFIX,.1));
End
@@ -51,7 +51,7 @@ Unixlink gid_Unixlink_File_Lib_Rdf
BIN_FILE_BODY;
Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(librdf,UNXSUFFIX));
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+Styles = (PACKED);
Target = STRING(CONCAT3(librdf,UNXSUFFIX,.0));
End
#endif
@@ -60,14 +60,14 @@ Unixlink gid_Unixlink_File_Lib_Xslt
BIN_FILE_BODY;
Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(libxslt,UNXSUFFIX));
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+Styles = (PACKED);
Target = STRING(CONCAT3(libxslt,UNXSUFFIX,.1));
End
Unixlink gid_Unixlink_File_Lib_eXslt
BIN_FILE_BODY;
Dir = SCP2_OOO_BIN_DIR;
Name = STRING(CONCAT2(libexslt,UNXSUFFIX));
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+Styles = (PACKED);
Target = STRING(CONCAT3(libexslt,UNXSUFFIX,.0));
End
#endif
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 425b487..67dab4e 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -98,7 +98,7 @@ File gid_File_Dl_Cppu
LIB_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_VER("cppu", "3");
-Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+Styles = (PACKED);
End
#ifdef AIX
@@ -106,7 +106,7 @@ Unixlink gid_Unixlink_File_Dl_Cppu
BIN_FILE_BODY;
Dir =
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 1982c3fd674f7a7c4b59e82e565af048c9e7387a Author: Jesús Corrius Date: Fri Aug 23 07:49:07 2013 +0200 now really create the key in the right place sigh... Change-Id: I6d55da7b6e7fc1c6a9573aa05f9045388edf3684 Reviewed-on: https://gerrit.libreoffice.org/5589 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index ff01770..cb4924b 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -273,7 +273,8 @@ End ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ ComponentCondition = STRING(VersionNT >= 601); \ -Subkey = STRING(CONCAT3(LibreOffice.,name,\AppUserModelID)); \ +Subkey = STRING(CONCAT2(LibreOffice.,name)); \ +Name = STRING(AppUserModelID); \ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cbb3f73adec26896b1e5c371548fa3bd1ae57130 Author: Jesús Corrius Date: Thu Aug 22 21:31:05 2013 +0200 I am stupid It's not actually that I am massively stupid, it's just that I've got bad luck when it comes to thinking. This patch makes the installer create the values in the right location. Where now...? you'd better don't ask. /me goes for a brown paper bag. Change-Id: I792ba5e9a78a895d3df7dfc48d1fc7c5303ce28e Reviewed-on: https://gerrit.libreoffice.org/5587 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 75d2778..ff01770 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -273,7 +273,7 @@ End ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ ComponentCondition = STRING(VersionNT >= 601); \ -Subkey = STRING(AppUserModelID); \ +Subkey = STRING(CONCAT3(LibreOffice.,name,\AppUserModelID)); \ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit c4d5b148340932df9ac0360e6831169e945566fe Author: Jesús Corrius Date: Tue Aug 20 11:23:02 2013 +0200 Registy item fix for AppUserModelID and use STRING macro for strings Change-Id: Id6434355aabdde4f39232ab5a839201a85ca4d29 Reviewed-on: https://gerrit.libreoffice.org/5529 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 4d588a4..75d2778 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -269,10 +269,10 @@ End End #define REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ -RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \ +RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_AppUserModelID) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ -ComponentCondition = "VersionNT >= 601"; \ +ComponentCondition = STRING(VersionNT >= 601); \ Subkey = STRING(AppUserModelID); \ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ End @@ -355,10 +355,10 @@ End RegistryItem CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Explorer_KindMap_,name) \ ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \ ModuleID = modid; \ -ComponentCondition = "VersionNT >= 600"; \ +ComponentCondition = STRING(VersionNT >= 600); \ Subkey = STRING(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap); \ Name = STRING(CONCAT2(.,key)); \ -Value = "document"; \ +Value = STRING(document); \ End #define CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9b6e7e72ebd6a9b308fd012b242cd29152407faa Author: Jesús Corrius Date: Tue Aug 13 12:47:06 2013 +0200 AppUserModelIDs registry entries are useful only on Windows7+ Change-Id: Ia17608d603434fa244c056bf711ce4951644246e Reviewed-on: https://gerrit.libreoffice.org/5385 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 25e0f41..6a4b19a 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -239,7 +239,7 @@ End RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ ModuleID = modid; \ -ComponentCondition = "VersionNT >= 600"; \ +ComponentCondition = "VersionNT >= 601"; \ Subkey = STRING(AppUserModelID); \ Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ End ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc | 11 +++ 1 file changed, 11 insertions(+) New commits: commit 5f23dac65b39750356418d7d8f490a37a944c34c Author: Jesús Corrius Date: Sun Aug 4 14:45:59 2013 +0200 Add AppUserModelID for all supported formats Now only the ODF formats have AppUserModelID, but we need AppUserModelID for all supported formats so the Windows 7 recent documents works as expected. This patch only adds a few registry keys during the installation process on Windows. Change-Id: I2d7460c1ed8b4ba77da8bb1c5b0c696c521353c5 Reviewed-on: https://gerrit.libreoffice.org/5274 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 86b4b546..25e0f41 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -235,6 +235,15 @@ End REG_VALUE_LNG(disp_name) \ End +#define REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ +RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \ +ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ +ModuleID = modid; \ +ComponentCondition = "VersionNT >= 600"; \ +Subkey = STRING(AppUserModelID); \ +Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \ +End + #define REGISTRY_ENTRY_ICON(name,modid,icon_id) \ RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \ ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \ @@ -324,6 +333,7 @@ End 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_APPUSERMODELID(name,modid,doc_type) \ REGISTRY_ENTRY_ICON(name,modid,icon_id) \ REGISTRY_ENTRY_SHELL(name,default,modid) \ REGISTRY_ENTRY_NEW_CMD(name,modid,app) \ @@ -338,6 +348,7 @@ End REGISTRY_ENTRY_OPEN_WITH_TMPL(name,cond,doc_type,modid,key) \ CONDITIONAL_REGISTRY_ENTRY_EXT(name,cond,key) \ REGISTRY_ENTRY_DOC(name,modid,disp_name) \ +REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \ REGISTRY_ENTRY_ICON(name,modid,icon_id) \ REGISTRY_ENTRY_SHELL(name,default,modid) \ REGISTRY_ENTRY_NEW_CMD(name,modid,app) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scp2/inc scp2/macros scp2/source solenv/gbuild
scp2/inc/macros.inc |9 +
scp2/macros/macro.pl |2 +-
scp2/source/base/file_base.scp |5 ++---
scp2/source/calc/file_calc.scp |5 ++---
scp2/source/draw/file_draw.scp |5 ++---
scp2/source/impress/file_impress.scp |5 ++---
scp2/source/math/file_math.scp |5 ++---
scp2/source/ooo/file_ooo.scp | 14 ++
scp2/source/writer/file_writer.scp |5 ++---
solenv/gbuild/AllLangHelp.mk | 17 +
solenv/gbuild/HelpTarget.mk | 33 +
solenv/gbuild/TargetLocations.mk |1 -
12 files changed, 46 insertions(+), 60 deletions(-)
New commits:
commit d23f8bb0caf814684a4b5820f8d4d1389d9dda14
Author: David Tardon
Date: Sun Apr 14 19:19:40 2013 +0200
gbuild: deliver help files as packages
Change-Id: I52904567d0c7434af3f013cad7c3d9a8a67ac9f2
Reviewed-on: https://gerrit.libreoffice.org/3384
Tested-by: LibreOffice gerrit bot
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 7ae0b4e..6ff7959 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -56,6 +56,7 @@
#define READMETXTFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext))
#define READMEFILENAME(name,lang) STRING(CONCAT2(name,lang))
#define EXTRAFILENAME(name,lang) STRING(CONCAT3(name,lang,.zip))
+#define EXTRAFILELISTNAME(prefix,name,lang)
STRING(CONCAT4(prefix,name,lang,.filelist))
#define CONFIGLANGFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext))
#define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program
@@ -81,13 +82,13 @@
Styles = (ARCHIVE)
#ifdef WITH_HELPPACK_INTEGRATION
-#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
+#define FILELIST_TXT_FILE_BODY_HELPPACK \
TXT_FILE_BODY; \
-Styles = (ARCHIVE,FORCEHELPPACK,LANGUAGEMODULE)
+Styles = (FILELIST,FORCEHELPPACK,LANGUAGEMODULE)
#else
-#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
+#define FILELIST_TXT_FILE_BODY_HELPPACK \
TXT_FILE_BODY; \
-Styles = (ARCHIVE,HELPPACK,LANGUAGEMODULE)
+Styles = (FILELIST,HELPPACK,LANGUAGEMODULE)
#endif
#define PACKED_LIB_FILE_BODY \
diff --git a/scp2/macros/macro.pl b/scp2/macros/macro.pl
index dc5d2a9..2ad3fad 100644
--- a/scp2/macros/macro.pl
+++ b/scp2/macros/macro.pl
@@ -169,7 +169,7 @@ sub write_EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG
next if ( $poorhelplocalizations{$lang} );
print OUTFILE ";" unless $first;
$first = 0;
-print OUTFILE "\\\n\tName ($lang) = EXTRAFILENAME(name,_$lang)";
+print OUTFILE "\\\n\tName ($lang) =
EXTRAFILELISTNAME(HelpTarget/,name,/$lang)";
}
print OUTFILE "\n\n";
}
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index f684e1d..fb1a230 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -66,10 +66,9 @@ STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
#if defined WITH_HELP
File gid_File_Help_Sdatabase_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdatabase);
-Patchfiles = ();
End
#endif
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index f598556..8f5dfbb 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -71,10 +71,9 @@ STD_RES_FILE( gid_File_Res_Sc, sc )
#if defined WITH_HELP
File gid_File_Help_Scalc_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(scalc);
-Patchfiles = ();
End
#endif
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 676112f..4b7c4db 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -36,10 +36,9 @@ End
#if defined WITH_HELP
File gid_File_Help_Sdraw_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdraw);
-Patchfiles = ();
End
#endif
diff --git a/scp2/source/impress/file_impress.scp
b/scp2/source/impress/file_impress.scp
index 88cbf69..f2eebf0 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -57,10 +57,9 @@ End
#if defined WITH_HELP
File gid_File_Help_Simpress_Zip
-Dir = gid_Dir_Help_Isolanguage;
-ARCHIVE_TXT_FILE_BODY_HELPPACK;
+Dir = FILELIST_DIR;
+FILELIST_TXT_FILE_BODY_HELPPACK;
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
-Patchfiles = ();
End
#endif
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index acbb3c9..aa0fcb3 100644
--- a/scp2/source/math/file_math.
[Libreoffice-commits] core.git: scp2/inc
scp2/inc/macros.inc | 12 1 file changed, 12 deletions(-) New commits: commit 6fb3c3872c626efe740c850d9e89447a1d7ca053 Author: Thomas Arnhold Date: Sat Apr 13 15:01:14 2013 +0200 remove unused macros Change-Id: I0b0a73e8c9d6c5fb760c2278e58b87f08e881ce4 diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index ad9f264..7ae0b4e 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -30,9 +30,6 @@ #define REG_VALUE_LNG(id) \ ALL_LANG(Value,STR_REG_VAL_##id); -#define ALL_LANG_STR_VALUE_LNG(ident) \ -ALL_LANG(Value,STR_VALUE_##ident) - #ifdef UNX #ifdef MACOSX #define UNXSUFFIX .dylib @@ -374,15 +371,6 @@ End #define SCP2_URE_DL_UNO_VER(n, v) n v ".dll" #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll" #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure -#if defined _MSC_VER -#if defined _DEBUG_RUNTIME -#define SCP2_STDLP_DEBUG "d" -#else -#define SCP2_STDLP_DEBUG "" -#endif -#else // GCC -#define SCP2_STDLP_DEBUG "" -#endif #else #define SCP2_URE_DL_DIR gid_Dir_Ure_Lib #define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
