config_host.mk.in | 3 +++
configure.ac | 16 ++++++++++++++++
desktop/WinResTarget_sofficebin.mk | 15 +++++++++++++++
desktop/util/officeloader.rc | 10 +++++-----
desktop/win32/source/applauncher/launcher.rc | 10 +++++-----
5 files changed, 44 insertions(+), 10 deletions(-)
New commits:
commit 88faaf8242df33442c43b4c7057806c3f35d8cae
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
Date: Fri Nov 25 11:01:43 2016 +0100
Make Dragon support depend on explicit configure option
This reverts commit cf969dddfbbe082d727707a7979dcdb0c31d8ad5.
Change-Id: I43c6ffcc80138fa02821d5f5cd7466bd651f927f
diff --git a/config_host.mk.in b/config_host.mk.in
index 5e5851e..7751421 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -665,3 +665,6 @@ include $(BUILDDIR)/config_$(gb_Side)_lang.mk
# tarball names
# does use some of the variables defined above
include @SRC_ROOT@/download.lst
+
+# Custom stuff
+export WITH_DRAGON_SUPPORT=@WITH_DRAGON_SUPPORT@
diff --git a/configure.ac b/configure.ac
index c42327b..8f698d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2273,6 +2273,12 @@ AC_ARG_WITH(onedrive-client-secret,
authentication on OneDrive. If either this or
--with-onedrive-client-id is empty, the feature will be disabled]),
)
+
+AC_ARG_WITH(dragon-support,
+ AS_HELP_STRING([--with-dragon-support],
+ [Fakes some process metadata to make Dragon NS believe we are
+ OpenOffice 4, not LibreOffice]),
+)
dnl ===================================================================
dnl Do we want to use pre-build binary tarball for recompile
dnl ===================================================================
@@ -12356,6 +12362,16 @@ else
fi
AC_SUBST(WITH_LOCALES)
+AC_MSG_CHECKING([whether to enable Dragon NS support])
+WITH_DRAGON_SUPPORT=
+if test -n "$with_dragon_support"; then
+ WITH_DRAGON_SUPPORT="TRUE"
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+AC_SUBST(WITH_DRAGON_SUPPORT)
+
dnl git submodule update --reference
dnl ===================================================================
if test -n "${GIT_REFERENCE_SRC}"; then
diff --git a/desktop/WinResTarget_sofficebin.mk
b/desktop/WinResTarget_sofficebin.mk
index e10c259..2e1c48f 100644
--- a/desktop/WinResTarget_sofficebin.mk
+++ b/desktop/WinResTarget_sofficebin.mk
@@ -14,6 +14,20 @@ $(eval $(call
gb_WinResTarget_set_include,sofficebin/officeloader,\
-I$(SRCDIR)/sysui/desktop \
))
+ifneq ($(WITH_DRAGON_SUPPORT),)
+$(eval $(call gb_WinResTarget_add_defs,sofficebin/officeloader,\
+ -DRES_APP_NAME=soffice \
+ -DRES_APP_FILEDESC="OpenOffice 4.1.1" \
+ -DVER_LEVEL="4.00.9774" \
+ -DVERSION="4" \
+ -DSUBVERSION="0" \
+ -DMICROVERSION="9774" \
+ -DVERVARIANT="500" \
+ -DRES_APP_ICON=icons/soffice.ico \
+ -DVERVARIANT=$(LIBO_VERSION_PATCH) \
+ -DRES_APP_VENDOR="$(OOO_VENDOR)" \
+))
+else
$(eval $(call gb_WinResTarget_add_defs,sofficebin/officeloader,\
-DRES_APP_NAME=soffice \
-DRES_APP_FILEDESC="$(PRODUCTNAME)" \
@@ -21,6 +35,7 @@ $(eval $(call
gb_WinResTarget_add_defs,sofficebin/officeloader,\
-DVERVARIANT=$(LIBO_VERSION_PATCH) \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
))
+endif
$(eval $(call gb_WinResTarget_add_dependencies,sofficebin/officeloader,\
sysui/desktop/icons/soffice.ico \
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index bfcd24e..a7d65d2 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -24,8 +24,8 @@
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,0,9774,500
- PRODUCTVERSION 4,0,9774,500
+ FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
FILEFLAGSMASK 0x3F
FILEFLAGS
#if defined(DEBUG)
@@ -44,9 +44,9 @@ VS_VERSION_INFO VERSIONINFO
{
// International StringTable
VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
- VALUE "FileDescription", "OpenOffice 4.1.1\0"
- VALUE "FileVersion", "4.00.9774\0"
- VALUE "ProductVersion", "4.00.9774\0"
+ VALUE "FileDescription", PPS(RES_APP_FILEDESC) "\0"
+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
VALUE "ProductName", "LibreOffice\0"
VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
VALUE "InternalName", PPS(RES_APP_NAME) "\0"
diff --git a/desktop/win32/source/applauncher/launcher.rc
b/desktop/win32/source/applauncher/launcher.rc
index 6210ab1..f717bcb 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -24,8 +24,8 @@
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,0,9774,500
- PRODUCTVERSION 4,0,9774,500
+ FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
FILEFLAGSMASK 0x3F
FILEFLAGS
#if defined(DEBUG)
@@ -44,9 +44,9 @@ VS_VERSION_INFO VERSIONINFO
{
// International StringTable
VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
- VALUE "FileDescription", "OpenOffice 4.1.1\0"
- VALUE "FileVersion", "4.00.9774\0"
- VALUE "ProductVersion", "4.00.9774\0"
+ VALUE "FileDescription", PPS(RES_APP_FILEDESC) "\0"
+ VALUE "FileVersion", PPS(VER_LEVEL) "\0"
+ VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
VALUE "ProductName", "LibreOffice\0"
VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
VALUE "InternalName", PPS(RES_APP_NAME) "\0"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
