[Libreoffice-commits] .: 3 commits - basctl/source crashrep/source desktop/util desktop/win32 desktop/WinResTarget_sbase.mk desktop/WinResTarget_scalc.mk desktop/WinResTarget_sdraw.mk desktop/WinResTarget_simpress.mk desktop/WinResTarget_smath.mk desktop/WinResTarget_soffice.mk desktop/WinResTarget_sweb.mk desktop/WinResTarget_swriter.mk instsetoo_native/util solenv/bin solenv/inc solenv/makefile.mk solenv/prj
Andras Timar
timar at kemper.freedesktop.org
Sat Dec 10 13:25:43 PST 2011
basctl/source/basicide/bastypes.cxx | 2
crashrep/source/win32/rcheader.txt | 8
desktop/WinResTarget_sbase.mk | 1
desktop/WinResTarget_scalc.mk | 1
desktop/WinResTarget_sdraw.mk | 2
desktop/WinResTarget_simpress.mk | 1
desktop/WinResTarget_smath.mk | 1
desktop/WinResTarget_soffice.mk | 1
desktop/WinResTarget_sweb.mk | 1
desktop/WinResTarget_swriter.mk | 1
desktop/util/officeloader.rc | 11 -
desktop/win32/source/applauncher/launcher.rc | 7
instsetoo_native/util/openoffice.lst | 10 -
solenv/bin/modules/installer/windows/msiglobal.pm | 20 --
solenv/inc/_tg_shl.mk | 10 +
solenv/inc/minor.mk | 6
solenv/inc/shlinfo.rc | 13 -
solenv/inc/tg_shl.mk | 1
solenv/inc/tg_wntx64.mk | 2
solenv/inc/verinfo.hrc | 201 ----------------------
solenv/inc/version.hrc | 34 ---
solenv/inc/version.lst | 34 ---
solenv/makefile.mk | 13 -
solenv/prj/d.lst | 1
24 files changed, 67 insertions(+), 315 deletions(-)
New commits:
commit 6a43a6c1fe56e5b63e5f330f87feada6479f8119
Author: Andras Timar <atimar at suse.com>
Date: Sat Dec 10 22:10:35 2011 +0100
use PACKAGEVERSION as the base of MSI ProductVersion
Formerly PRODUCTVERSION was used but that did not contain
the microversion digit. It is better to have it in MSI
ProductVersion, because a higher build number of a lower
microversion looked newer from the MSI point of view, and
update failed.
MSI ProductVersion is now major.minor.micro.build, e.g.
3.6.1.1206 (build number is taken from minor.mk)
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index a90698a..43e6ee3 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1805,27 +1805,11 @@ sub set_msiproductversion
{
my ( $allvariables ) = @_;
- my $productversion = $allvariables->{'PRODUCTVERSION'};
-
- if (( $productversion =~ /^\s*\d+\s*$/ ) && ( $productversion > 255 )) { $productversion = $productversion%256; }
+ my $productversion = $allvariables->{'PACKAGEVERSION'};
if ( $productversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
{
- $productversion = $1 . "\." . $2 . $3 . "\." . $installer::globals::buildid;
- }
- elsif ( $productversion =~ /^\s*(\d+)\.(\d+)\s*$/ )
- {
- $productversion = $1 . "\." . $2 . "\." . $installer::globals::buildid;
- }
- else
- {
- my $productminor = "00";
- if (( $allvariables->{'PACKAGEVERSION'} ) && ( $allvariables->{'PACKAGEVERSION'} ne "" ))
- {
- if ( $allvariables->{'PACKAGEVERSION'} =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ ) { $productminor = $2; }
- }
-
- $productversion = $productversion . "\." . $productminor . "\." . $installer::globals::buildid;
+ $productversion = $1 . "\." . $2 . "\." . $3 . "\." . $installer::globals::buildid;
}
$installer::globals::msiproductversion = $productversion;
commit 3fbedc3e8f65c91999dcee42daa8312e387dcf40
Author: Andras Timar <atimar at suse.com>
Date: Sat Dec 10 16:47:02 2011 +0100
enhance VersionInfo resource of Windows excutables
+ added ProductName (a required parameter), It is LibreOffice
+ CompanyName is configurable, it is $(OOO_VENDOR), that is set
--with-vendor configure switch. If not set, then CompanyName is
empty string which is fine, too.
+ Binary file version and FileVersion string show the same value,
and version number is sane: main version + subversion + microversion
+ build number, such as 3.5.0.0
+ LegalCopyright text is the same as in the About box, year range
can be set in minor.mk
- removed archaic and overcomplicated version number calculating macros
- removed version.lst, copied relevant content to minor.mk
- removed binary RCDATA resources, I don't think they were of any use
diff --git a/crashrep/source/win32/rcheader.txt b/crashrep/source/win32/rcheader.txt
index 0bf2cd4..02241d5 100755
--- a/crashrep/source/win32/rcheader.txt
+++ b/crashrep/source/win32/rcheader.txt
@@ -37,8 +37,6 @@
#define IDC_STATIC (-1)
#endif
-#define VER_FIRSTYEAR 2003
-
#include "version.hrc"
#ifdef FONTSIZE
@@ -54,8 +52,8 @@
// -----------------------------------------------------------------------
VS_VERSION_INFO versioninfo
- fileversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
- productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+ fileversion VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ productversion VERSION, SUBVERSION, MICROVERSION, VERVARIANT
fileflagsmask 0x3F
fileflags
#if defined(DEBUG)
@@ -88,5 +86,3 @@ VS_VERSION_INFO versioninfo
value "Translation", 0x0409, 1252
}
}
-
-
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index 8472601..f3f33f1 100644
--- a/desktop/WinResTarget_sbase.mk
+++ b/desktop/WinResTarget_sbase.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,sbase/src,\
-DRES_APP_NAME=sbase \
-DRES_APP_ICON=icons/base_app.ico \
-DVERVARIANT=$(BUILD) \
+ -DRES_APP_VENDOR="$(OOO_VENDOR)" \
))
$(eval $(call gb_WinResTarget_add_dependency,sbase/src,\
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index 8470b2d..3b9fc0e 100644
--- a/desktop/WinResTarget_scalc.mk
+++ b/desktop/WinResTarget_scalc.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,scalc/src,\
-DRES_APP_NAME=scalc \
-DRES_APP_ICON=icons/calc_app.ico \
-DVERVARIANT=$(BUILD) \
+ -DRES_APP_VENDOR="$(OOO_VENDOR)" \
))
$(eval $(call gb_WinResTarget_add_dependency,scalc/src,\
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
index e208b32..9bda5ce 100644
--- a/desktop/WinResTarget_sdraw.mk
+++ b/desktop/WinResTarget_sdraw.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,sdraw/src,\
-DRES_APP_NAME=sdraw \
-DRES_APP_ICON=icons/draw_app.ico \
-DVERVARIANT=$(BUILD) \
+ -DRES_APP_VENDOR="$(OOO_VENDOR)" \
))
$(eval $(call gb_WinResTarget_add_dependency,sdraw/src,\
@@ -46,3 +47,4 @@ $(eval $(call gb_WinResTarget_add_dependency,sdraw/src,\
$(eval $(call gb_WinResTarget_add_file,sdraw/src,desktop/win32/source/applauncher/launcher))
# vim: set ts=4 sw=4 et:
+
diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk
index 7d4778f..79aa10c 100644
--- a/desktop/WinResTarget_simpress.mk
+++ b/desktop/WinResTarget_simpress.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,simpress/src,\
-DRES_APP_NAME=simpress \
-DRES_APP_ICON=icons/impress_app.ico \
-DVERVARIANT=$(BUILD) \
+ -DRES_APP_VENDOR="$(OOO_VENDOR)" \
))
$(eval $(call gb_WinResTarget_add_dependency,simpress/src,\
diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk
index f00da3a..9dbbcd0 100644
--- a/desktop/WinResTarget_smath.mk
+++ b/desktop/WinResTarget_smath.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,smath/src,\
-DRES_APP_NAME=smath \
-DRES_APP_ICON=icons/math_app.ico \
-DVERVARIANT=$(BUILD) \
+ -DRES_APP_VENDOR="$(OOO_VENDOR)" \
))
$(eval $(call gb_WinResTarget_add_dependency,smath/src,\
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index aa404c3..b133335 100644
--- a/desktop/WinResTarget_soffice.mk
+++ b/desktop/WinResTarget_soffice.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,soffice/src,\
-DRES_APP_NAME=soffice \
-DRES_APP_ICON=icons/main_app.ico \
-DVERVARIANT=$(BUILD) \
+ -DRES_APP_VENDOR="$(OOO_VENDOR)" \
))
$(eval $(call gb_WinResTarget_add_dependency,soffice/src,\
diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk
index 0c5cafd..0ae85d9 100644
--- a/desktop/WinResTarget_sweb.mk
+++ b/desktop/WinResTarget_sweb.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,sweb/src,\
-DRES_APP_NAME=sweb \
-DRES_APP_ICON=icons/writer_app.ico \
-DVERVARIANT=$(BUILD) \
+ -DRES_APP_VENDOR="$(OOO_VENDOR)" \
))
$(eval $(call gb_WinResTarget_add_dependency,sweb/src,\
diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk
index 59561f6..7b9ff2f 100644
--- a/desktop/WinResTarget_swriter.mk
+++ b/desktop/WinResTarget_swriter.mk
@@ -37,6 +37,7 @@ $(eval $(call gb_WinResTarget_set_defs,swriter/src,\
-DRES_APP_NAME=swriter \
-DRES_APP_ICON=icons/writer_app.ico \
-DVERVARIANT=$(BUILD) \
+ -DRES_APP_VENDOR="$(OOO_VENDOR)" \
))
$(eval $(call gb_WinResTarget_add_dependency,swriter/src,\
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index f968f8a..b6e2687 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -35,8 +35,8 @@
// -----------------------------------------------------------------------
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
- PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+ FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
FILEFLAGSMASK 0x3F
FILEFLAGS
#if defined(DEBUG)
@@ -54,12 +54,13 @@ VS_VERSION_INFO VERSIONINFO
BLOCK "040904E4"
{
// International StringTable
- VALUE "CompanyName", "The Document Foundation\0"
+ VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
VALUE "FileVersion", PPS(VER_LEVEL) "\0"
VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
- VALUE "OriginalFilename", "SOFFICE.EXE\0"
- VALUE "InternalName", "SOFFICE\0"
+ VALUE "ProductName", "LibreOffice\0"
+ VALUE "OriginalFilename", PPS(RES_APP_NAME) ".exe\0"
+ VALUE "InternalName", PPS(RES_APP_NAME) "\0"
VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
}
}
diff --git a/desktop/win32/source/applauncher/launcher.rc b/desktop/win32/source/applauncher/launcher.rc
index e871534..b7c84b1 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -35,8 +35,8 @@
// -----------------------------------------------------------------------
VS_VERSION_INFO VERSIONINFO
- FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
- PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+ FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
FILEFLAGSMASK 0x3F
FILEFLAGS
#if defined(DEBUG)
@@ -54,10 +54,11 @@ VS_VERSION_INFO VERSIONINFO
BLOCK "040904E4"
{
// International StringTable
- VALUE "CompanyName", "The Document Foundation\0"
+ VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\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"
VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index a562e45..259ec8d 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -62,7 +62,7 @@ LibreOffice
BASEPRODUCTVERSION 3.6
PCPFILENAME libreoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
@@ -126,7 +126,7 @@ LibreOffice_Dev
REGISTRYLAYERNAME LayerDev
SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
UPDATEURL http://update.libreoffice.org/check.php
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
ADDSYSTEMINTEGRATION 1
EVAL
FILEFORMATNAME OpenOffice.org
@@ -193,7 +193,7 @@ URE
STARTCENTER_INFO_URL http://www.libreoffice.org/
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
STARTCENTER_LAYOUT_STYLE 0
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,version.lst
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk
PACKAGEMAP package_names_ext.txt
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
}
@@ -407,7 +407,7 @@ OxygenOffice
BASEPRODUCTVERSION 3.6
PCPFILENAME openoffice.pcp
UPDATEURL http://update.libreoffice.org/check.php
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
@@ -469,7 +469,7 @@ OxygenOffice_wJRE
ABOUTBOXPRODUCTVERSION 3.6.0
BASEPRODUCTVERSION 3.6
UPDATEURL http://update.libreoffice.org/check.php
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 8497d1f..91ac861 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -259,6 +259,7 @@ $(SHL1TARGETN) : \
.ENDIF # "$(SHL1ADD_VERINFO)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL1TARGET)$(DLLPOST) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
@@ -749,6 +750,7 @@ $(SHL2TARGETN) : \
.ENDIF # "$(SHL2ADD_VERINFO)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL2TARGET)$(DLLPOST) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
@@ -1239,6 +1241,7 @@ $(SHL3TARGETN) : \
.ENDIF # "$(SHL3ADD_VERINFO)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL3TARGET)$(DLLPOST) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
@@ -1729,6 +1732,7 @@ $(SHL4TARGETN) : \
.ENDIF # "$(SHL4ADD_VERINFO)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL4TARGET)$(DLLPOST) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
@@ -2219,6 +2223,7 @@ $(SHL5TARGETN) : \
.ENDIF # "$(SHL5ADD_VERINFO)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL5TARGET)$(DLLPOST) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
@@ -2709,6 +2714,7 @@ $(SHL6TARGETN) : \
.ENDIF # "$(SHL6ADD_VERINFO)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL6TARGET)$(DLLPOST) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
@@ -3199,6 +3205,7 @@ $(SHL7TARGETN) : \
.ENDIF # "$(SHL7ADD_VERINFO)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL7TARGET)$(DLLPOST) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
@@ -3689,6 +3696,7 @@ $(SHL8TARGETN) : \
.ENDIF # "$(SHL8ADD_VERINFO)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL8TARGET)$(DLLPOST) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
@@ -4179,6 +4187,7 @@ $(SHL9TARGETN) : \
.ENDIF # "$(SHL9ADD_VERINFO)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL9TARGET)$(DLLPOST) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
@@ -4669,6 +4678,7 @@ $(SHL10TARGETN) : \
.ENDIF # "$(SHL10ADD_VERINFO)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL10TARGET)$(DLLPOST) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 2a98e4c..db639a4 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -3,3 +3,9 @@ RSCREVISION=360m1(Build:0)
BUILD=0
LAST_MINOR=m1
SOURCEVERSION=OOO360
+
+VERSIONMAJOR=3
+VERSIONMINOR=6
+VERSIONMICRO=0
+
+COPYRIGHTYEARRANGE=2000-2011
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index 1c50943..2b1398d 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -35,13 +35,8 @@
// -----------------------------------------------------------------------
VS_VERSION_INFO VERSIONINFO
-#ifndef SUBVERSION
- FILEVERSION VERSION, 0, VERVARIANT, VER_COUNT
- PRODUCTVERSION VERSION, 0, VERVARIANT, VER_COUNT
-#else
- FILEVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
- PRODUCTVERSION VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-#endif
+ FILEVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
+ PRODUCTVERSION VERSION, SUBVERSION, MICROVERSION, VERVARIANT
FILEFLAGSMASK 0x3F
FILEFLAGS
#if defined(DEBUG)
@@ -59,7 +54,9 @@ VS_VERSION_INFO VERSIONINFO
BLOCK "040904E4"
{
// International StringTable
- VALUE "CompanyName", "The Document Foundation\0"
+ 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"
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 0c2882c..f28f55a 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -288,6 +288,7 @@ $(SHL$(TNR)TARGETN) : \
.ENDIF # "$(SHL$(TNR)ADD_VERINFO)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL$(TNR)TARGET)$(DLLPOST) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
.ENDIF # "$(use_shl_versions)" != ""
diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk
index 05a3155..66d28e9 100644
--- a/solenv/inc/tg_wntx64.mk
+++ b/solenv/inc/tg_wntx64.mk
@@ -251,6 +251,7 @@ $(SHL1TARGETN_X64) : \
@echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
.ENDIF # "$(SHL1ADD_VERINFO_X64)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL1TARGET_X64)$(DLLPOST) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
@@ -395,6 +396,7 @@ $(SHL2TARGETN_X64) : \
@echo $(EMQ)#define ADDITIONAL_VERINFO3 >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
.ENDIF # "$(SHL1ADD_VERINFO_X64)"!=""
@echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
+ @echo $(EMQ)#define RES_APP_VENDOR $(OOO_VENDOR) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
@echo $(EMQ)#define ORG_NAME $(SHL2TARGET_X64)$(DLLPOST) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
@echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
@echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
diff --git a/solenv/inc/verinfo.hrc b/solenv/inc/verinfo.hrc
deleted file mode 100644
index 66f0ec6..0000000
--- a/solenv/inc/verinfo.hrc
+++ /dev/null
@@ -1,201 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _VERINFO_HRC
-#define _VERINFO_HRC
-
-// include ---------------------------------------------------------------
-
-#ifndef WIN32
-#include <ver.h>
-#else
-#include <winver.h>
-#endif
-
-// general preprocessor string management --------------------------------
-
-#ifndef PPSX
-#define PPSX(s) #s
-#endif
-#ifndef PPS
-#define PPS(s) PPSX(s)
-#endif
-
-#ifndef PPCX
-#define PPCX(s1, s2) s1##s2
-#endif
-#ifndef PPCAT
-#define PPCAT(s1, s2) PPCX(s1, s2)
-#endif
-
-// define order of date parts --------------------------------------------
-
-#define VER_YMD
-
-// set VERVARIANT to 0 if not defined ------------------------------------
-
-#if !defined(VERVARIANT)
- #define VERVARIANT 0
-#endif
-
-// define pre release state ----------------------------------------------
-
-#ifdef VER_CONCEPT
- #define VER_PREL 1
- #define VER_COUNT (0+VER_CONCEPT)
- #define VER1 Concept (Level VER_CONCEPT)
-#endif
-
-#ifdef VER_ALPHA
- #define VER_PREL 1
- #define VER_COUNT (100+VER_ALPHA)
- #define VER1 Alpha (Level VER_ALPHA)
-#endif
-
-#ifdef VER_BETA
- #define VER_PREL 1
- #define VER_COUNT (200+VER_BETA)
- #define VER1 Beta (Level VER_BETA)
-#endif
-
-#ifdef VER_GAMMA
- #define VER_PREL 1
- #define VER_COUNT (300+VER_GAMMA)
- #define VER1 Gamma (Level VER_GAMMA)
-#endif
-
-#ifdef VER_FINAL
- #define VER_COUNT (500+VER_FINAL)
- #if VER_FINAL==0
- #undef VER1
- #elif VER_FINAL==1
- #define VER1 1
- #elif VER_FINAL==2
- #define VER1 2
- #elif VER_FINAL==3
- #define VER1 3
- #elif VER_FINAL==4
- #define VER1 4
- #elif VER_FINAL==5
- #define VER1 5
- #elif VER_FINAL==6
- #define VER1 6
- #elif VER_FINAL==7
- #define VER1 7
- #elif VER_FINAL==8
- #define VER1 8
- #elif VER_FINAL==9
- #define VER1 9
- #elif VER_FINAL==10
- #define VER1 a
- #elif VER_FINAL==11
- #define VER1 b
- #elif VER_FINAL==12
- #define VER1 c
- #endif
-#endif
-
-#ifdef SUBVERSION
-#if SUBVERSION < 10
- #define VER4 PPCAT(0, SUBVERSION)
-#else
- #define VER4 SUBVERSION
-#endif
-#else
- #define VER4 0.0
-#endif
-
-#ifndef VER1
-#if VERVARIANT > 0
- #define VER_LEVEL VERSION.VER4.VERVARIANT
-#else
- #define VER_LEVEL VERSION.VER4
-#endif
-#else
- #define VERC1(a, b, c) a.b##c
- #define VERC2(a, b, c) VERC1(a, b, c)
- #define VER_LEVEL VERC2(VERSION, VER4, VER1)
-#endif
-
-#if !defined(VER_DMY) && VER_DAY < 10
- #define VER5 PPCAT(0, VER_DAY)
-#else
- #define VER5 VER_DAY
-#endif
-
-// define month strings --------------------------------------------------
-
-#if VER_MONTH==1
- #define VER2 Jan
-#elif VER_MONTH==2
- #define VER2 Feb
-#elif VER_MONTH==3
- #define VER2 Mar
-#elif VER_MONTH==4
- #define VER2 Apr
-#elif VER_MONTH==5
- #define VER2 May
-#elif VER_MONTH==6
- #define VER2 Jun
-#elif VER_MONTH==7
- #define VER2 Jul
-#elif VER_MONTH==8
- #define VER2 Aug
-#elif VER_MONTH==9
- #define VER2 Sep
-#elif VER_MONTH==10
- #define VER2 Oct
-#elif VER_MONTH==11
- #define VER2 Nov
-#elif VER_MONTH==12
- #define VER2 Dec
-#endif
-
-#define VERC3(a, b, c) c-b-a
-#define VERC4(a, b, c) VERC3(a, b, c)
-#define VER_DATE VERC4(VER5, VER2, VER_YEAR)
-
-#if PPCAT(1, VER_FIRSTYEAR)==PPCAT(1, VER_YEAR)
- #define VER_YEARRANGE VER_FIRSTYEAR
-#else
- #define VER_YEARRANGE VER_FIRSTYEAR-VER_YEAR
-#endif
-
-#if VER_FIRSTYEAR > 100
-#define VERC5(a) Copyright \251 a by
-#define VERC6(a) VERC5(a)
-#else
-#define VERC5(a) Copyright \251 20##a by
-#define VERC6(a) VERC5(a)
-#endif
-
-#define S_CRIGHT PPS(VERC6(VER_YEARRANGE))
-
-#define S_VERSION PPS(Version VER_LEVEL of VER_DATE)
-
-#endif // _VERINFO_HRC
-
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 41afa55..8829218 100644
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -26,33 +26,17 @@
*************************************************************************/
#include "versionlist.hrc"
+#include <winver.h>
-//#define VERVARIANT 0 // never define this one, will be provided by build environment (BUILD_ID)
-
-#define VER_FINAL 0
-
-#ifndef VER_FIRSTYEAR
-#define VER_FIRSTYEAR VER_YEAR
+#ifndef PPSX
+#define PPSX(s) #s
+#endif
+#ifndef PPS
+#define PPS(s) PPSX(s)
#endif
-#include "verinfo.hrc"
-
-// -----------------------------------------------------------------------
-// language/character set specification table
-// -----------------------------------------------------------------------
-
-RCD_LANGUAGE rcdata
-{
- "040904B0", // USA -> Unicode
- "040904E4", // USA -> Windows, Multilingual
- "04090000", // USA -> 7-Bit-ASCII
- 0 // end of table
-}
+#define VER_LEVEL VERSION.SUBVERSION.MICROVERSION.VERVARIANT
+#define VERC(a) Copyright \251 a by
-// version binary entry
-VS_VERSION_INFO rcdata
-{
- 0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
- VERSION, SUBVERSION, VERVARIANT, VER_COUNT
-}
+#define S_CRIGHT PPS(VERC(VER_YEARRANGE))
diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
deleted file mode 100644
index aed0b5a..0000000
--- a/solenv/inc/version.lst
+++ /dev/null
@@ -1,34 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-OOOBASEVERSIONMAJOR=3
-OOOBASEVERSIONMINOR=5
-OOOBASEVERSIONMICRO=0
-
-OOOBASEVERSIONDAY=21
-OOOBASEVERSIONMONTH=9
-OOOBASEVERSIONYEAR=2011
diff --git a/solenv/makefile.mk b/solenv/makefile.mk
index 54d67db..4d80605 100755
--- a/solenv/makefile.mk
+++ b/solenv/makefile.mk
@@ -32,14 +32,11 @@ TARGET=init
# --- Settings ----------------------------------
.INCLUDE : settings.mk
.INCLUDE : target.mk
-.INCLUDE : version.lst
ALLTAR : $(INCCOM)/versionlist.hrc
-$(INCCOM)/versionlist.hrc : ./inc/version.lst
- $(COMMAND_ECHO)echo "#define VERSION $(OOOBASEVERSIONMAJOR)" > $@
- $(COMMAND_ECHO)echo "#define SUBVERSION $(OOOBASEVERSIONMINOR)" >> $@
- $(COMMAND_ECHO)echo "#define MICROVERSION $(OOOBASEVERSIONMICRO)" >> $@
- $(COMMAND_ECHO)echo "#define VER_DAY $(OOOBASEVERSIONDAY)" >> $@
- $(COMMAND_ECHO)echo "#define VER_MONTH $(OOOBASEVERSIONMONTH)" >> $@
- $(COMMAND_ECHO)echo "#define VER_YEAR $(OOOBASEVERSIONYEAR)" >> $@
+$(INCCOM)/versionlist.hrc : ./inc/minor.mk
+ $(COMMAND_ECHO)echo "#define VERSION $(VERSIONMAJOR)" > $@
+ $(COMMAND_ECHO)echo "#define SUBVERSION $(VERSIONMINOR)" >> $@
+ $(COMMAND_ECHO)echo "#define MICROVERSION $(VERSIONMICRO)" >> $@
+ $(COMMAND_ECHO)echo "#define VER_YEARRANGE $(COPYRIGHTYEARRANGE)" >> $@
diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst
index 1773c48..14b66d1 100755
--- a/solenv/prj/d.lst
+++ b/solenv/prj/d.lst
@@ -1,6 +1,5 @@
mkdir: %_DEST%\bin
mkdir: %_DEST%\inc
mkdir: %_DEST%\lib
-..\inc\version.lst %_DEST%\bin\version.lst
..\%__SRC%\inc\versionlist.hrc %_DEST%\inc\versionlist.hrc
..\%__SRC%\misc\*-gdb.py %_DEST%\lib\*-gdb.py
commit 8d0816f1cfc3929f261baa0840b9d16ed1b86576
Author: Andras Timar <atimar at suse.com>
Date: Sat Dec 10 16:22:26 2011 +0100
fix build with MSVC
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index c23b22f..f1987d1 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -756,7 +756,7 @@ bool QueryDel( const ::rtl::OUString& rName, const ResId& rId, Window* pParent )
::rtl::OUString aQuery( ResId::toString(rId) );
::rtl::OUStringBuffer aNameBuf( rName );
aNameBuf.append('\'');
- aNameBuf.insert(0, '\'');
+ aNameBuf.insert(sal_Int32(0), sal_Unicode('\''));
aQuery = ::comphelper::string::replace(aQuery, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "XX")), aNameBuf.makeStringAndClear());
QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_YES, aQuery );
return ( aQueryBox.Execute() == RET_YES );
More information about the Libreoffice-commits
mailing list