New version

ceskaexpedice · Mar 17, 2016 · 9efe698 · 9efe698
1 parent 119090a
commit 9efe698
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/BUILD-README.txt b/BUILD-README.txt
@@ -8,16 +8,23 @@ To build search.war:
 
 gradle :search:clean :search:build
 
+To build client.war:
 
-Creating full distribution (contains rightseditor,editor,  K4 app and javadocs ):
+gradle :client:clean :client:build
 
-gradle distTar -> creates tar.gz file
-gradle distZip -> creates zip file
 
-Note: It is expected that you will have rightseditor and editor wars in your m2 repo.
+Creating full distribution (contains rightseditor,editor, K5, Client and javadocs ):
 
-Creating patch distribution (k4 app only)
+gradle zipAllJavadocs distTar -> creates tar.gz file
+gradle zipAllJavadocs distZip -> creates zip file
+gradle zipAllJavadocs -> Only javadoc documentation
+
+Note: It is expected you have rightseditor and editor wars in your m2 repo.
+
+Creating patch distribution (K5, Client, security-core only)
 
 gradle  patchDistTar
 gradle  patchDistZip
 
+
+
diff --git a/build.gradle b/build.gradle
@@ -53,16 +53,19 @@ distributions {
         // main distribution        
         main {
                 contents {
+                        from {'client/build/libs'}
                         from {'search/build/libs'}
                         from {'security-core/build/libs'}
                         from configurations.editors
                         from 'build/distributions/kramerius-javadoc.zip'
                 }
         }
 
+
         // patch distribution        
         patch {
                 contents {
+                        from {'client/build/libs'}
                         from {'search/build/libs'}
                         from {'security-core/build/libs'}
                 }
@@ -94,7 +97,7 @@ subprojects {
 
 
          group='cz.incad.kramerius'
-         version='5.3.1'
+         version='5.3.2'
 
          sourceCompatibility = 1.6
          targetCompatibility= 1.6
@@ -209,23 +212,9 @@ task zipAllJavadocs(type: Zip) {
 
 }
 
-[distZip, distTar, installDist].each() { 
-  it.dependsOn('clean',':search:build')
-};
-
-[distZip, distTar, installDist].each() { 
-	gradle.taskGraph.whenReady {taskGraph ->
-	    if (taskGraph.hasTask(it)) {
-  		it.dependsOn(zipAllJavadocs)
-	    }
-	}
+[distZip, distTar, installDist,patchDistZip,patchDistTar].each() { 
+  it.dependsOn('clean',':search:build',':client:build')
 };
 
 
 
-/*
-[distZip, distTar, installDist].each() { 
-  it.dependsOn(zipAllJavadocs)
-};*/
-
-