89 Commits

Author SHA1 Message Date
Pieter Noordhuis
f742e4a9ba First set defaults, then do composition 2012-04-13 17:52:33 -07:00
Pieter Noordhuis
15fd1bc04a Question mark assignment is not needed 2012-04-13 17:52:33 -07:00
Pieter Noordhuis
77e0138ff3 The lcov target shouldn't clean
This is not needed because every change in compiler/linker flags
triggers a cleanup.
2012-04-13 17:52:30 -07:00
Pieter Noordhuis
18bb9b5d82 Rename ADD_*FLAGS -> REDIS_*FLAGS, REDIS_*FLAGS -> FINAL_*FLAGS
This reflects that REDIS_*FLAGS will only be used for compilation of
Redis and not for its dependencies. Similarly, that FINAL_*FLAGS are
composed of other variables and holds the options that are finally
passed to the compiler and linker.
2012-04-13 17:34:31 -07:00
antirez
9edfc484e4 A few var names fixed in Makefile.
I modified it for error in a previous commit doing search & replace.
2012-04-13 16:13:56 +02:00
antirez
3ee2833956 Make gcov fixed. 2012-04-12 11:51:58 +02:00
antirez
f709a2a369 Makefile now introduces Redis-specific CFLAGS / LDFLAGS. Gcov target fixed. Added comments to describe how it works. 2012-04-12 11:09:38 +02:00
antirez
eab775f1e7 make dep: redirect output to Makefile.dep. 2012-04-11 12:12:05 +02:00
Pieter Noordhuis
b866abc78e Clean up Makefiles
Remove unused variables. Instead of overriding non-standard variables
such as ARCH and PROF, use standard variables CFLAGS and LDFLAGS to
override Makefile settings. Move dependencies generated by `make dep` to
a separate file.
2012-04-11 11:24:17 +02:00
antirez
04c1bc9106 For coverage testing use exit() instead of _exit() when termiating saving children. 2012-04-07 12:11:23 +02:00
Premysl Hruby
081f0c32ee add support for generation of lcov coverage reports 2012-04-05 12:23:35 +02:00
antirez
618b51c6a6 CRC64 implementation added to Redis code base. 2012-04-02 12:31:44 +02:00
antirez
26330d4a06 First implementation of --test-memory. Still a work in progress. 2012-03-16 17:17:39 +01:00
antirez
b1839bd367 Build dependencies updated. 2012-03-10 12:40:03 +01:00
antirez
eb3d93fd27 add -f flag to cp when installing, otherwise stopping the server is
needed when installing a new Redis version. Thanks to Scott Kevill.
Fixes issue #335.
2012-02-14 16:15:24 +01:00
antirez
9a68f79cd5 endian.c/h -> endianconv.c/h to avoid issues with broken libraries search paths. 2012-02-14 16:11:46 +01:00
antirez
3fcae1cc78 A few small BSD related fixes. 2012-02-08 22:24:59 +01:00
Pieter Noordhuis
860acb386c Don't force rebuild when params didn't change 2011-11-16 17:49:06 +01:00
Pieter Noordhuis
e679a81c9a Rebuild source when allocator changes
To do so, the Makefile stores the contents of the MALLOC environment
variable in a file named .make-malloc. When the contents of this file
and the MALLOC variable are not equal, it forces a rebuild of the Redis
source tree.

A side-effect of this change is that choosing an allocator can now be
done using the single MALLOC variable instead of USE_TCMALLOC,
USE_JEMALLOC and so forth. These variables continue to work for
backwards compatibility.
2011-11-15 13:09:34 -08:00
Pieter Noordhuis
f3220a5b88 Rebuild deps/ and src/ when ARCH changes
This change moves the build instructions for dependencies to a separate
Makefile in deps/. The ARCH environment variable is stored in a
.make-arch file in the same directory as the Makefile. The contents of
this file is read and compared to the current ARCH, and, on a mismatch
triggers rebuilding the entire source tree.

When file .make-arch exists and matches with ARCH from the environment,
the dependencies are assumed to already be built.

The new "clean" target only cleans the Redis source tree, not its
dependencies. To clear the dependencies as well, the "distclean" target
can be used.
2011-11-15 12:41:35 -08:00
Pieter Noordhuis
03720c888d Use CCLINK as last argument 2011-11-15 09:39:38 -08:00
Pieter Noordhuis
cc037c7317 CCLINK already includes ALLOC_LINK 2011-11-15 09:36:13 -08:00
antirez
12bcfcfe07 32bit build fixed, broken by a previous commit fixing build on Solaris 2011-11-08 21:00:52 +01:00
Ben Noordhuis
71e9fdbc10 build: fix sunos build, compile lua with __C99FEATURES__=1 2011-10-30 03:20:00 +00:00
antirez
154fe41066 Revert "Use the new install script as make install target. Message about install script requiring root changed a bit to make it more evident."
After talking with Pieter he changed my mind about this, it is better to
have a simpler install script that works everywhere, and the complex one
can be always executed if needed by hand. We'll make possibly a new
target for the full featured installation script, and even suggest it
after a Make install.

This reverts commit 51154dc772039fe633427e61d17b828d648329ff.
2011-10-03 16:04:44 +02:00
antirez
51154dc772 Use the new install script as make install target. Message about install script requiring root changed a bit to make it more evident. 2011-10-03 13:28:54 +02:00
antirez
66b7c21fc7 Lua math.random and math.randomseed replaced with our own version based on redisSrand48(). Seed initialized to the same value at every EVAL/EVALSHA call. 2011-09-23 15:40:58 +02:00
antirez
148e45be5b libc neutral random function derived from a drand48() implementation added. Will be used to replace Lua's math.random implementation. 2011-09-23 14:51:48 +02:00
antirez
dbdf74ddfd merge conflicts resolved 2011-09-22 15:15:26 +02:00
antirez
a9f573488e debug message removed 2011-09-13 16:53:33 +02:00
antirez
0f68818d30 bio.o added to redis-server objects 2011-09-13 15:59:48 +02:00
Pieter Noordhuis
4c83707648 Wait for Lua to be built before linking redis-server 2011-07-27 14:47:02 +02:00
antirez
c386123f1e Added a 'runtest' script that is responsible to check if Tcl is available and run the test. This is invoked from Makefile as well. 2011-07-15 17:20:57 +02:00
antirez
0570fc34c9 top level Makefile now just a proxy. Doing make clean inside src now does a full clean including deps, not just Redis source. Thanks to Pieter for the top level Makefile proxy trick. 2011-07-13 19:15:22 +02:00
antirez
5a925e2bec when building redis-server use LINK and not CC as prefix in the output 2011-07-12 12:58:32 +02:00
antirez
335b27ecd0 master branch merged into scripting. 2011-07-12 12:39:16 +02:00
antirez
8bad9ed751 make test depends on redis-check-aof as well. 2011-07-11 14:48:45 +02:00
antirez
09ebe29c54 removed --file argument from test invocation inside Makefile 2011-07-11 13:46:09 +02:00
antirez
fe8419b789 use tclsh8.5 not only in which but also in the actual test execution. 2011-07-11 11:18:46 +02:00
antirez
2b9d6036e1 explicitly use tclsh8.5 to run the test 2011-07-11 11:17:05 +02:00
antirez
75e3a07c9c First implementation of the slow log feature 2011-06-30 13:27:32 +02:00
antirez
4d0e1714f0 unstable merge conflicts resolved 2011-06-25 12:29:24 +02:00
antirez
3184279daf Merge remote branch 'origin/unstable' into unstable 2011-06-25 12:22:59 +02:00
antirez
59f09141f5 diskstore removed 2011-06-25 12:22:03 +02:00
Salvatore Sanfilippo
b270078ef6 Merge pull request #63 from djanowski/tcl
Add warning when `tcl` is not available to run tests
2011-06-24 09:59:37 -07:00
Damian Janowski
bd2ceed7e8 Avoid bug reports when Tcl is not installed. 2011-06-24 13:56:06 -03:00
antirez
41c7059eea Makefile deps updated 2011-06-20 11:58:54 +02:00
antirez
a1a9431bab It is now possible to build with: make 32bit USE_JEMALLOC=yes 2011-06-20 11:54:57 +02:00
antirez
f1912d5f09 Added -ldl when linking against jemalloc, needed on Linux 2011-06-20 11:54:35 +02:00
antirez
6d5108627a Makefile modified to build with jemalloc 2011-06-20 11:52:15 +02:00