summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-02-28 13:17:39 +0100
committerFridrich Strba <fridrich@documentfoundation.org>2013-03-07 08:33:08 +0000
commitf43decde34577c8340a1abdcdad9a12e8b043068 (patch)
treea42d308ce89691cda7323c068ea0c5fcfe0ba72c /scp2
parent104947d1825b99503d5df59dfd85ad6e603e1407 (diff)
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@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/base/file_base.scp5
-rw-r--r--scp2/source/calc/file_calc.scp5
-rw-r--r--scp2/source/crashrep/file_crashrep.scp5
-rw-r--r--scp2/source/draw/file_draw.scp5
-rw-r--r--scp2/source/impress/file_impress.scp5
-rw-r--r--scp2/source/math/file_math.scp5
-rw-r--r--scp2/source/ooo/common_brand.scp8
-rw-r--r--scp2/source/writer/file_writer.scp8
8 files changed, 1 insertions, 45 deletions
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 59b0f74d3be5..f684e1d5319c 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 c9fdf18e6b4f..428d16174cc4 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 481d9fcbb119..81c9c497d2ab 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 9a388bc3874f..100846272efc 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 21deb8e486d8..516e1d2a1930 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 f3bbd32ea452..d887fb18c41f 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 58921c3d75c5..458ac691b1ce 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 3c831d85c2b1..d57bedf92a05 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