1.1 --- a/installer/UnitPackSystem.pas Thu Nov 30 20:52:46 2006 +0000
1.2 +++ b/installer/UnitPackSystem.pas Thu Nov 30 22:53:20 2006 +0000
1.3 @@ -6,12 +6,15 @@
1.4
1.5 procedure CompressFiles(Files : TStrings; const Filename : String);
1.6 function DecompressStream(Stream : TMemoryStream; DestDirectory : String): Boolean;
1.7 -function AttachToFile(const AFileName: string; MemoryStream: TMemoryStream): Boolean;
1.8 +function AttachToFile(const AFileName: string; MemoryStream: TMemoryStream; Version: String): Boolean;
1.9 function LoadFromFile(const AFileName: string; MemoryStream: TMemoryStream): Boolean;
1.10 function Unpack: Boolean;
1.11 +function GetVersion: String;
1.12
1.13 implementation
1.14
1.15 +uses UnitfrmMain;
1.16 +
1.17 procedure CompressFiles(Files : TStrings; const Filename : String);
1.18 var
1.19 infile, outfile, tmpFile : TFileStream;
1.20 @@ -103,7 +106,7 @@
1.21 end;
1.22 end;
1.23
1.24 -function AttachToFile(const AFileName: string; MemoryStream: TMemoryStream): Boolean;
1.25 +function AttachToFile(const AFileName: string; MemoryStream: TMemoryStream; Version: String): Boolean;
1.26 var
1.27 aStream: TFileStream;
1.28 iSize: Integer;
1.29 @@ -124,6 +127,10 @@
1.30 // die Streamgr��e speichern
1.31 iSize := MemoryStream.Size + SizeOf(Integer);
1.32 aStream.Write(iSize, SizeOf(iSize));
1.33 + // save version number+length
1.34 + iSize := aStream.Position;
1.35 + aStream.Write(Version[1], Length(Version));
1.36 + aStream.Write(iSize, SizeOf(iSize));
1.37 finally
1.38 aStream.Free;
1.39 end;
1.40 @@ -132,15 +139,21 @@
1.41
1.42 function LoadFromFile(const AFileName: string; MemoryStream: TMemoryStream): Boolean;
1.43 var
1.44 - aStream: TFileStream;
1.45 + aStream: TMemoryStream;
1.46 iSize: Integer;
1.47 + EndPos: Integer;
1.48 begin
1.49 Result := False;
1.50 if not FileExists(AFileName) then
1.51 Exit;
1.52
1.53 try
1.54 - aStream := TFileStream.Create(AFileName, fmOpenRead or fmShareDenyWrite);
1.55 + aStream := TMemoryStream.Create;
1.56 + aStream.LoadFromFile(AFileName);
1.57 + // drop version part
1.58 + aStream.Seek(-SizeOf(Integer), soFromEnd);
1.59 + aStream.Read(EndPos, SizeOf(Integer));
1.60 + aStream.SetSize(EndPos);
1.61 // seek to position where Stream-Size is saved
1.62 // zur Position seeken wo Streamgr��e gespeichert
1.63 aStream.Seek(-SizeOf(Integer), soFromEnd);
1.64 @@ -169,7 +182,8 @@
1.65 begin
1.66 eStream := TMemoryStream.Create;
1.67 try
1.68 - LoadFromFile(ParamStr(0), eStream); // Get ZIP
1.69 + // Get ZIP
1.70 + LoadFromFile(ParamStr(0), eStream);
1.71 DecompressStream(eStream, ExtractFilePath(ParamStr(0))); // Unpack files
1.72
1.73 Result := True;
1.74 @@ -179,4 +193,19 @@
1.75 eStream.Free;
1.76 end;
1.77
1.78 +function GetVersion: String;
1.79 +var FileStream: TFileStream;
1.80 + EndPos, Size: Integer;
1.81 + Version: String;
1.82 +begin
1.83 + FileStream := TFileStream.Create(ParamStr(0), fmOpenRead or fmShareDenyWrite);
1.84 + FileStream.Seek(-SizeOf(Integer), soFromEnd);
1.85 + FileStream.Read(EndPos, SizeOf(EndPos));
1.86 + FileStream.Position := EndPos;
1.87 + Size := FileStream.Size - EndPos - SizeOf(Integer);
1.88 + SetString(Result, nil, Size);
1.89 + FileStream.Read(Pointer(Result)^, Size); // YAMS
1.90 + FileStream.Free;
1.91 +end;
1.92 +
1.93 end.