diff --git build.properties build.properties index fd61db1..0556b79 100644 --- build.properties +++ build.properties @@ -71,13 +71,31 @@ jasperc.test.jar=${hadoop.root}/lib/jetty-ext/jasper-compiler.jar jsp.test.jar=${hadoop.root}/lib/jetty-ext/jsp-api.jar common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar -# module names needed for build process -iterate.hive.all=ant,shims,common,serde,metastore,hcatalog,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils -iterate.hive.modules=shims,common,serde,metastore,hcatalog,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils -iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,hcatalog,odbc,serde,service -iterate.hive.thrift=ql,service,metastore,hcatalog,serde -iterate.hive.protobuf=ql -iterate.hive.cpp=odbc +build.profile=full + +#full profile +iterate.hive.full.all=ant,shims,common,serde,metastore,hcatalog,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils +iterate.hive.full.modules=shims,common,serde,metastore,hcatalog,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils +iterate.hive.full.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,hcatalog,odbc,serde,service +iterate.hive.full.thrift=ql,service,metastore,hcatalog,serde +iterate.hive.full.protobuf=ql +iterate.hive.full.cpp=odbc + +#core profile +iterate.hive.core.all=ant,shims,common,serde,metastore,ql,cli,builtins +iterate.hive.core.modules=shims,common,serde,metastore,ql,cli,builtins +iterate.hive.core.tests=ql +iterate.hive.core.thrift=ql +iterate.hive.core.protobuf=ql +iterate.hive.core.cpp= + +#hcat profile +iterate.hive.hcat.all=hcatalog +iterate.hive.hcat.modules=hcatalog +iterate.hive.hcat.tests=hcatalog +iterate.hive.hcat.thrift=hcatalog +iterate.hive.hcat.protobuf= +iterate.hive.hcat.cpp= # # Test Properties diff --git build.xml build.xml index 80913eb..63fa4ac 100644 --- build.xml +++ build.xml @@ -59,6 +59,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -70,12 +111,6 @@ - - - - - - @@ -235,10 +270,6 @@ depends="init" description="Build CPP artifacts" > - - You must set thrift.home to the absolute path of your - local Thrift installation. - @@ -469,18 +500,18 @@ - - - - - - - + + + + + + + - + @@ -511,22 +542,32 @@ - - - - - + + + + + + + + + + - - - - - + + + + + + + + + + diff --git ql/build.xml ql/build.xml index 09600ff..a27bd75 100644 --- ql/build.xml +++ ql/build.xml @@ -82,19 +82,24 @@ logDirectory="${test.log.dir}/clientpositive" hadoopVersion="${hadoopVersion}"/> - + + + + + + diff --git ql/ivy.xml ql/ivy.xml index 51a3a38..e542a69 100644 --- ql/ivy.xml +++ ql/ivy.xml @@ -36,6 +36,12 @@ conf="test->default" transitive="false"/> + + + +