diff options
| -rw-r--r-- | Repository.mk | 15 | ||||
| -rw-r--r-- | extensions/Module_extensions.mk | 16 | ||||
| -rw-r--r-- | extensions/source/nsplugin/source/nsplugin_oo.rc | 46 | ||||
| -rw-r--r-- | np_sdk/Module_np_sdk.mk | 2 |
4 files changed, 63 insertions, 16 deletions
diff --git a/Repository.mk b/Repository.mk index a18cff9280b0..9d6ed2108989 100644 --- a/Repository.mk +++ b/Repository.mk @@ -124,13 +124,6 @@ $(eval $(call gb_Helper_register_executables,UREBIN,\ endif -ifeq ($(WITH_MOZILLA),YES) -$(eval $(call gb_Helper_register_executables,OOO,\ - pluginapp.bin \ -)) -$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ - pl \ -)) ifeq ($(ENABLE_NSPLUGIN),YES) $(eval $(call gb_Helper_register_executables,OOO,\ nsplugin \ @@ -139,6 +132,14 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ npsoplugin \ )) endif + +ifeq ($(WITH_MOZILLA),YES) +$(eval $(call gb_Helper_register_executables,OOO,\ + pluginapp.bin \ +)) +$(eval $(call gb_Helper_register_libraries,OOOLIBS, \ + pl \ +)) endif # WITH_MOZILLA diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index d0490eaea76e..97ad06d0df99 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -90,6 +90,14 @@ endif # DISABLE_ATL endif # WNT +ifeq ($(ENABLE_NSPLUGIN),YES) +$(eval $(call gb_Module_add_targets,extensions,\ + Executable_nsplugin \ + Library_npsoplugin \ + WinResTarget_npsoplugin \ +)) +endif + ifeq ($(WITH_MOZILLA),YES) $(eval $(call gb_Module_add_targets,extensions,\ @@ -104,14 +112,6 @@ $(eval $(call gb_Module_add_targets,extensions,\ endif endif -ifeq ($(ENABLE_NSPLUGIN),YES) -$(eval $(call gb_Module_add_targets,extensions,\ - Executable_nsplugin \ - Library_npsoplugin \ - WinResTarget_npsoplugin \ -)) -endif - endif # WITH_MOZILLA=YES ifeq ($(OS),MACOSX) diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc index 1fc8285c6e00..ba09335094ea 100644 --- a/extensions/source/nsplugin/source/nsplugin_oo.rc +++ b/extensions/source/nsplugin/source/nsplugin_oo.rc @@ -28,3 +28,49 @@ VALUE "FileOpenName", "StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0" #define ADDITIONAL_VERINFO2 VALUE "FileDescription", "LibreOffice Plug-in handles all its documents" VALUE "ProductName", "LibreOffice Plug-in" VALUE "MIMEType", "application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template|" #define ADDITIONAL_VERINFO3 "application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0" +#define VERVARIANT 3 +#define ORG_NAME npsoplugin.dll +#define RES_APP_VENDOR +#define INTERNAL_NAME npsoplugin + +#include <windows.h> +#include "version.hrc" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT + PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT + FILEFLAGSMASK 0x3F + FILEFLAGS +#if defined(DEBUG) + VS_FF_DEBUG | +#endif +#ifdef VER_PREL + VS_FF_PRERELEASE | +#endif + 0 + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_APP + { + BLOCK "StringFileInfo" + { + BLOCK "040904E4" + { + // International StringTable + VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0" + VALUE "ProductName", "LibreOffice\0" + VALUE "ProductVersion", PPS(VER_LEVEL) "\0" + VALUE "FileVersion", PPS(VER_LEVEL) "\0" + VALUE "OriginalFilename", PPS(ORG_NAME) "\0" + VALUE "InternalName", PPS(INTERNAL_NAME) "\0" + VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0" + ADDITIONAL_VERINFO1 + ADDITIONAL_VERINFO2 + ADDITIONAL_VERINFO3 + } + } + + BLOCK "VarFileInfo" + { + VALUE "Translation", 0x0409, 1252 + } + } diff --git a/np_sdk/Module_np_sdk.mk b/np_sdk/Module_np_sdk.mk index 63393d5fd26b..6a60e3f8c5f7 100644 --- a/np_sdk/Module_np_sdk.mk +++ b/np_sdk/Module_np_sdk.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Module_Module,np_sdk)) -ifeq ($(WITH_MOZILLA),YES) +ifneq (,$(filter YES,$(ENABLE_NSPLUGIN) $(WITH_MOZILLA))) $(eval $(call gb_Module_add_targets,np_sdk,\ Package_inc \ |