Changeset 2

Timestamp:

10/21/07 23:44:55 (11 months ago)

Author:

sagrer

Message:

1. Вымаран старый механизм хранения версии в вендовом ресурсе.
   
2. Подключен новый механизм хранения версии.
   
3. Заодно подключены файлеги паскалевские, обеспечивающие этот самый механизм.
   

Files:

• trunk/AboutForm.cpp (modified) (1 diff)
• trunk/AboutForm.dfm (modified) (1 diff)
• trunk/AboutForm.h (modified) (1 diff)
• trunk/CodeFromLCL.hpp (added)
• trunk/CodeFromLCL.pas (added)
• trunk/ExtraFileUtils.hpp (added)
• trunk/ExtraFileUtils.pas (added)
• trunk/ExtraFunctions.hpp (added)
• trunk/ExtraFunctions.pas (added)
• trunk/FileInString.hpp (added)
• trunk/FileInString.pas (added)
• trunk/MainForm.cpp (modified) (2 diffs)
• trunk/MobSurgeon.bpr (modified) (5 diffs)
• trunk/MobSurgeon.res (modified) (previous)
• trunk/MobSurgeon.sconf (modified) (1 diff)
• trunk/MySys.hpp (modified) (3 diffs)
• trunk/MySys.pas (modified) (5 diffs)
• trunk/TextFileInString.hpp (added)
• trunk/TextFileInString.pas (added)
• trunk/VerInfoTxtFormat.hpp (added)
• trunk/VerInfoTxtFormat.pas (added)
• trunk/crc_32.hpp (added)
• trunk/crc_32.pas (added)
• trunk/initer.cpp (modified) (18 diffs)
• trunk/initer.h (modified) (4 diffs)

trunk/AboutForm.cpp

@@ -35 +35 @@
-
-    //Îòîáðàçèòü íà ôîðìå èíôó î âåðñèè...
-VerInfo->Product
-VerInfo->File
-erInfo->FileVersion
-VerInfo->Legal
-VerInfo->
-CommentLab->Caption = VerInfo->Commen
+MobSurgeon_App
+MobSurgeon_App
+itInfo->GenerateVersionString()
+MobSurgeon_
+MobSurgeon_
+DevelsContactsLab->Caption = MobSurgeon_DevelsContac
-
-  }

trunk/AboutForm.dfm

@@ -66 +66 @@
-    Caption = 'CraftedBy'
-  end
-Comment
+DevelsContacts
-    Left = 10
-    Top = 94
-44
+75
-    Height = 13
-Comment
+DevelsContacts
-  end
-  object Label3: TLabel

trunk/AboutForm.h

@@ -21 +21 @@
-        TLabel *Label2;
-        TLabel *CraftedByLab;
-Comment
+DevelsContacts
-        TButton *OkBut;
-        TLabel *Label3;

trunk/MainForm.cpp

@@ -36 +36 @@
-  if (FirstShowed == false)
-  {
-VerInfo->Product
+MobSurgeon_App
-    PLastFocus = NULL;
-    BlockingInterfNow = false;
@@ -450 +450 @@
-{
-  //Íó òèïà... â îáùåì òàê - â íà÷àëå âûâåñòè èìåíà çàãðóæåíûõ ôàéëîâ.
-VerInfo->Product
-VerInfo->Product
+MobSurgeon_App
+MobSurgeon_App
-  UpdateEditMenu();  //ìåíþõà ðåäàêòèðîâàíèÿ.
-  if (Mob1Loaded == true)

trunk/MobSurgeon.bpr

@@ -14 +14 @@
-      generated\build\SettsForm.obj generated\build\SearchRepForm.obj 
-      generated\build\MySys.obj generated\build\KeyChangerForm.obj 
-
+
+
+
+
+
-    <RESFILES value="MobSurgeon.res"/>
-    <IDLFILES value=""/>
@@ -46 +50 @@
-    <SYSDEFINES value="NO_STRICT;USEPACKAGES"/>
-    <MAINSOURCE value="MobSurgeon.cpp"/>
-
-
+;.
+;.
-    <WARNINGS value="-w-spa -w-par -w-8030 -w-aus"/>
-    <OTHERFILES value=""/>
-  </MACROS>
-  <OPTIONS>
-src_suffix
-
+I.
+-src_suffix 
-    <CFLAG1 value="-Od -H=$(BCB)\lib\vcl60.csm -Hc -Vx -Ve -X- -r- -a8 -b- -d -k -y -v -vi- 
-      -c -tW -tWM"/>
@@ -91 +95 @@
-      <FILE FILENAME="OrientatorFrame.cpp" FORMNAME="OrientatorFr" UNITNAME="OrientatorFrame" CONTAINERID="CCompiler" DESIGNCLASS="TFrame" LOCALCOMMAND=""/>
-      <FILE FILENAME="glQuaternions.cpp" FORMNAME="" UNITNAME="glQuaternions" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="VerInfoTxtFormat.pas" FORMNAME="" UNITNAME="VerInfoTxtFormat.pas" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="ExtraFileUtils.pas" FORMNAME="" UNITNAME="ExtraFileUtils.pas" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="ExtraFunctions.pas" FORMNAME="" UNITNAME="ExtraFunctions.pas" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="FileInString.pas" FORMNAME="" UNITNAME="FileInString.pas" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="TextFileInString.pas" FORMNAME="" UNITNAME="TextFileInString.pas" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="CodeFromLCL.pas" FORMNAME="" UNITNAME="CodeFromLCL.pas" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="crc_32.pas" FORMNAME="" UNITNAME="crc_32.pas" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="MobSurgeon_ver.h" FORMNAME="" UNITNAME="MobSurgeon_ver.h" CONTAINERID="" DESIGNCLASS="" LOCALCOMMAND=""/>
-  </FILELIST>
-  <BUILDTOOLS>
@@ -97 +109 @@
-  <IDEOPTIONS>
-[Version Info]
-1
+0
-AutoIncBuild=0
-MajorVer=0
@@ -132 +144 @@
-
-[HistoryLists\hlIncludePath]
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-[HistoryLists\hlLibraryPath]
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-[HistoryLists\hlDebugSourcePath]

trunk/MobSurgeon.sconf

@@ -4 +4 @@
-ProjectType=CppCode
-ProjectVer=Project
-0
+1
-ProjectRootDir=.\
-

trunk/MySys.hpp

@@ -11 +11 @@
-#pragma option push -w-
-#pragma option push -Vx
+#include <ExtraFunctions.hpp>   // Pascal unit
-#include <Grids.hpp>    // Pascal unit
-#include <StdCtrls.hpp> // Pascal unit
@@ -62 +63 @@
-extern PACKAGE int __fastcall WstateToInt(const Forms::TWindowState WState);
-extern PACKAGE Forms::TWindowState __fastcall IntToWstate(const int Int);
-extern PACKAGE AnsiString __fastcall BoolToStr(const bool bool1);
-extern PACKAGE bool __fastcall StrToBool(const AnsiString stro1);
-extern PACKAGE Byte __fastcall ConvertDosWin(Byte buf);
-extern PACKAGE Byte __fastcall ConvertWinDos(Byte buf);
@@ -74 +73 @@
-extern PACKAGE Extended __fastcall GetFloat(const Byte * ChB);
-extern PACKAGE Byte __fastcall UnGetFloat(const Extended Flt);
-extern PACKAGE bool __fastcall CheckCharNum(const char Ch);
-extern PACKAGE bool __fastcall CheckStrFloat(const AnsiString St);
-extern PACKAGE bool __fastcall CheckStrInt(const AnsiString St);
-extern PACKAGE Extended __fastcall RoundFloat(const Extended Flt, int Num);
-extern PACKAGE Extended __fastcall ObrezatDoNum(const Extended Flt, int Num);

trunk/MySys.pas

@@ -12 +12 @@
-uses
-  Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-{fileutil,} Grid
+Grids, ExtraFunction
-
-type
@@ -38 +38 @@
-Function WstateToInt(Const WState : TWindowState) : Integer;
-Function IntToWstate (Const Int : integer) : TWindowState;
-Function BoolToStr(const bool1 : boolean) : string;
-Function StrToBool(const stro1 : string) : boolean;
-Function ConvertDosWin(buf : byte) : byte;
-Function ConvertWinDos(buf : byte) : byte;
@@ -50 +48 @@
-Function GetFloat(const ChB : ChetireBaita) : Extended;
-Function UnGetFloat(const Flt : Extended) : ChetireBaita;
-Function CheckStrFloat(const St : string) : boolean;
-Function CheckCharNum(const Ch : char) : boolean;
-Function CheckStrInt(const St : string) : boolean;
-Function RoundFloat(const Flt : Extended; Num : integer) : Extended;
-Function ObrezatDoNum(const Flt : Extended; Num : integer) : Extended;
@@ -215 +210 @@
-  if int = 2 then result := WsMinimized;
-  If int = 3 then result := WsNormal;
-end;
-
-Function BoolToStr(const bool1 : boolean) : string;
-begin
-  if bool1 = true then result := '1'
-  else result := '0';
-end;
-
-Function StrToBool(const stro1 : string) : boolean;
-begin
-  if stro1 = '1' then result := true
-  else result := false;
-end;
-
@@ -473 +456 @@
-end;
-
-Function CheckCharNum(const Ch : char) : boolean;
-begin
-  result := false;
-  if Ch = '0' then result := true;
-  if Ch = '1' then result := true;
-  if Ch = '2' then result := true;
-  if Ch = '3' then result := true;
-  if Ch = '4' then result := true;
-  if Ch = '5' then result := true;
-  if Ch = '6' then result := true;
-  if Ch = '7' then result := true;
-  if Ch = '8' then result := true;
-  if Ch = '9' then result := true;
-end;
-
-Function CheckStrFloat(const St : string) : boolean;
-var
-  zapatih, I : integer;
-  ch : char;
-begin
-  If (st <> '') and (st <> 'NAN') and (st<>'-') then begin
-    result := true;
-    zapatih := 1;
-    I := 0;
-    If St[I+1] = '-' then I := I+1;
-    repeat
-      I := I+1;
-      Ch := St[I];
-      If ch = DecimalSeparator then zapatih := zapatih-1
-      else if ch <> #0 then if CheckCharNum(Ch) = false then result := false;
-    until Ch = #0;
-    if zapatih < 0 then result := false;
-  end
-  else begin
-    If St = 'NAN' then result := true
-    else Result := false;
-  end;
-end;
-
-Function CheckStrInt(const St : string) : boolean;
-var
-  ch : char;
-  I : integer;
-begin
-  If (st <> '') and (st<>'-') then begin
-    result := true;
-    I := 0;
-    If St[I+1] = '-' then I := I+1;
-    repeat
-      I := I+1;
-      Ch := St[I];
-      if ch <> #0 then if CheckCharNum(Ch) = false then result := false;
-    until Ch = #0;
-  end  
-  else result := false;
-end;
-
-Function RoundFloat(const Flt : Extended; Num : integer) : Extended;
-var

trunk/initer.cpp

@@ -81 +81 @@
-
-//Òèïà ãëîáàëüíûå ïåðåìåííûå...;
-FromFile *Ver
+TxtFormat *Vit
-String ProgPath, Mob1FileName, Mob2FileName;
-TMob *MobInMem1, *TargetMob;
@@ -100 +100 @@
-
-  //Ïîëó÷èòü èíôó î âåðñèè...
-
-
+
+
+
+
+
+
+
-
-  //Ïîëó÷èòü ïóòü ê ïðîãå...
@@ -133 +138 @@
-
-  //Óáðàòü ìóñîð
-er
+it
-  delete MobInMem1;
-  delete MainIni;
@@ -451 +456 @@
-  //[Main]
-  MainIni->WriteInteger("Main","IniFileVer",IniFileVer);
-erInfo->FileVersion
+itInfo->GenerateDotsVersionString()
-  MainIni->WriteBool("Main","UseTMobThreads",UseTMobThreads);
-  MainIni->WriteInteger("Main","SaveAttempts",SaveAttempts);
@@ -686 +691 @@
-    {
-      //Ñïðîñèòü ó þçâåðÿ, äåéñòâèòåëüíî ëè îí õî÷åò ïåðåçàïèñàòü ýòîò ôàéë...
-VerInfo->Product
+MobSurgeon_App
-      {
-        //Þçâåðü ðàçðåøèë ïåðåçàïèñü. Êëàññ ìîáà ñàì âñå ïåðåçàïèøåò - ïðîñòî äåëàåì ñåéâ :)
@@ -769 +774 @@
-  if (FileExists(BackupFileName) == true)
-  {
-VerInfo->Product
+MobSurgeon_App
-    {
-      //Þçâåðü ðàçðåøèë ïåðåçàïèñü.
@@ -881 +886 @@
-      {
-        //Òèïà íåïðàâèëüíî ââåäåíî çíà÷åíèå. Íàðóãàòüñÿ þçâåðþ.
-VerInfo->Product
+MobSurgeon_App
-      };
-    };  
@@ -891 +896 @@
-      {
-        //Òèïà íåïðàâèëüíî ââåäåíî çíà÷åíèå. Íàðóãàòüñÿ þçâåðþ.
-VerInfo->Product
+MobSurgeon_App
-      };
-    };
@@ -901 +906 @@
-      {
-        //Òèïà íåïðàâèëüíî ââåäåíî çíà÷åíèå. Íàðóãàòüñÿ þçâåðþ.
-VerInfo->Product
+MobSurgeon_App
-      };
-    };
@@ -911 +916 @@
-      {
-        //Òèïà íåïðàâèëüíî ââåäåíî çíà÷åíèå. Íàðóãàòüñÿ þçâåðþ.
-VerInfo->Product
+MobSurgeon_App
-      };
-    };
@@ -925 +930 @@
-      {
-        //Òèïà íåïðàâèëüíî ââåäåíî çíà÷åíèå. Íàðóãàòüñÿ þçâåðþ.
-VerInfo->Product
+MobSurgeon_App
-      };
-    };
@@ -935 +940 @@
-      {
-        //Òèïà íåïðàâèëüíî ââåäåíî çíà÷åíèå. Íàðóãàòüñÿ þçâåðþ.
-VerInfo->Product
+MobSurgeon_App
-      };
-    };
@@ -945 +950 @@
-      {
-        //Òèïà íåïðàâèëüíî ââåäåíî çíà÷åíèå. Íàðóãàòüñÿ þçâåðþ.
-VerInfo->Product
+MobSurgeon_App
-      };
-    };
@@ -959 +964 @@
-      {
-        //Òèïà íåïðàâèëüíî ââåäåíî çíà÷åíèå. Íàðóãàòüñÿ þçâåðþ.
-VerInfo->Product
+MobSurgeon_App
-      };
-    };
@@ -969 +974 @@
-      {
-        //Òèïà íåïðàâèëüíî ââåäåíî çíà÷åíèå. Íàðóãàòüñÿ þçâåðþ.
-VerInfo->Product
+MobSurgeon_App
-      };
-    };
@@ -983 +988 @@
-      {
-        //Òèïà íåïðàâèëüíî ââåäåíî çíà÷åíèå. Íàðóãàòüñÿ þçâåðþ.
-VerInfo->Product
+MobSurgeon_App
-      };
-    };
@@ -997 +1002 @@
-      {
-        //Òèïà íåïðàâèëüíî ââåäåíî çíà÷åíèå. Íàðóãàòüñÿ þçâåðþ.
-VerInfo->Product
+MobSurgeon_App
-      };
-    };
@@ -1012 +1017 @@
-      {
-        //Òèïà íåïðàâèëüíî ââåäåíî çíà÷åíèå. Íàðóãàòüñÿ þçâåðþ.
-VerInfo->Product
+MobSurgeon_App
-      };
-    };

trunk/initer.h

@@ -7 +7 @@
-#include "MobFormat.h"
-#include <IniFiles.hpp>
+#include "VerInfoTxtFormat.hpp"
+#include "MobSurgeon_ver.h"
+
-//---------------------------------------------------------------------------
-
@@ -12 +15 @@
-const String IniFileName = "MobSurgeon.ini";
-const Integer IniFileVer = 6;
+
+//Êîíñòàíòû - èíôà î ïðîãå.
+const String MobSurgeon_AppName = "MobSurgeon";
+const String MobSurgeon_AppDescription = "Ïðîãðàììà äëÿ âûïîëíåíèÿ ðàçëè÷íûõ õèòðûõ îïåðàöèé íàä ìîáàìè";
+const String MobSurgeon_Copyright = "Copyright © 2005-2007 Gipat Group";
+const String MobSurgeon_CraftedBy = "Sagrer, Ñíàéïåð";
+const String MobSurgeon_DevelsContacts = "www.GipatGroup.org";
-
-//Êîíñòàíòû-ñòàíäàðòíûå íàñòðîéêè.
@@ -143 +153 @@
-
-//Òèïà îáúÿâèòü ãëîáàëüíûå ïåðåìåííûå...
-FromFile *Ver
+TxtFormat *Vit
-extern String ProgPath, Mob1FileName, Mob2FileName;
-extern TMob *MobInMem1, *TargetMob;
@@ -176 +186 @@
-void StrCommaList2StrArray(AnsiString InputStr, DynamicArray <String> *OutputArray);  //Ãåíåðèò èç ñïèñêà ìàññèâ ñî ñòðîêàìè...
-
-//TVerInfoFromFile *VerInfo;
-//AnsiString ProgPath;
-