hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1077475 - in /hadoop/common/branches/branch-0.20-security-patches: build.xml src/c++/jsvc/build.sh src/c++/jsvc/build.xml src/c++/jsvc/commons-daemon-1.0.2-src.tar.gz
Date Fri, 04 Mar 2011 04:18:53 GMT
Author: omalley
Date: Fri Mar  4 04:18:52 2011
New Revision: 1077475

URL: http://svn.apache.org/viewvc?rev=1077475&view=rev
Log:
commit 92effbf44e7212d81f30501d73d675ae098cbc8f
Author: Jitendra Nath Pandey <jitendra@sufferhome-lm.(none)>
Date:   Tue May 18 18:21:06 2010 -0700

    HDFS-1150 building jsvc from source tar.

Added:
    hadoop/common/branches/branch-0.20-security-patches/src/c++/jsvc/build.xml
    hadoop/common/branches/branch-0.20-security-patches/src/c++/jsvc/commons-daemon-1.0.2-src.tar.gz
  (with props)
Removed:
    hadoop/common/branches/branch-0.20-security-patches/src/c++/jsvc/build.sh
Modified:
    hadoop/common/branches/branch-0.20-security-patches/build.xml

Modified: hadoop/common/branches/branch-0.20-security-patches/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/build.xml?rev=1077475&r1=1077474&r2=1077475&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/build.xml (original)
+++ hadoop/common/branches/branch-0.20-security-patches/build.xml Fri Mar  4 04:18:52 2011
@@ -179,9 +179,6 @@
   <!-- jsvc properties set here -->
   <property name="c++.jsvc.src" 
     value="${basedir}/src/c++/jsvc" />
-  <property name="build.c++.jsvc"
-    value="${build.c++}/jsvc" />
-  <property name="jsvc.install.dir" value="${dist.dir}/bin" />
 	
   <!-- IVY properteis set here -->
   <property name="ivy.dir" location="ivy" />
@@ -2260,14 +2257,13 @@
   <!-- end of task-controller targets -->
 
   <!-- jsvc targets -->
-  <target name="jsvc">
-    <mkdir dir="${build.c++.jsvc}" />
-    <exec executable="sh" dir="${build.c++.jsvc}"
-        failonerror="yes">
-        <arg value="${c++.jsvc.src}/build.sh" />
-    </exec>
-    <copy file="${build.c++.jsvc}/jsvc" todir="${jsvc.install.dir}" 
-        verbose="true" />
+  <target name="jsvc" if="compile.c++">
+    <subant target="jsvc">
+      <property name="c++.jsvc.src" value="${c++.jsvc.src}" />
+      <property name="build.c++.jsvc" value="${build.c++}/jsvc" />
+      <property name="jsvc.install.dir" value="${dist.dir}/bin" /> 
+      <fileset file="${c++.jsvc.src}/build.xml"/>
+    </subant>
   </target>
 
 </project>

Added: hadoop/common/branches/branch-0.20-security-patches/src/c++/jsvc/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/c%2B%2B/jsvc/build.xml?rev=1077475&view=auto
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/c++/jsvc/build.xml (added)
+++ hadoop/common/branches/branch-0.20-security-patches/src/c++/jsvc/build.xml Fri Mar  4
04:18:52 2011
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<project name="hadoopjsvc" default="compile">
+
+  <property name="jsvc.version" value="1.0.2" />
+  <property name="jsvc.tar.ball" value="commons-daemon-${jsvc.version}-src.tar.gz" />
+  <property name="jsvc.src.code.dir" value="commons-daemon-${jsvc.version}-src/src/native/unix"
/>
+
+  <target name="jsvc">
+    <mkdir dir="${build.c++.jsvc}" />
+
+    <untar src="${c++.jsvc.src}/${jsvc.tar.ball}" compression="gzip" dest="${build.c++.jsvc}"
/>
+
+    <exec executable="sh" dir="${build.c++.jsvc}/${jsvc.src.code.dir}"
+        failonerror="yes">
+        <arg value="support/buildconf.sh" />
+    </exec>
+
+    <exec executable="sh" dir="${build.c++.jsvc}/${jsvc.src.code.dir}"
+        failonerror="yes">
+        <arg value="configure" />
+    </exec>
+
+    <exec executable="make" dir="${build.c++.jsvc}/${jsvc.src.code.dir}"
+        failonerror="yes">
+        <arg value="clean" />
+    </exec>
+
+    <exec executable="make" dir="${build.c++.jsvc}/${jsvc.src.code.dir}"
+        failonerror="yes">
+    </exec>
+
+    <copy file="${build.c++.jsvc}/${jsvc.src.code.dir}/jsvc" todir="${jsvc.install.dir}"
+        verbose="true" />
+    <chmod perm="ugo+x" type="file">
+      <fileset file="${jsvc.install.dir}/jsvc"/>
+    </chmod>
+  </target>
+
+</project>

Added: hadoop/common/branches/branch-0.20-security-patches/src/c++/jsvc/commons-daemon-1.0.2-src.tar.gz
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/c%2B%2B/jsvc/commons-daemon-1.0.2-src.tar.gz?rev=1077475&view=auto
==============================================================================
Binary file - no diff available.

Propchange: hadoop/common/branches/branch-0.20-security-patches/src/c++/jsvc/commons-daemon-1.0.2-src.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message