BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Build fixes

Browse Source
This commit is contained in:
Scott E. Graves
2017-03-21 23:04:26 -05:00
parent 69d0c11d26
commit 631773bfb6
21 changed files with 73 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -252,3 +252,4 @@ ModelManifest.xml
.idea/
3rd_party/CEF/depot_tools
3rd_party/CEF/depot_tools
/3rd_party/CEF/depot_tools.zip

BIN
3rd_party/CEF/SFXWiz32.exe vendored
View File

Binary file not shown.

37
3rd_party/CEF/create.cmd vendored Normal file
View File

@@ -0,0 +1,37 @@
@echo off
set ROOT=%~dp0%
set MODE=%1
pushd %ROOT%
set PATH=%ROOT%depot_tools;%PATH%
call create_common.cmd
set CEF_USE_GN=1
if ("%MODE%" EQ "Debug") (
set GN_DEFINES=is_win_fastlink=true fatal_linker_warnings=false
) else (
set GN_DEFINES=fatal_linker_warnings=false
)
set GN_ARGUMENTS=--ide=vs2015 --sln=cef --filters=//cef/*
pushd chromium_git
call python ..\automate\automate-git.py --download-dir=%ROOT%chromium_git --depot-tools-dir=%ROOT%depot_tools --no-distrib --no-build --branch=3029 || goto :ERROR
popd
pushd chromium_git\chromium\src\cef
call cef_create_projects.bat
popd
pushd chromium_git\chromium\src
call ninja -C out\%MODE%_GN_x64 cef || goto :ERROR
popd
goto :END
:ERROR
pause
popd
exit 1
:END
popd

5
3rd_party/CEF/create_common.cmd vendored
View File

@@ -1,5 +1,8 @@
@echo off
pushd "%~dp0%"
set ROOT=%~dp0%
pushd "%ROOT%"
set PATH=%ROOT%..\..\bin;%PATH%
mkdir automate
mkdir chromium_git

BIN
3rd_party/CEF/funzip.exe vendored
View File

Binary file not shown.

BIN
3rd_party/CEF/libeay32.dll vendored
View File

Binary file not shown.

BIN
3rd_party/CEF/libiconv2.dll vendored
View File

Binary file not shown.

BIN
3rd_party/CEF/libintl3.dll vendored
View File

Binary file not shown.

BIN
3rd_party/CEF/libssl32.dll vendored
View File

Binary file not shown.

BIN
3rd_party/CEF/unzip.exe vendored
View File

Binary file not shown.

BIN
3rd_party/CEF/unzip32.dll vendored
View File

Binary file not shown.

BIN
3rd_party/CEF/unzipsfx.exe vendored
View File

Binary file not shown.

BIN
3rd_party/CEF/uzexampl.exe vendored
View File

Binary file not shown.

BIN
3rd_party/CEF/wget.exe vendored
View File

Binary file not shown.

BIN
3rd_party/CEF/zipinfo.exe vendored
View File

Binary file not shown.

40
CMakeLists.txt
View File

@@ -82,9 +82,9 @@ target_link_libraries(siadrive PRIVATE siadrive.api siadrive.dokan.api)
if (MSVC)
target_include_directories(siadrive PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/cef)
target_link_libraries(siadrive PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/obj/cef/libcef_dll_wrapper.lib
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/libcef.dll.lib
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/chrome_elf.dll.lib)
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/obj/cef/libcef_dll_wrapper.lib
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libcef.dll.lib
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/chrome_elf.dll.lib)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set_target_properties(siadrive PROPERTIES COMPILE_FLAGS "/MTd")
@@ -93,28 +93,28 @@ if (MSVC)
endif()
set(CEF_LIBS
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/libcef.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/chrome_elf.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/osmesa.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/libEGL.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/libGLESv2.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/d3dcompiler_47.dll)
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libcef.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/chrome_elf.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/osmesa.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libEGL.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libGLESv2.dll
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/d3dcompiler_47.dll)
file(GLOB CEF_SUPPORT
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/icudtl.dat
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/cef.pak
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/*.bin
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/cef_*.pak)
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/icudtl.dat
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/cef.pak
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/*.bin
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/cef_*.pak)
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CEF_LIBS ${CEF_LIBS}
${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/siadrive.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/libcef.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/chrome_elf.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/osmesa.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/libEGL.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/libGLESv2.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/obj/cef/libcef_dll_wrapper_cc.pdb)
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libcef.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/chrome_elf.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/osmesa.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libEGL.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/libGLESv2.dll.pdb
${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/obj/cef/libcef_dll_wrapper_cc.pdb)
endif()
SET ( CMAKE_EXE_LINKER_FLAGS /MANIFEST:NO )
@@ -133,7 +133,7 @@ if (MSVC)
install(FILES ${CEF_SUPPORT} DESTINATION ${SIADRIVE_INSTALL_FOLDER})
install(TARGETS siadrive.api siadrive.dokan.api DESTINATION ${SIADRIVE_INSTALL_FOLDER})
install(TARGETS siadrive DESTINATION ${SIADRIVE_INSTALL_FOLDER})
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/out_2987/${CMAKE_BUILD_TYPE}_GN_x64/locales DESTINATION ${SIADRIVE_INSTALL_FOLDER})
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/CEF/chromium_git/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/locales DESTINATION ${SIADRIVE_INSTALL_FOLDER})
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/htdocs DESTINATION ${SIADRIVE_INSTALL_FOLDER})
endif()

6
build_debug_x64.cmd
View File

@@ -2,9 +2,9 @@
set ROOT=%~dp0%
pushd "%ROOT%"
set CUR_PATH=%PATH%
REM call 3rd_party\CEF\create_debug.cmd
set PATH=%CUR_PATH%
set PATH=%ROOT%..\..\bin;%PATH%
REM call 3rd_party\CEF\create.cmd Debug
set PATH=%ROOT%\bin;%ROOT%;%PATH%
mkdir build
mkdir build\debug

6
build_release_x64.cmd
View File

@@ -2,9 +2,9 @@
set ROOT=%~dp0%
pushd "%ROOT%"
set CUR_PATH=%PATH%
call 3rd_party\CEF\create_release.cmd
set PATH=%CUR_PATH%
set PATH=%ROOT%..\..\bin;%PATH%
call 3rd_party\CEF\create.cmd Release
set PATH=%ROOT%\bin;%ROOT%;%PATH%
mkdir build
mkdir build\release

1
htdocs/js/index.js
View File

@@ -20,6 +20,7 @@
setInnerText('ID_Renter_HostCount', count);
},
setEstimatedSpace: (space)=> {
setInnerText('ID_Renter_EstimatedSpace', space);
},
setUsedSpace: (space)=> {
setInnerText('ID_Renter_UsedSpace', space);

2
include/siadrive_api/siacommon.h
View File

@@ -135,7 +135,7 @@ inline static SString SiaCurrencyToGB(const SiaCurrency& value)
conv.base = 10;
conv.round = 3;
return (value / 1024.0 / 1024.0 / 1024.0).ToWString(conv);
return value.ToWString(conv);
}
class IHost

5
src/siadrive/siadriveapp.cpp
View File

@@ -301,13 +301,14 @@ void CSiaDriveApp::SiaApiRefreshCallback(CefRefPtr<CefV8Context> context, const
SiaCurrency allocatedFunds = _siaApi->GetRenter()->GetFunds();
SiaCurrency unspentFunds = _siaApi->GetRenter()->GetUnspent();
ExecuteSetter(context, renterActions, "setAllocatedFunds", SiaCurrencyToString(allocatedFunds));
ExecuteSetter(context, renterActions, "setUsedFunds", SiaCurrencyToString(allocatedFunds - unspentFunds));
ExecuteSetter(context, renterActions, "setAvailableFunds", SiaCurrencyToString(unspentFunds));
ExecuteSetter(context, renterActions, "setHostCount", SString::FromUInt64(_siaApi->GetRenter()->GetHosts()));
// Space
SiaCurrency totalUsedGb = _siaApi->GetRenter()->GetTotalUsedBytes();
SiaCurrency totalUsedGb = _siaApi->GetRenter()->GetTotalUsedBytes() ? _siaApi->GetRenter()->GetTotalUsedBytes() / (1024.0 * 1024.0 * 1024.0) : 0.0;
auto totalAvailable = (totalUsedGb / (allocatedFunds - unspentFunds)) * allocatedFunds;
auto totalRemainGb = totalUsedGb - totalAvailable;
auto totalRemainGb = totalAvailable - totalUsedGb;
ExecuteSetter(context, renterActions, "setEstimatedSpace", SiaCurrencyToGB(totalAvailable));
ExecuteSetter(context, renterActions, "setAvailableSpace", SiaCurrencyToGB(totalRemainGb));
ExecuteSetter(context, renterActions, "setUsedSpace", SiaCurrencyToGB(totalUsedGb));