avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r813932 - in /hadoop/avro/trunk: CHANGES.txt build.xml src/c/Makefile.am
Date Fri, 11 Sep 2009 17:25:22 GMT
Author: cutting
Date: Fri Sep 11 17:25:21 2009
New Revision: 813932

URL: http://svn.apache.org/viewvc?rev=813932&view=rev
Log:
AVRO-114.  Fix cdoc Ant target.  Contributed by Matt Massie.

Modified:
    hadoop/avro/trunk/CHANGES.txt
    hadoop/avro/trunk/build.xml
    hadoop/avro/trunk/src/c/Makefile.am

Modified: hadoop/avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/CHANGES.txt?rev=813932&r1=813931&r2=813932&view=diff
==============================================================================
--- hadoop/avro/trunk/CHANGES.txt (original)
+++ hadoop/avro/trunk/CHANGES.txt Fri Sep 11 17:25:21 2009
@@ -112,6 +112,9 @@
 
     AVRO-112.  Turn off C++ debug output.  (Scott Banachowski via cutting)
 
+    AVRO-114.  Fix "cdoc" Ant target to correctly run doxygen.
+    (Matt Massie via cutting)
+
 Avro 1.0.0 -- 9 July 2009
 
   INCOMPATIBLE CHANGES

Modified: hadoop/avro/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/build.xml?rev=813932&r1=813931&r2=813932&view=diff
==============================================================================
--- hadoop/avro/trunk/build.xml (original)
+++ hadoop/avro/trunk/build.xml Fri Sep 11 17:25:21 2009
@@ -560,10 +560,12 @@
   </target>
 
   <!-- C Targets -->
-  <target name="cdoc">
-  <exec dir="${c.src.dir}" executable="env" failonerror="true">
-     <arg line="C_DOCS_OUTPUT=${build.cdoc} make docs" />
-  </exec>
+  <target name="cdoc" depends="configure-c">
+    <mkdir dir="${build.cdoc}"/>
+    <exec dir="${c.build.dir}" executable="make" failonerror="true">
+      <env key="C_DOCS_OUTPUT" value="${build.cdoc}" />
+      <arg line="docs" />
+    </exec>
   </target>
 
   <target name="autoreconf-c-check">

Modified: hadoop/avro/trunk/src/c/Makefile.am
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/c/Makefile.am?rev=813932&r1=813931&r2=813932&view=diff
==============================================================================
--- hadoop/avro/trunk/src/c/Makefile.am (original)
+++ hadoop/avro/trunk/src/c/Makefile.am Fri Sep 11 17:25:21 2009
@@ -60,7 +60,10 @@
 	popd;
 
 docs:
-	@(cat docs/doxygen.conf; echo "OUTPUT_DIRECTORY=$(C_DOCS_OUTPUT)")| doxygen -
+	pushd $(top_srcdir); \
+	(cat docs/doxygen.conf; echo "OUTPUT_DIRECTORY=$(C_DOCS_OUTPUT)")| doxygen - ;\
+	popd;
+
 
 .PHONY: docs 
 



Mime
View raw message