BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

Mount support and other stuff

Browse Source
This commit is contained in:
Scott E. Graves
2017-03-22 13:52:41 -05:00
parent 2e3730b3d1
commit 2a78c522be
7 changed files with 61 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -254,3 +254,5 @@ ModelManifest.xml
3rd_party/CEF/depot_tools
/3rd_party/CEF/depot_tools.zip
/dist
/config
/3rd_party/CEF/depot_tools

1
3rd_party/CEF/depot_tools vendored

Submodule 3rd_party/CEF/depot_tools deleted from 7a1f04d377

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/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)
${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)
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/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)
${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)
file(GLOB CEF_SUPPORT
${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)
${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)
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/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)
${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)
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/chromium/src/out/${CMAKE_BUILD_TYPE}_GN_x64/locales 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}/htdocs DESTINATION ${SIADRIVE_INSTALL_FOLDER})
endif()

19
build_common.cmd Normal file
View File

@@ -0,0 +1,19 @@
@echo off
set ROOT=%~dp0%
set PATH=%ROOT%bin;%PATH%
pushd "%ROOT%"
wget --no-check-certificate https://cmake.org/files/v3.7/cmake-3.7.2-win64-x64.zip || goto :ERROR
unzip -o -q -d bin\ cmake-3.7.2-win64-x64.zip || goto :ERROR
del /q cmake-3.7.2-win64-x64.zip || goto :ERROR
goto :END
:ERROR
pause
popd
exit 1
:END
popd

7
build_debug_x64.cmd
View File

@@ -2,13 +2,16 @@
set ROOT=%~dp0%
pushd "%ROOT%"
call build_common.cmd
set CMAKE=%ROOT%bin\cmake-3.7.2-win64-x64\bin\cmake
REM call 3rd_party\CEF\create.cmd Debug
mkdir build
mkdir build\debug
pushd build\debug
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Debug -DSIADRIVE_INSTALL_FOLDER="%ROOT%dist\Debug" ..\..
cmake --build . --config Debug && cmake --build . --target install --config Debug
%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Debug -DSIADRIVE_INSTALL_FOLDER="%ROOT%dist\Debug" ..\..
%CMAKE% --build . --config Debug && %CMAKE% --build . --target install --config Debug
popd
pause

7
build_release_x64.cmd
View File

@@ -2,13 +2,16 @@
set ROOT=%~dp0%
pushd "%ROOT%"
call build_common.cmd
set CMAKE=%ROOT%bin\cmake-3.7.2-win64-x64\bin\cmake
call 3rd_party\CEF\create.cmd Release
mkdir build
mkdir build\release
pushd build\release
cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Release -DSIADRIVE_INSTALL_FOLDER="%ROOT%dist\Release" ..\..
cmake --build . --config Release && cmake --build . --config Release --target install
%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=Release -DSIADRIVE_INSTALL_FOLDER="%ROOT%dist\Release" ..\..
%CMAKE% --build . --config Release && %CMAKE% --build . --config Release --target install
popd
pause

17
src/siadrive/siadriveapp.cpp
View File

@@ -172,11 +172,6 @@ CSiaDriveApp::CSiaDriveApp()
hostConfig.RequiredVersion = COMPAT_SIAD_VERSION;
_siaCurl.reset(new CSiaCurl(hostConfig));
_siaApi.reset(new CSiaApi(hostConfig, _siaDriveConfig.get()));
#ifdef _WIN32
_siaDrive.reset(new Dokan::CSiaDokanDrive(*_siaApi, _siaDriveConfig.get()));
#else
a
#endif
}
void CSiaDriveApp::ExecuteSetter(CefRefPtr<CefV8Context> context, CefRefPtr<CefV8Value> obj, const SString& method, const SString& value)
@@ -278,8 +273,11 @@ void CSiaDriveApp::OnContextReleased(CefRefPtr<CefBrowser> browser, CefRefPtr<Ce
{
_refreshThread->StopAutoThread();
_refreshThread.reset(nullptr);
_siaDrive->Unmount();
_siaDrive.reset(nullptr);
if (_siaDrive)
{
_siaDrive->Unmount();
_siaDrive.reset(nullptr);
}
}
}
@@ -300,6 +298,11 @@ void CSiaDriveApp::SiaApiRefreshCallback(CefRefPtr<CefV8Context> context, const
}
else if (_appStarted)
{
#ifdef _WIN32
_siaDrive.reset(new Dokan::CSiaDokanDrive(*_siaApi, _siaDriveConfig.get()));
#else
a
#endif
auto uiActions = global->GetValue("uiUpdate");
auto renterActions = uiActions->GetValue("Renter");
auto walletActions = uiActions->GetValue("Wallet");