You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by dc...@apache.org on 2012/05/20 16:29:16 UTC

svn commit: r1340736 - in /avro/trunk: CHANGES.txt lang/c/cmake_avrolib.bat lang/c/cmake_avrolib.sh

Author: dcreager
Date: Sun May 20 14:29:15 2012
New Revision: 1340736

URL: http://svn.apache.org/viewvc?rev=1340736&view=rev
Log:
AVRO-1091. C: Helper scripts for calling CMake on Windows and Linux.

Contributed by Vivek Nadkarni.

Added:
    avro/trunk/lang/c/cmake_avrolib.bat
    avro/trunk/lang/c/cmake_avrolib.sh   (with props)
Modified:
    avro/trunk/CHANGES.txt

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1340736&r1=1340735&r2=1340736&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Sun May 20 14:29:15 2012
@@ -107,6 +107,9 @@ Avro 1.7.0 (unreleased)
     AVRO-1092. C: Error management code can be defined in a thread-safe
     manner.  (Pugachev Maxim and Vivek Nadkarni via dcreager)
 
+    AVRO-1091. C: Helper scripts for calling CMake.
+    (Vivek Nadkarni via dcreager)
+
 Avro 1.6.3 (5 March 2012)
 
     AVRO-1077. Missing 'inline' for union set function. (thiru)

Added: avro/trunk/lang/c/cmake_avrolib.bat
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/cmake_avrolib.bat?rev=1340736&view=auto
==============================================================================
--- avro/trunk/lang/c/cmake_avrolib.bat (added)
+++ avro/trunk/lang/c/cmake_avrolib.bat Sun May 20 14:29:15 2012
@@ -0,0 +1,31 @@
+echo off
+
+REM Set up the solution file in Windows. 
+
+set my_cmake_path="put_your_cmake_path_here"
+set cmake_path_win7="C:\Program Files (x86)\CMake 2.8\bin\cmake.exe"
+set cmake_path_xp="C:\Program Files\CMake 2.8\bin\cmake.exe"
+
+if exist %my_cmake_path% (
+   set cmake_path=%my_cmake_path%
+   goto RUN_CMAKE
+)
+
+if exist %cmake_path_win7% (
+   set cmake_path=%cmake_path_win7%
+   goto RUN_CMAKE
+)
+
+if exist %cmake_path_xp% (
+   set cmake_path=%cmake_path_xp%
+   goto RUN_CMAKE
+)
+
+echo "Set the proper cmake path in the variable 'my_cmake_path' in cmake_windows.bat, and re-run"
+goto EXIT_ERROR
+
+:RUN_CMAKE
+%cmake_path% -G"Visual Studio 9 2008" -H. -Bbuild_win32
+
+
+:EXIT_ERROR

Added: avro/trunk/lang/c/cmake_avrolib.sh
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/cmake_avrolib.sh?rev=1340736&view=auto
==============================================================================
--- avro/trunk/lang/c/cmake_avrolib.sh (added)
+++ avro/trunk/lang/c/cmake_avrolib.sh Sun May 20 14:29:15 2012
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+mkdir -p build
+cd build
+cmake .. -DCMAKE_INSTALL_PREFIX=avrolib -DCMAKE_BUILD_TYPE=Debug
+make
+make test
+make install
+mkdir -p avrolib/lib/static
+cp avrolib/lib/libavro.a avrolib/lib/static/libavro.a

Propchange: avro/trunk/lang/c/cmake_avrolib.sh
------------------------------------------------------------------------------
    svn:executable = *