From a2375a26fe64883a664e37c6668ffabd0f91ab4f Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 19 Apr 2012 23:34:48 +0000 Subject: [PATCH] RM Build Scripts: * Reorganised parent and child property files so same values reused * Added build number to properties (included on artifact names) * Added simple root project task to bundle AMP's into zip for distribution (ready for QA) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@35444 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- build.gradle | 24 +++++++++++++++++++++--- gradle.properties | 6 ++++-- rm-server/gradle.properties | 3 --- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 892d57931b..fb03a8f61a 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,25 @@ task wrapper(type: Wrapper) { gradleVersion = '1.0-milestone-8' } +task packageBuild (dependsOn: [':rm-server:amp', ':rm-share:amp']) << { + + distDir = file('dist') + if (distDir.exists() == false) { + distDir.mkdirs(); + } + + packageBaseName = "${groupid}-${packageName}-${version}-${build}" + packageZipFile = "${packageBaseName}.zip" + alfrescoAmp = "${project(':rm-server').name}/${project(':rm-server').buildDistDir}/${project(':rm-server').ampFile}" + shareAmp = "${project(':rm-share').name}/${project(':rm-share').buildDistDir}/${project(':rm-share').ampFile}" + + ant.zip(destfile: "${distDir}/${packageZipFile}", update: 'true') { + + ant.zipfileset(file: "${alfrescoAmp}") + ant.zipfileset(file: "${shareAmp}") + } +} + /** Subproject configuration */ subprojects { @@ -36,7 +55,7 @@ subprojects { configModuleDir = "config/alfresco/module/${moduleid}" moduleProperties = 'module.properties' fileMapping = 'file-mapping.properties' - baseName = "${groupid}-${appName}-${version}" + baseName = "${groupid}-${appName}-${version}-${build}" jarFile = "${baseName}.jar" ampFile = "${baseName}.amp" tomcatRoot = System.getenv(tomcatEnv) @@ -223,8 +242,7 @@ subprojects { if (sourceWebObj.exists() == true) { copy { from sourceWebObj - into "${explodedWebAppDir}" - + into "${explodedWebAppDir}" } } } diff --git a/gradle.properties b/gradle.properties index 294e20b6e8..a9ec5c46df 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,4 @@ -DIR_WAR=war -DIR_LIBS=war/WEB-INF/lib \ No newline at end of file +groupid=alfresco +packageName=rm +version=2.0.0 +build=1 \ No newline at end of file diff --git a/rm-server/gradle.properties b/rm-server/gradle.properties index 258a2334ac..1e54abeeba 100644 --- a/rm-server/gradle.properties +++ b/rm-server/gradle.properties @@ -1,7 +1,4 @@ -groupid=alfresco appName=rm -version=2.0 - moduleid=org_alfresco_module_rm webAppName=alfresco