From 962dd91e0aba054528aaeb2d8c6431d6527b94a5 Mon Sep 17 00:00:00 2001 From: zeners Date: Tue, 3 May 2016 19:02:07 +0200 Subject: [PATCH] webui: include files on first clean build update website-title to 6 --- libresapi/src/libresapi.pro | 7 ++----- libresapi/src/webui-src/app/assets/index.html | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libresapi/src/libresapi.pro b/libresapi/src/libresapi.pro index a0d840754..a909b5551 100644 --- a/libresapi/src/libresapi.pro +++ b/libresapi/src/libresapi.pro @@ -22,11 +22,8 @@ unix { webui_img_files.files = ../../retroshare-gui/src/gui/images/logo/logo_splash.png INSTALLS += webui_img_files - #create_webfiles.commands = sh $$_PRO_FILE_PWD_/webui-src/make-src/build.sh $$_PRO_FILE_PWD_ - #QMAKE_EXTRA_TARGETS += create_webfiles - #POST_TARGETDEPS += create_webfiles - - #QMAKE_POST_LINK=sh $$_PRO_FILE_PWD_/webui-src/make-src/build.sh $$_PRO_FILE_PWD_ + # create dummy files, we need it to include files on first try + system(webui-src/make-src/init.sh .) WEBUI_SRC_SCRIPT = webui-src/make-src/build.sh diff --git a/libresapi/src/webui-src/app/assets/index.html b/libresapi/src/webui-src/app/assets/index.html index 438ac876d..fe0fba64a 100644 --- a/libresapi/src/webui-src/app/assets/index.html +++ b/libresapi/src/webui-src/app/assets/index.html @@ -2,7 +2,7 @@ - rswebui5 + rswebui6 @@ -14,9 +14,9 @@ var ui = require("main"); var main = document.getElementById("main"); ui.init(main); - if (m.initControl != undefined) { - m.initControl.focus(); - } + if (m.initControl != undefined) { + m.initControl.focus(); + } }