Updated build for deb and rpm

kairosdb · Nov 3, 2015 · 60b90eb · 60b90eb
1 parent fad4e6e
commit 60b90eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/build.groovy b/build.groovy
@@ -49,7 +49,7 @@ saw.setProperty(PomRule.URL_PROPERTY, "http://kairosdb.org")
 saw = Tablesaw.getCurrentTablesaw()
 saw.includeDefinitionFile("definitions.xml")
 
-ivyConfig = ["default", "test"]
+ivyConfig = ["provided", "test"]
 
 rpmDir = "build/rpm"
 rpmNoDepDir = "build/rpm-nodep"
@@ -72,7 +72,7 @@ jp = new JavaProgram()
 		.setup()
 
 jc = jp.getCompileRule()
-jc.addDepend(ivy.getResolveRule("default"))
+jc.addDepend(ivy.getResolveRule("provided"))
 
 jc.getDefinition().set("target", "1.6")
 jc.getDefinition().set("source", "1.6")
@@ -212,7 +212,7 @@ gzipRule = new GZipRule("package").setSource(tarRule.getTarget())
 
 //------------------------------------------------------------------------------
 //Build rpm file
-rpmBaseInstallDir = "/opt/$programName"
+rpmBaseInstallDir = "/opt/kairosdb"
 rpmRule = new SimpleRule("package-rpm").setDescription("Build RPM Package")
 		.addDepend(jp.getJarRule())
 		.addDepend(resolveIvyFileSetRule)
@@ -250,7 +250,6 @@ def doRPM(Rule rule)
 	for (AbstractFileSet fs in libFileSets)
 		addFileSetToRPM(rpmBuilder, "$rpmBaseInstallDir/lib", fs)
 
-	addFileSetToRPM(rpmBuilder, "$rpmBaseInstallDir/bin", scriptsFileSet)
 
 	rpmBuilder.addFile("$rpmBaseInstallDir/conf/kairos-carbon.properties",
 			new File("src/main/resources/kairos-carbon.properties"), 0644, new Directive(Directive.RPMFILE_CONFIG | Directive.RPMFILE_NOREPLACE))

diff --git a/ivy.xml b/ivy.xml
@@ -1,12 +1,13 @@
 
 <ivy-module version="2.0">
 	<info organisation="kairosd.org" module="kairos-carbon"/>
-	<configurations defaultconf="default" defaultconfmapping="default->*;test->*" >
+	<configurations defaultconf="default" defaultconfmapping="default->*;test->*;provided->*" >
 		<conf name="default"/>
-		<conf name="test" extends="default"/>
+		<conf name="test" extends="provided"/>
+		<conf name="provided" extends="default"/>
 	</configurations>
 	<dependencies>
-		<dependency org="org.kairosdb" name="kairosdb" rev="0.9.4-5" />
+		<dependency org="org.kairosdb" name="kairosdb" rev="0.9.4-5" conf="provided->default" />
 		<!--<dependency org="com.sun.jersey" name="jersey-servlet" rev="1.15" transitive="false"/>-->
 
 		<!--<dependency org="org.spark-project" name="pyrolite" rev="2.0.1" />-->