Merge pull request #11 from dsec-capital/de/tick_history

De/tick history
dsec-capital · Aug 13, 2024 · 326481e · 326481e
2 parents d4c8f21 + 5272ce7
commit 326481e
Show file tree

Hide file tree

Showing 8 changed files with 172 additions and 121 deletions.
diff --git a/Debug b/Debug
diff --git a/Release b/Release
diff --git a/common/common.vcxproj b/common/common.vcxproj
@@ -72,11 +72,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(SolutionDir)$(LibrariesArchitecture)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <IntDir>$(LibrariesArchitecture)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)$(LibrariesArchitecture)\$(Configuration)\</OutDir>
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <IntDir>$(LibrariesArchitecture)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)$(LibrariesArchitecture)\$(Configuration)\</OutDir>
@@ -101,7 +101,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PostBuildEvent>
-      <Command>copy /y "$(ProjectDir)market_config.toml" "$(SolutionDir)$(Configuration)"</Command>
+      <Command>copy /y "$(ProjectDir)market_config.toml" "$(SolutionDir)$(LibrariesArchitecture)\$(Configuration)\market_config.toml"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -125,7 +125,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <PostBuildEvent>
-      <Command>copy /y "$(ProjectDir)market_config.toml" "$(SolutionDir)$(Configuration)"</Command>
+      <Command>copy /y "$(ProjectDir)market_config.toml" "$(SolutionDir)$(LibrariesArchitecture)\$(Configuration)\market_config.toml"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -144,6 +144,9 @@
       </SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <PostBuildEvent>
+      <Command>copy /y "$(ProjectDir)market_config.toml" "$(SolutionDir)$(LibrariesArchitecture)\$(Configuration)\market_config.toml"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -165,6 +168,9 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
+    <PostBuildEvent>
+      <Command>copy /y "$(ProjectDir)market_config.toml" "$(SolutionDir)$(LibrariesArchitecture)\$(Configuration)\market_config.toml"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="bar.h" />

diff --git a/fix_simulation_server/fix_simulation_server.vcxproj b/fix_simulation_server/fix_simulation_server.vcxproj
@@ -107,7 +107,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)$(LibrariesArchitecture)\$(Configuration);$(SolutionDir)third-parties\quickfix\$(LibrariesArchitecture)-$(Configuration)\lib</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy /y "$(ProjectDir)session.cfg" "$(SolutionDir)$(Configuration)"</Command>
+      <Command>copy /y "$(ProjectDir)session.cfg" "$(SolutionDir)$(LibrariesArchitecture)\$(Configuration)\session.cfg"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -131,7 +131,7 @@
       <AdditionalLibraryDirectories>$(SolutionDir)$(LibrariesArchitecture)\$(Configuration);$(SolutionDir)third-parties\quickfix\$(LibrariesArchitecture)-$(Configuration)\lib</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
-      <Command>copy /y "$(ProjectDir)session.cfg" "$(SolutionDir)$(Configuration)"</Command>
+      <Command>copy /y "$(ProjectDir)session.cfg" "$(SolutionDir)$(LibrariesArchitecture)\$(Configuration)\session.cfg"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -150,6 +150,9 @@
       <AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);quickfixd.lib;common.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)$(LibrariesArchitecture)\$(Configuration);$(SolutionDir)third-parties\quickfix\$(LibrariesArchitecture)-$(Configuration)\lib</AdditionalLibraryDirectories>
     </Link>
+    <PostBuildEvent>
+      <Command>copy /y "$(ProjectDir)session.cfg" "$(SolutionDir)$(LibrariesArchitecture)\$(Configuration)\session.cfg"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -171,6 +174,9 @@
       <AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);quickfix.lib;common.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)$(LibrariesArchitecture)\$(Configuration);$(SolutionDir)third-parties\quickfix\$(LibrariesArchitecture)-$(Configuration)\lib</AdditionalLibraryDirectories>
     </Link>
+    <PostBuildEvent>
+      <Command>copy /y "$(ProjectDir)session.cfg" "$(SolutionDir)$(LibrariesArchitecture)\$(Configuration)\session.cfg"</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="application.cpp" />

diff --git a/fxcm_market_data_server/proxy_server.h b/fxcm_market_data_server/proxy_server.h
@@ -439,6 +439,7 @@ namespace fxcm {
             });
 
             // for example http://localhost:8083/ticks?symbol=EUR/USD&from=2024-06-27 00:00:00 
+            // http://localhost:8083/ticks?symbol=EUR/USD&count=300 
             server.Get("/ticks", [this](const Request& req, Response& res) {                
                 std::string symbol = "nan";
 

diff --git a/scripts/copy_zorro_scripts_x64.bat b/scripts/copy_zorro_scripts_x64.bat
@@ -24,6 +24,7 @@ ECHO Copy asset files to %ZORRO_HISTORY_DIR%...
 robocopy %SOURCE% %ZORRO_HISTORY_DIR% "*.csv" > nul
 
 ECHO "Copy FIX spec files to %ZorroInstallDir%\Plugin64\spec..."
+robocopy "%SCRIPT_DIR%..\spec" "%ZorroInstallDir%\Plugin\spec"  
 robocopy "%SCRIPT_DIR%..\spec" "%ZorroInstallDir%\Plugin64\spec"  
 
 ECHO Copy plugin config toml file