make devserver fix (a4ece010) · Commits · github_fork / Clip

.gitignore

+1 −0

+9 −2

Original line number	Diff line number	Diff line
		@@ -15,13 +15,20 @@ test-dbg: build-dbg
		@find build-dbg/tests -name "test-*" -exec ./{} \;

		clean:
		rm -rf build build-dbg
		rm -rf build build-dbg .dev_assets

		install: build
		(cd build/cmake && make install)

		devserver: build-dbg
		mkdir -p /tmp/fnordmetric-data
		./build-dbg/fnordmetric-server --datadir /tmp/fnordmetric-data --verbose
		rm -rf .dev_assets
		mkdir -p .dev_assets/fnord
		ln -s ../../src/libfnord/fnord-webcomponents/components .dev_assets/fnord/components
		ln -s ../../src/libfnord/fnord-webcomponents/3rdparty .dev_assets/fnord/3rdparty
		ln -s ../../src/libfnord/fnord-webcomponents/themes .dev_assets/fnord/themes
		ln -s ../../src/libfnord/fnord-webcomponents/fnord.js .dev_assets/fnord/fnord.js
		ln -s ../src/fnordmetric/webui .dev_assets/fnordmetric
		DEV_ASSET_PATH=./.dev_assets ./build-dbg/fnordmetric-server --datadir /tmp/fnordmetric-data --verbose

		.PHONY: clean build build-dbg test test-dbg clean install devserver

+1 −1

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

		fn_assets_init
		fn_assets_add "fnord/fnord.js" "src/libfnord/fnord-webcomponents/fnord.js"
		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"
		@@ -14,7 +15,6 @@ fn_assets_add "fnord/components/fn-tabbar.css" "src/libfnord/fnord-webcomponents
		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"