Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2012-09-28 15:11:33 +02:00
parent aad951e2ab c11e516b42
commit c22be52b43
5 changed files with 2812 additions and 2806 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -153,3 +153,9 @@ UnitTests/Philadelphia/Makefile.py
UnitTests/Philadelphia/Runner.cpp UnitTests/Philadelphia/Runner.cpp
.v8-build-* .v8-build-*
VC++ VC++
VisualStudio/Arango Front End Library/Debug/*
VisualStudio/Arango MRuby Library/Debug/*
VisualStudio/Arango V8 Library/Debug/*
VisualStudio/ArangoDB/Debug/*
VisualStudio/Arangod Binary/Debug/*
VisualStudio/Debug/*

2
config/js2c.sh
View File

@ -3,4 +3,4 @@ NAME=`echo $1 | sed -e 's:^\(.*/\)*js/\(.*\)\.js$:\2:' | tr "/-" "__"`
cat $1 \ cat $1 \
| sed -e 's:\(["\]\):\\\1:g' \ | sed -e 's:\(["\]\):\\\1:g' \
| awk 'BEGIN {print "static string JS_'$NAME' = " } { print " \"" $0 "\\n\"" } END { print ";"}' | awk 'BEGIN {print "static string JS_'$NAME' = string(\"\") " } { print " + \"" $0 "\\n\"" } END { print ";"}'

4430
js/server/js-ahuacatl.h
View File

File diff suppressed because it is too large Load Diff

1172
js/server/js-server.h
View File

File diff suppressed because it is too large Load Diff