From: Uwe Stöhr <uwestoehr@web.de>
Date: Sun, 20 May 2007 20:35:35 +0000 (+0000)
Subject: installer:
X-Git-Tag: 1.6.10~9682
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=99e966daa0ee083ff62ee69c237a714b9ca1516e;p=features.git

installer:
- fix problem with path with spaces in the Launcher
  (thanks to Martin Rauscher for testing)
- add icons and version info to the launcher and the PDF viewer


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18434 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof
index 1dfc1470b6..11ae329775 100644
--- a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof
+++ b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof
@@ -110,7 +110,7 @@ ActiveLang=
 ProjectLang=
 RootDir=
 [Version Info]
-IncludeVerInfo=0
+IncludeVerInfo=1
 AutoIncBuild=0
 MajorVer=1
 MinorVer=0
@@ -124,13 +124,13 @@ DLL=0
 Locale=1031
 CodePage=1252
 [Version Info Keys]
-CompanyName=
-FileDescription=
+CompanyName=LyX Team
+FileDescription=Launcher for LyX
 FileVersion=1.0.0.0
 InternalName=
-LegalCopyright=
+LegalCopyright=Uwe Stöhr
 LegalTrademarks=
-OriginalFilename=
+OriginalFilename=lyxLauncher.exe
 ProductName=
 ProductVersion=1.0.0.0
 Comments=
diff --git a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr
index f91d1b91cd..4a5bef8535 100644
--- a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr
+++ b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr
@@ -12,6 +12,8 @@ program lyxLauncher;
 uses
   Windows, SysUtils, ShellApi, Dialogs;
 
+{$R *.res}
+
 var Path,FileName : string;
     hConsole : THandle;
 
@@ -25,7 +27,7 @@ begin
 
  // if a filename is given, convert it to a PChar; needed for the ShellExecute
  if FileName <> '' then
-  Params:= PChar(FileName)
+  Params:= PChar('"' + FileName + '"')
  else
   Params:= nil;
 
diff --git a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.exe b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.exe
index e4951620b5..fe30a6fb9b 100644
Binary files a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.exe and b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.exe differ
diff --git a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.res b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.res
new file mode 100644
index 0000000000..183550f4cb
Binary files /dev/null and b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.res differ
diff --git a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dof b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dof
index b1bb997708..1b696f5b45 100644
--- a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dof
+++ b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dof
@@ -95,7 +95,7 @@ UnitOutputDir=
 PackageDLLOutputDir=
 PackageDCPOutputDir=
 SearchPath=
-Packages=
+Packages=vcl;rtl;vclx;vcldb;dbrtl;bdertl;vclshlctrls;vclactnband;adortl;vcldbx;VclSmp;visualclx;visualdbclx;dbexpress;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;teeui;teedb;tee;Rave50CLX;Rave50VCL;IntrawebDB_50_70;Intraweb_50_70;indy;ibxpress;dsnap;soaprtl;dbxcds;inetdb
 Conditionals=
 DebugSourceDirs=
 UsePackages=0
@@ -110,7 +110,7 @@ ActiveLang=
 ProjectLang=
 RootDir=
 [Version Info]
-IncludeVerInfo=0
+IncludeVerInfo=1
 AutoIncBuild=0
 MajorVer=1
 MinorVer=0
@@ -124,13 +124,16 @@ DLL=0
 Locale=1031
 CodePage=1252
 [Version Info Keys]
-CompanyName=
-FileDescription=
+CompanyName=LyX Team
+FileDescription=PDF viewing program for LyX
 FileVersion=1.0.0.0
 InternalName=
-LegalCopyright=
+LegalCopyright=Uwe Stöhr
 LegalTrademarks=
-OriginalFilename=
+OriginalFilename=PDFViewWin.exe
 ProductName=
 ProductVersion=1.0.0.0
 Comments=
+[HistoryLists\hlUnitAliases]
+Count=1
+Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
diff --git a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dpr b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dpr
index b91a20de62..413bfad8cf 100644
--- a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dpr
+++ b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.dpr
@@ -19,6 +19,8 @@ program PDFViewWin;
 uses
   Windows, SysUtils, ShellApi;
 
+{$R *.res}
+
 var Input,InputNew : string;
     FileTest : boolean;
     hConsole : THandle;
diff --git a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.exe b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.exe
index c638a039d6..abe71bce13 100644
Binary files a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.exe and b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.exe differ
diff --git a/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.res b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.res
new file mode 100644
index 0000000000..1c6b321a25
Binary files /dev/null and b/development/Win32/packaging/AltInstaller/specials/PDFViewWin/PDFViewWin.res differ