hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ent...@apache.org
Subject incubator-hawq git commit: Move ivy.xml for qpopt inside apache-hawq for better dependency management
Date Fri, 11 Dec 2015 18:26:08 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 9b65a5adc -> 5be1e7e30


Move ivy.xml for qpopt inside apache-hawq for better dependency management

Originally, we have ivy.xml managed separately from apache-hawq, and caused inconsistency
between HAWQ and optimizer components.
With this fix, we can change the dependency the same time we change the HAWQ code, hence reduce
failures due to inconsistent dependencies.

Closes #182.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/5be1e7e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/5be1e7e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/5be1e7e3

Branch: refs/heads/master
Commit: 5be1e7e30feb05da945b56400463fd0607529c6c
Parents: 9b65a5a
Author: Entong Shen <shenentong@gmail.com>
Authored: Fri Dec 11 10:25:02 2015 -0800
Committer: Entong Shen <shenentong@gmail.com>
Committed: Fri Dec 11 10:25:02 2015 -0800

----------------------------------------------------------------------
 src/backend/gpopt/ivy-build.xml | 69 ++++++++++++++++++++++++++++++++++++
 src/backend/gpopt/ivy.xml       | 25 +++++++++++++
 2 files changed, 94 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5be1e7e3/src/backend/gpopt/ivy-build.xml
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/ivy-build.xml b/src/backend/gpopt/ivy-build.xml
new file mode 100644
index 0000000..a9e5fba
--- /dev/null
+++ b/src/backend/gpopt/ivy-build.xml
@@ -0,0 +1,69 @@
+<project name="cdb3" default="resolve" xmlns:ivy="antlib:org.apache.ivy.ant">
+
+  <!-- ================================================================ -->
+  <!-- This file is used to support retrieving the appropriate Pivotal  -->
+  <!-- Optimizer versioned files (header and libraries).  It is only    -->
+  <!-- used for commercial builds and can otherwise be ignored.         -->
+  <!-- ================================================================ -->
+
+  <target name="resolve" if="BLD_ARCH">
+    <ivy:settings file="${BLD_TOP}/build-utils/dependencies/ivysettings.xml"/>
+    <ivy:resolve conf="${BLD_ARCH}"
+                 log="download-only"/>
+  </target>
+
+  <target name="clean">
+    <ivy:cleancache />
+  </target>
+
+
+  <target name="post-resolve-trigger">
+    <echo>
+      ======================================================================
+        Post Resolve Trigger
+      ======================================================================
+      
+      organisation=${dep.organisation}
+      module=${dep.module}
+      revision=${dep.revision}
+      platform=${BLD_ARCH}      
+
+    </echo>
+
+   <exec executable="${BLD_TOP}/build-utils/dependencies/ivy.sh">
+    <arg value="${dep.module}"/>
+    <arg value="${dep.revision}"/>
+    <arg value="${dep.organisation}"/>
+    <arg value="${BLD_ARCH}"/>
+  </exec>
+
+  </target>
+
+  <target name="download-untar-trigger">
+    <echo>
+======================================================================
+  Post download artifact
+======================================================================
+    organisation=${dep.organisation}
+    module=${dep.module}
+    revision=${dep.revision}
+    artifact=${dep.artifact}
+    origin=${dep.origin}
+    local=${dep.local}
+    size=${dep.size}</echo>
+
+  <exec executable="${BLD_TOP}/build-utils/dependencies/ivy_util.sh">
+    <arg value="${dep.file}"/>
+    <arg value="${dep.revision}"/>
+  </exec>
+
+   <exec executable="${BLD_TOP}/build-utils/dependencies/ivy.sh">
+    <arg value="${dep.module}"/>
+    <arg value="${dep.revision}"/>
+    <arg value="${dep.organisation}"/>
+    <arg value="${BLD_ARCH}"/>
+  </exec>
+
+  </target>
+  
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/5be1e7e3/src/backend/gpopt/ivy.xml
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/ivy.xml b/src/backend/gpopt/ivy.xml
new file mode 100644
index 0000000..749b905
--- /dev/null
+++ b/src/backend/gpopt/ivy.xml
@@ -0,0 +1,25 @@
+<ivy-module version="2.0">
+    <info organisation="Pivotal"
+          module="hawq" />
+
+    <!-- ================================================================ -->
+    <!-- This file is used to support retrieving the appropriate Pivotal  -->
+    <!-- Optimizer versioned files (header and libraries).  It is only    -->
+    <!-- used for commercial builds and can otherwise be ignored.         -->
+    <!-- ================================================================ -->
+
+    <configurations>
+      <conf name="osx105_x86"    description="osx105_x86"    visibility="public"/>
+      <conf name="osx106_x86"    description="osx106_x86"    visibility="public"/>
+      <conf name="osx106_x86_32" description="osx106_x86_32" visibility="public"/>
+      <conf name="rhel5_x86_64"  description="rhel5_x86_64"  visibility="public"/>
+      <conf name="rhel6_x86_64"  description="rhel6_x86_64"  visibility="public"/>
+      <conf name="suse10_x86_64" description="suse10_x86_64" visibility="public"/>
+    </configurations>
+
+    <dependencies>
+      <dependency org="emc"             name="optimizer"       rev="1.614"          conf="osx106_x86->osx106_x86_32;osx106_x86_32->osx106_x86_32;rhel5_x86_64->rhel5_x86_64;suse10_x86_64->suse10_x86_64"
/>
+      <dependency org="emc"             name="libgpos"         rev="1.131"          conf="osx106_x86->osx106_x86_32;osx106_x86_32->osx106_x86_32;rhel5_x86_64->rhel5_x86_64;suse10_x86_64->suse10_x86_64"
/>
+      <dependency org="xerces"          name="xerces-c"        rev="3.1.1-p1"       conf="osx106_x86->osx106_x86_32;osx106_x86_32->osx106_x86_32;rhel5_x86_64->rhel5_x86_64;suse10_x86_64->suse10_x86_64"
/>
+    </dependencies>
+</ivy-module>


Mime
View raw message