98032e2b89
* Added UUIDs to `ts_entry` records. Updated `ts_json:construct_record` to
respond to `uuid` member properties if present. UUIDs are not required by the
strict parsing functions in `ts_json` because the client will make a request
with no UUID if it is a purely new timestamp. IN fact, this is the normal
case. The UUID is only present when another tool is syncing its copy of this
timeline wand adding entries that it has created and assigned UUIDs to.
* `ts_entry:new` will create a UUID for a new entry if it does not already have
one.
* Restructured the build process to put all build artifacts into a dedicated
`build` subdirectory, instead of mising them in an amongst the source code.
* Added the `uuid` module to the project. It can be found at
https://gitorious.org/avtobiff/erlang-uuid
* Rewrote asset URLs to use relative paths instead of absolute paths. Relative
paths are correct in this case, becuase assets always live alongside the HTML
pages. This change was needed to accomodate the new organization of the JDB
Labs dev environment, where all projects live under subdirectories of the
same virtual server instead of subdomains.
* Tweaked the timestamp entry fields in the web UI to save when the field is
blurred, not just when <Enter> or <Ctrl>-<Enter> is pressed (though those
still work).
59 lines
1.3 KiB
Makefile
59 lines
1.3 KiB
Makefile
MODS = $(wildcard src/*.erl)
|
|
BEAMS = $(MODS:src/%.erl=build/ebin/%.beam)
|
|
TEST_MODS = $(wildcard test/*.erl)
|
|
TEST_BEAMS = $(TEST_MODS:test/%.erl=build/test/%.beam)
|
|
TS_ROOT=/usr/local/var/yaws/jdb-labs.com/timestamper
|
|
CWD = `pwd`
|
|
|
|
default: build
|
|
|
|
all : compile test
|
|
|
|
compile : init $(BEAMS)
|
|
|
|
compile-test : init $(TEST_BEAMS)
|
|
|
|
test : start-test-server run-test stop-test-server
|
|
|
|
test-shell : compile compile-test config-yaws-dev
|
|
@echo Starting an interactive YAWS shell with test paths loaded.
|
|
@yaws -i --pa build/ebin --pa build/test --id test_inst
|
|
|
|
run-test : compile compile-test config-yaws-dev
|
|
@erl -pa ./build/ebin -pa ./build/test -run timestamper_api_tests test -run init stop -noshell
|
|
|
|
start-test-server :
|
|
@yaws -D --id test_inst
|
|
|
|
stop-test-server :
|
|
@yaws --stop --id test_inst
|
|
|
|
clean:
|
|
rm -rf build
|
|
|
|
init:
|
|
-mkdir -p build/ebin
|
|
|
|
build/ebin/%.beam : src/%.erl
|
|
erlc -W -o build/ebin $<
|
|
|
|
build/test/%.beam : test/%.erl
|
|
@echo Compiling sources...
|
|
erlc -W -o build/test $<
|
|
|
|
build: compile
|
|
-mkdir -p build/include
|
|
cp -r www build
|
|
cp lib/* build/ebin
|
|
cp src/ts_db_records.hrl build/include
|
|
cp yaws.prod.conf build/yaws.conf
|
|
|
|
deploy: compile
|
|
@service yaws stop
|
|
@echo Removing existing artifacts.
|
|
- @rm -r $(TS_ROOT)
|
|
@echo Copying current artifacts.
|
|
@cp -r build $(TS_ROOT)
|
|
@service yaws start
|
|
@echo Done.
|