sqoop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cheol...@apache.org
Subject git commit: SQOOP-950: Can't build package from provided binary artifacts
Date Fri, 15 Mar 2013 17:47:19 GMT
Updated Branches:
  refs/heads/trunk b4b9920c4 -> b66a4656b


SQOOP-950: Can't build package from provided binary artifacts

(Jarcec Cecho via Cheolsoo Park)


Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/b66a4656
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/b66a4656
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/b66a4656

Branch: refs/heads/trunk
Commit: b66a4656bdfac47d33dec920002347f34400f117
Parents: b4b9920
Author: Cheolsoo Park <cheolsoo@apache.org>
Authored: Fri Mar 15 10:46:13 2013 -0700
Committer: Cheolsoo Park <cheolsoo@apache.org>
Committed: Fri Mar 15 10:46:13 2013 -0700

----------------------------------------------------------------------
 build.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sqoop/blob/b66a4656/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c097fe8..8ac3872 100644
--- a/build.xml
+++ b/build.xml
@@ -460,14 +460,13 @@
 
     <!-- move the license in trunk to a temporary location and copy
          appropriate license in the trunk, ultimately in the package. -->
-    <move file="${basedir}/LICENSE.txt" tofile="${base.src.dir}/licenses/LICENSE-TEMP.txt"/>
+    <move file="${basedir}/LICENSE.txt" tofile="${build.dir}/LICENSE-TEMP.txt"/>
     <copy file="${base.src.dir}/licenses/LICENSE-BIN.txt" tofile="${basedir}/LICENSE.txt"/>
     <!-- copy in various components of the initial source layout
          so that the redistributable can bootstrap itself. -->
     <copy todir="${dist.dir}" includeEmptyDirs="false" flatten="false">
       <fileset dir="${basedir}">
         <include name="**/*" />
-        <exclude name="src/licenses/**" />
         <exclude name="build/**" />
         <exclude name="lib/**" />
         <exclude name=".git/**" />
@@ -479,7 +478,7 @@
       </fileset>
     </copy>
     <!-- move back the license in trunk -->
-    <move file="${base.src.dir}/licenses/LICENSE-TEMP.txt" tofile="${basedir}/LICENSE.txt"/>
+    <move file="${build.dir}/LICENSE-TEMP.txt" tofile="${basedir}/LICENSE.txt"/>
 
     <!-- copy the dependency libraries from ivy into the output lib dir -->
     <mkdir dir="${dist.dir}/lib"/>


Mime
View raw message