Author: dcreager
Date: Mon Oct 24 15:03:26 2011
New Revision: 1188164
URL: http://svn.apache.org/viewvc?rev=1188164&view=rev
Log:
AVRO-467. C: Update build system to CMake
Removed:
avro/trunk/lang/c/Makefile.am
avro/trunk/lang/c/config/
avro/trunk/lang/c/configure.in
avro/trunk/lang/c/docs/Makefile.am
avro/trunk/lang/c/examples/Makefile.am
avro/trunk/lang/c/m4/
avro/trunk/lang/c/src/Makefile.am
avro/trunk/lang/c/tests/Makefile.am
Modified:
avro/trunk/CHANGES.txt
avro/trunk/lang/c/.gitignore
avro/trunk/lang/c/build.sh
avro/trunk/lang/c/jansson/.gitignore
Modified: avro/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1188164&r1=1188163&r2=1188164&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Mon Oct 24 15:03:26 2011
@@ -43,6 +43,8 @@ Avro 1.6.0 (unreleased)
AVRO-474. C: Added source package target to CMake build scripts.
(dcreager)
+ AVRO-467. C: Change build system to CMake. (dcreager)
+
AVRO-890: Java: Add Maven archetype for creating Avro service
projects. (Stephen Gargan via cutting)
Modified: avro/trunk/lang/c/.gitignore
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/c/.gitignore?rev=1188164&r1=1188163&r2=1188164&view=diff
==============================================================================
--- avro/trunk/lang/c/.gitignore (original)
+++ avro/trunk/lang/c/.gitignore Mon Oct 24 15:03:26 2011
@@ -1,19 +1,2 @@
-.deps
-.libs
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
build
-config
-config.h
-config.h.in
-config.log
-config.status
-configure
-libtool
-stamp-h1
-*.l[ao]
-*.o
-INSTALL
cscope.*
Modified: avro/trunk/lang/c/build.sh
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/c/build.sh?rev=1188164&r1=1188163&r2=1188164&view=diff
==============================================================================
--- avro/trunk/lang/c/build.sh (original)
+++ avro/trunk/lang/c/build.sh Mon Oct 24 15:03:26 2011
@@ -9,17 +9,10 @@ version=$(./version.sh project)
tarball="avro-c-$version.tar.gz"
doc_dir="../../build/avro-doc-$version/api/c"
-function autoreconf_check {
- if [ ! -f configure ]; then
- autoreconf -f -i
- fi
-}
-
function prepare_build {
- autoreconf_check
clean
mkdir -p $build_dir
- (cd $build_dir && $root_dir/configure)
+ (cd $build_dir && cmake $root_dir -DCMAKE_BUILD_TYPE=RelWithDebInfo)
}
function clean {
@@ -45,13 +38,19 @@ case "$1" in
test)
prepare_build
- make -C $build_dir check
+ make -C $build_dir
+ make -C $build_dir test
clean
;;
dist)
prepare_build
- make -C $build_dir dist
+ make -C $build_dir docs
+ # This is a hack to force the built documentation to be included
+ # in the source package.
+ cp $build_dir/docs/*.html $root_dir/docs
+ make -C $build_dir package_source
+ rm $root_dir/docs/*.html
if [ ! -d $dist_dir ]; then
mkdir -p $dist_dir
fi
Modified: avro/trunk/lang/c/jansson/.gitignore
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/c/jansson/.gitignore?rev=1188164&r1=1188163&r2=1188164&view=diff
==============================================================================
--- avro/trunk/lang/c/jansson/.gitignore (original)
+++ avro/trunk/lang/c/jansson/.gitignore Mon Oct 24 15:03:26 2011
@@ -1,7 +1 @@
-config.guess
-config.sub
-depcomp
-install-sh
-ltmain.sh
-missing
jansson.pc
