diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ef5ce6e3..0ab05c76 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -200,7 +200,7 @@ if(BUILD_GUI) set_property(TARGET Zano PROPERTY FOLDER "prog") set_target_properties(Zano PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/gui/qt-daemon/Info.plist.in) - set(HTML_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gui/qt-daemon/html) + set(HTML_DIR ${CMAKE_CURRENT_SOURCE_DIR}/gui/qt-daemon/layout/html) set_target_properties(Zano PROPERTIES VS_DEBUGGER_COMMAND_ARGUMENTS "--html-path=${HTML_DIR}") set(CMAKE_AUTOMOC OFF) diff --git a/utils/build_script_linux.sh b/utils/build_script_linux.sh index 6a0454b0..9ffb1d54 100755 --- a/utils/build_script_linux.sh +++ b/utils/build_script_linux.sh @@ -73,7 +73,7 @@ echo $version_str rm -rf Zano; mkdir -p Zano; -rsync -a ../../src/gui/qt-daemon/html ./Zano --exclude less --exclude package.json --exclude gulpfile.js +rsync -a ../../src/gui/qt-daemon/layout/html ./Zano --exclude less --exclude package.json --exclude gulpfile.js cp -Rv ../../utils/Zano.sh ./Zano chmod 777 ./Zano/Zano.sh mkdir ./Zano/lib diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index 33509376..b9b989db 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -89,7 +89,7 @@ fi -rsync -a ../../../src/gui/qt-daemon/html Zano.app/Contents/MacOS --exclude less --exclude package.json --exclude gulpfile.js +rsync -a ../../../src/gui/qt-daemon/layout/html Zano.app/Contents/MacOS --exclude less --exclude package.json --exclude gulpfile.js if [ $? -ne 0 ]; then echo "Failed to cp html to MacOS" exit 1 diff --git a/utils/build_script_windows.bat b/utils/build_script_windows.bat index 6c87d54c..0567963c 100644 --- a/utils/build_script_windows.bat +++ b/utils/build_script_windows.bat @@ -121,7 +121,7 @@ IF %ERRORLEVEL% NEQ 0 ( @echo "Add html" cd %SOURCES_PATH%\src\gui\qt-daemon\ -zip -x html/package.json html/gulpfile.js html/less/* -r %build_zip_path% html +zip -x layout/html/package.json layout/html/gulpfile.js layout/html/less/* -r %build_zip_path% html IF %ERRORLEVEL% NEQ 0 ( goto error ) diff --git a/utils/setup_64.iss b/utils/setup_64.iss index ff06e817..e4a7e88a 100644 --- a/utils/setup_64.iss +++ b/utils/setup_64.iss @@ -56,7 +56,7 @@ Root: HKCR; Subkey: "ZanoWalletDataKyesFile\DefaultIcon"; ValueType: string; Val [Files] Source: "{#BinariesPath}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs ignoreversion overwritereadonly replacesameversion -Source: "..\src\gui\qt-daemon\html\*"; DestDir: "{app}\html"; Flags: ignoreversion recursesubdirs ignoreversion overwritereadonly replacesameversion +Source: "..\src\gui\qt-daemon\layout\html\*"; DestDir: "{app}\html"; Flags: ignoreversion recursesubdirs ignoreversion overwritereadonly replacesameversion Source: "{#BinariesPath}\vc_redist.x64.exe"; DestDir: {tmp}; Flags: deleteafterinstall Source: "../resources/installer_bg_*.bmp"; Excludes: "*313.bmp"; Flags: dontcopy ; NOTE: Don't use "Flags: ignoreversion" on any shared system files