WIP

rareMaxim · Oct 11, 2017 · 754fbea · 754fbea
1 parent ec763ee
commit 754fbea
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 26 deletions.
diff --git a/Install/TelegaPiBot.dproj b/Install/TelegaPiBot.dproj
@@ -172,16 +172,7 @@ $(PreBuildEvent)]]></PreBuildEvent>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployClass Name="DependencyModule">
-                    <Platform Name="Win32">
-                        <Operation>0</Operation>
-                        <Extensions>.dll;.bpl</Extensions>
-                    </Platform>
-                    <Platform Name="OSX32">
-                        <Operation>1</Operation>
-                        <Extensions>.dylib</Extensions>
-                    </Platform>
-                </DeployClass>
+                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
                 <DeployClass Name="ProjectOSXResource">
                     <Platform Name="OSX32">
                         <RemoteDir>Contents\Resources</RemoteDir>
@@ -520,7 +511,16 @@ $(PreBuildEvent)]]></PreBuildEvent>
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <DeployClass Name="ProjectiOSDeviceResourceRules"/>
+                <DeployClass Name="DependencyModule">
+                    <Platform Name="Win32">
+                        <Operation>0</Operation>
+                        <Extensions>.dll;.bpl</Extensions>
+                    </Platform>
+                    <Platform Name="OSX32">
+                        <Operation>1</Operation>
+                        <Extensions>.dylib</Extensions>
+                    </Platform>
+                </DeployClass>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>

diff --git a/InstallAndDemo.groupproj b/InstallAndDemo.groupproj
@@ -13,7 +13,7 @@
             <Dependencies>Install\TelegaPiBot.dproj</Dependencies>
         </Projects>
         <Projects Include="Demo\Console\ConsoleBot.dproj">
-            <Dependencies>Install\TelegaPiBot.dproj</Dependencies>
+            <Dependencies/>
         </Projects>
     </ItemGroup>
     <ProjectExtensions>
@@ -50,13 +50,13 @@
     <Target Name="EchoBot:Make" DependsOnTargets="TelegaPiBot:Make">
         <MSBuild Projects="Demo\EchoBot\EchoBot.dproj" Targets="Make"/>
     </Target>
-    <Target Name="ConsoleBot" DependsOnTargets="TelegaPiBot">
+    <Target Name="ConsoleBot">
         <MSBuild Projects="Demo\Console\ConsoleBot.dproj"/>
     </Target>
-    <Target Name="ConsoleBot:Clean" DependsOnTargets="TelegaPiBot:Clean">
+    <Target Name="ConsoleBot:Clean">
         <MSBuild Projects="Demo\Console\ConsoleBot.dproj" Targets="Clean"/>
     </Target>
-    <Target Name="ConsoleBot:Make" DependsOnTargets="TelegaPiBot:Make">
+    <Target Name="ConsoleBot:Make">
         <MSBuild Projects="Demo\Console\ConsoleBot.dproj" Targets="Make"/>
     </Target>
     <Target Name="Build">

diff --git a/Source/TelegAPI.Base.pas b/Source/TelegAPI.Base.pas
@@ -1,4 +1,4 @@
-unit TelegAPI.Base;
+unit TelegAPI.Base;
 
 interface
 
@@ -14,6 +14,9 @@   TtgAbstractComponent = class(TComponent)
     constructor Create(AOwner: TComponent); override;
   published
     property Autor: string read FAutor;
+    /// <summary>
+    ///   Поддерживаемая версия платформы BotAPI
+    /// </summary>
     property Version: string read FVersion;
   end;
 

diff --git a/Source/TelegAPI.Bot.pas b/Source/TelegAPI.Bot.pas
@@ -43,7 +43,6 @@   TTelegramBot = class(TtgAbstractComponent)
     FOnReceiveGeneralError: TtgOnReceiveGeneralError;
     FOnRawData: TtgOnReceiveRawData;
     FParamLoader: TtgParamLoader;
-    function GetVersionAPI: string;
   protected
     /// <summary>
     ///   Мастер-функция для запросов на сервак
@@ -1727,10 +1726,6 @@   TTelegramBot = class(TtgAbstractComponent)
     ///   283107813:AAG4hEElAvIogTSHNHXI6rZtE46A7XQvIH
     /// </example>
     property Token: string read FToken write FToken;
-    /// <summary>
-    ///   Поддерживаемая версия платформы BotAPI
-    /// </summary>
-    property VersionAPI: string read GetVersionAPI;
 {$ENDREGION}
 {$REGION 'События|Events'}
     /// <summary>
@@ -1782,11 +1777,6 @@ destructor TTelegramBot.Destroy;
   inherited;
 end;
 
-function TTelegramBot.GetVersionAPI: string;
-begin
-  Result := '3.4.0';
-end;
-
 function TTelegramBot.RequestAPI<T>(const Method: string; Parameters: TDictionary<string, TValue>): T;
 var
   LTextResponse: string;