[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 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_sofficebin.mk desktop/WinResTarget_soffice.mk desktop/WinResTarget_sweb.mk desktop/WinResTarget_swriter.mk scp2/source
Andras Timar
atimar at suse.com
Thu Mar 7 00:33:29 PST 2013
crashrep/source/win32/rcheader.txt | 15 ++++++++-------
desktop/WinResTarget_sbase.mk | 1 +
desktop/WinResTarget_scalc.mk | 1 +
desktop/WinResTarget_sdraw.mk | 1 +
desktop/WinResTarget_simpress.mk | 1 +
desktop/WinResTarget_smath.mk | 1 +
desktop/WinResTarget_soffice.mk | 1 +
desktop/WinResTarget_sofficebin.mk | 1 +
desktop/WinResTarget_sweb.mk | 1 +
desktop/WinResTarget_swriter.mk | 1 +
desktop/util/officeloader.rc | 2 +-
desktop/win32/source/applauncher/launcher.rc | 2 +-
scp2/source/base/file_base.scp | 5 -----
scp2/source/calc/file_calc.scp | 5 -----
scp2/source/crashrep/file_crashrep.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/common_brand.scp | 8 --------
scp2/source/writer/file_writer.scp | 8 +-------
20 files changed, 20 insertions(+), 54 deletions(-)
New commits:
commit f43decde34577c8340a1abdcdad9a12e8b043068
Author: Andras Timar <atimar at suse.com>
Date: Thu Feb 28 13:17:39 2013 +0100
bin PATCH_SO_NAME crack
In VersionInfo of Windows executables the FileDescription property originally contained
80 times 'x' character. These executables were marked as PATCH_SO_NAME and later the
installer maker perl program replaced the xxxxxxxxxxx to the actual file description
which was defined in scp2. WHy was it good, I have no idea. The problem was that it
happened after postprocess, where we signed the binaries, thus diigital signature became
corrupted. It is better to give file descriptions via makefiles.
Conflicts:
crashrep/WinResTarget_crashrep.mk
Oh, well, crashrep is a dmake module in 4.0. But it is not built, so patch has no
effect in practice.
Change-Id: Id5ad4470bb7a6313b33fbba09d72d9a009163a89
Reviewed-on: https://gerrit.libreoffice.org/2463
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
diff --git a/crashrep/source/win32/rcheader.txt b/crashrep/source/win32/rcheader.txt
index be3c060..bace84b 100644
--- a/crashrep/source/win32/rcheader.txt
+++ b/crashrep/source/win32/rcheader.txt
@@ -58,13 +58,14 @@ VS_VERSION_INFO versioninfo
block "040904E4"
{
// International StringTable
- value "CompanyName", "The Document Foundation\0"
- value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
- value "FileVersion", PPS(VER_LEVEL) "\0"
- value "ProductVersion", PPS(VER_LEVEL) "\0"
- value "OriginalFilename", "SOREPORT.EXE\0"
- value "InternalName", "CrashReport\0"
- value "LegalCopyright", S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
+ VALUE "CompanyName", PPS(RES_APP_VENDOR) "\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"
+ VALUE "LegalCopyright", S_CRIGHT " LibreOffice contributors and/or their affiliates. All rights reserved.\0"
}
}
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index 008e436..f4f49d4 100644
--- a/desktop/WinResTarget_sbase.mk
+++ b/desktop/WinResTarget_sbase.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,sbase/src,\
$(eval $(call gb_WinResTarget_add_defs,sbase/src,\
-DRES_APP_NAME=sbase \
+ -DRES_APP_FILEDESC="$(PRODUCTNAME) Base" \
-DRES_APP_ICON=icons/base_app.ico \
-DVERVARIANT=$(BUILD) \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index 89a2d2d..8781d0d 100644
--- a/desktop/WinResTarget_scalc.mk
+++ b/desktop/WinResTarget_scalc.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,scalc/src,\
$(eval $(call gb_WinResTarget_add_defs,scalc/src,\
-DRES_APP_NAME=scalc \
+ -DRES_APP_FILEDESC="$(PRODUCTNAME) Calc" \
-DRES_APP_ICON=icons/calc_app.ico \
-DVERVARIANT=$(BUILD) \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
index 44ef306..09a8bf2 100644
--- a/desktop/WinResTarget_sdraw.mk
+++ b/desktop/WinResTarget_sdraw.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,sdraw/src,\
$(eval $(call gb_WinResTarget_add_defs,sdraw/src,\
-DRES_APP_NAME=sdraw \
+ -DRES_APP_FILEDESC="$(PRODUCTNAME) Draw" \
-DRES_APP_ICON=icons/draw_app.ico \
-DVERVARIANT=$(BUILD) \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk
index 224af5b..eeb869f 100644
--- a/desktop/WinResTarget_simpress.mk
+++ b/desktop/WinResTarget_simpress.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,simpress/src,\
$(eval $(call gb_WinResTarget_add_defs,simpress/src,\
-DRES_APP_NAME=simpress \
+ -DRES_APP_FILEDESC="$(PRODUCTNAME) Impress" \
-DRES_APP_ICON=icons/impress_app.ico \
-DVERVARIANT=$(BUILD) \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk
index e36eba1..d90ad7d 100644
--- a/desktop/WinResTarget_smath.mk
+++ b/desktop/WinResTarget_smath.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,smath/src,\
$(eval $(call gb_WinResTarget_add_defs,smath/src,\
-DRES_APP_NAME=smath \
+ -DRES_APP_FILEDESC="$(PRODUCTNAME) Math" \
-DRES_APP_ICON=icons/math_app.ico \
-DVERVARIANT=$(BUILD) \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index 5dac62c..54395bc 100644
--- a/desktop/WinResTarget_soffice.mk
+++ b/desktop/WinResTarget_soffice.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,soffice/src,\
$(eval $(call gb_WinResTarget_add_defs,soffice/src,\
-DRES_APP_NAME=soffice \
+ -DRES_APP_FILEDESC="$(PRODUCTNAME)" \
-DRES_APP_ICON=icons/main_app.ico \
-DVERVARIANT=$(BUILD) \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk
index 54f289b..98580fb 100644
--- a/desktop/WinResTarget_sofficebin.mk
+++ b/desktop/WinResTarget_sofficebin.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,sofficebin/src,\
$(eval $(call gb_WinResTarget_add_defs,sofficebin/src,\
-DRES_APP_NAME=soffice \
+ -DRES_APP_FILEDESC="$(PRODUCTNAME)" \
-DRES_APP_ICON=icons/main_app.ico \
-DVERVARIANT=$(BUILD) \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk
index 36ba618..845879f 100644
--- a/desktop/WinResTarget_sweb.mk
+++ b/desktop/WinResTarget_sweb.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,sweb/src,\
$(eval $(call gb_WinResTarget_add_defs,sweb/src,\
-DRES_APP_NAME=sweb \
+ -DRES_APP_FILEDESC="$(PRODUCTNAME) Writer (Web)" \
-DRES_APP_ICON=icons/writer_app.ico \
-DVERVARIANT=$(BUILD) \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk
index fc68b9c..92f16e9 100644
--- a/desktop/WinResTarget_swriter.mk
+++ b/desktop/WinResTarget_swriter.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_set_include,swriter/src,\
$(eval $(call gb_WinResTarget_add_defs,swriter/src,\
-DRES_APP_NAME=swriter \
+ -DRES_APP_FILEDESC="$(PRODUCTNAME) Writer" \
-DRES_APP_ICON=icons/writer_app.ico \
-DVERVARIANT=$(BUILD) \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
diff --git a/desktop/util/officeloader.rc b/desktop/util/officeloader.rc
index bc19b69..df747b6 100644
--- a/desktop/util/officeloader.rc
+++ b/desktop/util/officeloader.rc
@@ -44,7 +44,7 @@ VS_VERSION_INFO VERSIONINFO
{
// International StringTable
VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
- VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
+ VALUE "FileDescription", PPS(RES_APP_FILEDESC) "\0"
VALUE "FileVersion", PPS(VER_LEVEL) "\0"
VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
VALUE "ProductName", "LibreOffice\0"
diff --git a/desktop/win32/source/applauncher/launcher.rc b/desktop/win32/source/applauncher/launcher.rc
index a391cd1..d2ad4ee 100644
--- a/desktop/win32/source/applauncher/launcher.rc
+++ b/desktop/win32/source/applauncher/launcher.rc
@@ -44,7 +44,7 @@ VS_VERSION_INFO VERSIONINFO
{
// International StringTable
VALUE "CompanyName", PPS(RES_APP_VENDOR) "\0"
- VALUE "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
+ VALUE "FileDescription", PPS(RES_APP_FILEDESC) "\0"
VALUE "FileVersion", PPS(VER_LEVEL) "\0"
VALUE "ProductVersion", PPS(VER_LEVEL) "\0"
VALUE "ProductName", "LibreOffice\0"
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 59b0f74..f684e1d 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -31,12 +31,7 @@ File gid_File_Exe_Sbase
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = EXENAME(sbase);
- #ifdef WNT
- FileDescription = "%PRODUCTNAME Base";
- Styles = (PACKED, PATCH_SO_NAME);
- #else
Styles = (PACKED);
- #endif
End
#if defined WNT
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index c9fdf18..428d161 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -91,10 +91,5 @@ File gid_File_Exe_Scalc
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = EXENAME(scalc);
- #ifdef WNT
- FileDescription = "%PRODUCTNAME Calc";
- Styles = (PACKED, PATCH_SO_NAME);
- #else
Styles = (PACKED);
- #endif
End
diff --git a/scp2/source/crashrep/file_crashrep.scp b/scp2/source/crashrep/file_crashrep.scp
index 481d9fc..81c9c49 100644
--- a/scp2/source/crashrep/file_crashrep.scp
+++ b/scp2/source/crashrep/file_crashrep.scp
@@ -33,12 +33,7 @@ File gid_Brand_File_Bin_Crashreport
BIN_FILE_BODY;
Name = EXENAME(crashrep);
Dir = gid_Brand_Dir_Program;
- #ifdef WNT
- FileDescription = "%PRODUCTNAME Crashreporter";
- Styles = (PACKED, PATCH_SO_NAME);
- #else
Styles = (PACKED);
- #endif
End
#ifdef WNT
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 9a388bc..1008462 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -47,12 +47,7 @@ File gid_File_Exe_Sdraw
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = EXENAME(sdraw);
- #ifdef WNT
- FileDescription = "%PRODUCTNAME Draw";
- Styles = (PACKED, PATCH_SO_NAME);
- #else
Styles = (PACKED);
- #endif
End
// new user interface configuration files
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 21deb8e..516e1d2 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -68,12 +68,7 @@ File gid_File_Exe_Simpress
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = EXENAME(simpress);
- #ifdef WNT
- FileDescription = "%PRODUCTNAME Impress";
- Styles = (PACKED, PATCH_SO_NAME);
- #else
Styles = (PACKED);
- #endif
End
// new user interface configuration files
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index f3bbd32..d887fb1 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -63,12 +63,7 @@ File gid_File_Exe_Smath
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = EXENAME(smath);
- #ifdef WNT
- FileDescription = "%PRODUCTNAME Math";
- Styles = (PACKED, PATCH_SO_NAME);
- #else
Styles = (PACKED);
- #endif
End
// new user interface configuration files
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 58921c3..458ac69 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -501,11 +501,7 @@ File gid_Brand_File_Bin_Soffice
Styles = (PACKED, SUBST_FILENAME);
#else
Name = EXENAME(soffice);
- #ifdef WNT
- Styles = (PACKED, PATCH_SO_NAME);
- #else
Styles = (PACKED);
- #endif
#endif
End
@@ -521,11 +517,7 @@ End
File gid_Brand_File_Bin_Soffice_Bin
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
-#if defined WNT
- Styles = (PACKED, PATCH_SO_NAME);
-#else
Styles = (PACKED);
-#endif
Name = "soffice.bin";
End
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index 3c831d8..d57bedf 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -35,12 +35,7 @@ File gid_File_Exe_Swriter
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = EXENAME(swriter);
- #ifdef WNT
- FileDescription = "%PRODUCTNAME Writer";
- Styles = (PACKED, PATCH_SO_NAME);
- #else
Styles = (PACKED);
- #endif
End
#ifdef WNT
@@ -48,8 +43,7 @@ File gid_File_Exe_Sweb
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
Name = EXENAME(sweb);
- FileDescription = "%PRODUCTNAME Writer(Web)";
- Styles = (PACKED, PATCH_SO_NAME);
+ Styles = (PACKED);
End
#endif
More information about the Libreoffice-commits
mailing list