adminui assets (b02467f5) · Commits · github_fork / Clip

cmake/CMakeLists.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -85,9 +85,8 @@ set(FNORDMETRIC_SOURCES
		../src/fnordmetric/sql/runtime/tablescan.cc
		../src/fnordmetric/sql/svalue.cc)


		set_source_files_properties(assets PROPERTIES GENERATED true)
		add_custom_target(fnordmetric-assets COMMAND ASSETS_FILE=${CMAKE_BINARY_DIR}/fnordmetric-assets.cc ./assets.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
		add_custom_target(fnordmetric-assets COMMAND ASSETS_FILE=${CMAKE_BINARY_DIR}/fnordmetric-assets.cc ./cmake/assets.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/..)

		#add_executable(fnordmetric-cli ${FNORDMETRIC_SOURCES} ../src/fnordmetric/cli.cc)
		#target_link_libraries(fnordmetric-cli m)

cmake/assets.sh

+44 −31

Original line number	Diff line number	Diff line
		@@ -3,34 +3,47 @@ set -e
		source $(dirname $0)/../src/libfnord/fnord-base/assets.sh

		fn_assets_init
		fn_assets_add "fnord/3rdparty/codemirror.js" "src/libfnord/fnord-webcomponents/3rdparty/codemirror.js" #

		#(
		# asset_uniq "fnordmetric_webui_fnordmetric_webui_css"
		# asset_file "fnordmetric-webui/fnordmetric-webui.css"
		# asset_name "fnordmetric_webui_fnordmetric_webui_css" "fnordmetric-webui/fnordmetric-webui.css"
		#) >> stage/src/asset_bundle.cc
		#
		#(
		# asset_uniq "fnordmetric_webui_fnordmetric_webui_html"
		# asset_file "fnordmetric-webui/fnordmetric-webui.html"
		# asset_name "fnordmetric_webui_fnordmetric_webui_html" "fnordmetric-webui/fnordmetric-webui.html"
		#) >> stage/src/asset_bundle.cc
		#
		#(
		# asset_uniq "fnordmetric_webui_fnordmetric_webui_js"
		# asset_file "fnordmetric-webui/fnordmetric-webui.js"
		# asset_name "fnordmetric_webui_fnordmetric_webui_js" "fnordmetric-webui/fnordmetric-webui.js"
		#) >> stage/src/asset_bundle.cc
		#
		#(
		# asset_uniq "fnordmetric_webui_fnordmetric_favicon_ico"
		# asset_file "fnordmetric-webui/fnordmetric-favicon.ico"
		# asset_name "fnordmetric_webui_fnordmetric_favicon_ico" "fnordmetric-webui/fnordmetric-favicon.ico"
		#) >> stage/src/asset_bundle.cc
		#
		#(
		# asset_uniq "fnordmetric_webui_fontawesome_woff"
		# asset_file "fnordmetric-webui/fontawesome.woff"
		# asset_name "fnordmetric_webui_fontawesome_woff" "fnordmetric-webui/fontawesome.woff"
		#) >> stage/src/asset_bundle.cc
		fn_assets_add "fnord/3rdparty/codemirror.js" "src/libfnord/fnord-webcomponents/3rdparty/codemirror.js"
		fn_assets_add "fnord/3rdparty/fontawesome.woff" "src/libfnord/fnord-webcomponents/3rdparty/fontawesome.woff"
		fn_assets_add "fnord/3rdparty/fontawesome.css" "src/libfnord/fnord-webcomponents/3rdparty/fontawesome.css"
		fn_assets_add "fnord/3rdparty/reset.css" "src/libfnord/fnord-webcomponents/3rdparty/reset.css"
		fn_assets_add "fnord/components/fn-table.css" "src/libfnord/fnord-webcomponents/components/fn-table.css"
		fn_assets_add "fnord/components/fn-button.css" "src/libfnord/fnord-webcomponents/components/fn-button.css"
		fn_assets_add "fnord/components/fn-modal.css" "src/libfnord/fnord-webcomponents/components/fn-modal.css"
		fn_assets_add "fnord/components/fn-tabbar.css" "src/libfnord/fnord-webcomponents/components/fn-tabbar.css"
		fn_assets_add "fnord/components/fn-message.css" "src/libfnord/fnord-webcomponents/components/fn-message.css"
		fn_assets_add "fnord/components/fn-tooltip.css" "src/libfnord/fnord-webcomponents/components/fn-tooltip.css"
		fn_assets_add "fnord/themes/midnight-blue.css" "src/libfnord/fnord-webcomponents/themes/midnight-blue.css"
		fn_assets_add "fnord/fnord.js" "src/libfnord/fnord-webcomponents/fnord.js"
		fn_assets_add "fnord/components/fn-appbar.html" "src/libfnord/fnord-webcomponents/components/fn-appbar.html"
		fn_assets_add "fnord/components/fn-button.html" "src/libfnord/fnord-webcomponents/components/fn-button.html"
		fn_assets_add "fnord/components/fn-button-group.html" "src/libfnord/fnord-webcomponents/components/fn-button-group.html"
		fn_assets_add "fnord/components/fn-icon.html" "src/libfnord/fnord-webcomponents/components/fn-icon.html"
		fn_assets_add "fnord/components/fn-input.html" "src/libfnord/fnord-webcomponents/components/fn-input.html"
		fn_assets_add "fnord/components/fn-loader.html" "src/libfnord/fnord-webcomponents/components/fn-loader.html"
		fn_assets_add "fnord/components/fn-menu.html" "src/libfnord/fnord-webcomponents/components/fn-menu.html"
		fn_assets_add "fnord/components/fn-search.html" "src/libfnord/fnord-webcomponents/components/fn-search.html"
		fn_assets_add "fnord/components/fn-table.html" "src/libfnord/fnord-webcomponents/components/fn-table.html"
		fn_assets_add "fnord/components/fn-splitpane.html" "src/libfnord/fnord-webcomponents/components/fn-splitpane.html"
		fn_assets_add "fnord/components/fn-codeeditor.html" "src/libfnord/fnord-webcomponents/components/fn-codeeditor.html"
		fn_assets_add "fnord/components/fn-dropdown.html" "src/libfnord/fnord-webcomponents/components/fn-dropdown.html"
		fn_assets_add "fnord/components/fn-datepicker.html" "src/libfnord/fnord-webcomponents/components/fn-datepicker.html"
		fn_assets_add "fnord/components/fn-timeinput.html" "src/libfnord/fnord-webcomponents/components/fn-timeinput.html"
		fn_assets_add "fnord/components/fn-daterangepicker.html" "src/libfnord/fnord-webcomponents/components/fn-daterangepicker.html"
		fn_assets_add "fnord/components/fn-tabbar.html" "src/libfnord/fnord-webcomponents/components/fn-tabbar.html"
		fn_assets_add "fnord/components/fn-modal.html" "src/libfnord/fnord-webcomponents/components/fn-modal.html"
		fn_assets_add "fnord/components/fn-pager.html" "src/libfnord/fnord-webcomponents/components/fn-pager.html"
		fn_assets_add "fnord/components/fn-tooltip.html" "src/libfnord/fnord-webcomponents/components/fn-tooltip.html"
		fn_assets_add "fnord/components/fn-flexbox.html" "src/libfnord/fnord-webcomponents/components/fn-flexbox.html"
		fn_assets_add "fnordmetric/fnordmetric-app.html" "src/fnordmetric/webui/fnordmetric-app.html"
		fn_assets_add "fnordmetric/fnordmetric-console.html" "src/fnordmetric/webui/fnordmetric-console.html"
		fn_assets_add "fnordmetric/fnordmetric-metric-list.html" "src/fnordmetric/webui/fnordmetric-metric-list.html"
		fn_assets_add "fnordmetric/fnordmetric-search.html" "src/fnordmetric/webui/fnordmetric-search.html"
		fn_assets_add "fnordmetric/fnordmetric-query-editor.html" "src/fnordmetric/webui/fnordmetric-query-editor.html"
		fn_assets_add "fnordmetric/fnordmetric-metric-preview.html" "src/fnordmetric/webui/fnordmetric-metric-preview.html"
		fn_assets_add "fnordmetric/fnordmetric-controls.html" "src/fnordmetric/webui/fnordmetric-controls.html"
		fn_assets_add "fnordmetric/fnordmetric-time-controls.html" "src/fnordmetric/webui/fnordmetric-time-controls.html"
		fn_assets_add "fnordmetric/fnordmetric-webui.html" "src/fnordmetric/webui/fnordmetric-webui.html"
		fn_assets_add "fnordmetric/fnordmetric-webui.css" "src/fnordmetric/webui/fnordmetric-webui.css"
		fn_assets_add "fnordmetric/fnordmetric-webui-util.js" "src/fnordmetric/webui/fnordmetric-webui-util.js"
		fn_assets_add "fnordmetric/fnordmetric-embed-query-popup.html" "src/fnordmetric/webui/fnordmetric-embed-query-popup.html"

src/fnordmetric/adminui.cc

+0 −3

Original line number	Diff line number	Diff line
		@@ -63,9 +63,6 @@ AdminUI::AdminUI(
		webui_bundle_.addComponent("fnordmetric/fnordmetric-webui-util.js");
		webui_bundle_.addComponent(
		"fnordmetric/fnordmetric-embed-query-popup.html");
		webui_bundle_.addComponent(
		"fnordmetric-plugins/hosts/fnordmetric-plugin-hosts.html");

		}

		void AdminUI::handleHTTPRequest(

src/libfnord/fnord-base/assets.sh

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,9 @@ fn_assets_add() {
		exit 1
		fi;

		uniq=$(echo $ASSETS_FILE \| sed -e 's/[^a-zA-Z0-9]/_/g')
		uniq=$(echo $1 \| sed -e 's/[^a-zA-Z0-9]/_/g')

		echo "Packing asset: $1"

		(
		echo "static const unsigned char __${uniq}_data[] = {"

Admin message