SWE-22 / SP-641: branching / tagging of project 'base'

SVN: 29104

branch.sh

@@ -12,7 +12,7 @@ svn checkout --depth=empty svn+ssh://svncisd.ethz.ch/repos/cisd/base/branches/$1
 cd out/temp_checkout
 svn update gradlew gradle build.gradle
 ./gradlew dependencyReport
-cat out/reports/project/dependencies.txt|egrep ^.---|awk '{print $2}'|sort|uniq|egrep -v ^$|awk -F: '{print "s/" $1 ":" $2 ":+/" $1 ":" $2 ":" $3 "/g"}' > sed_commands
+cat out/reports/project/dependencies.txt|egrep ^.---|grep \>|sort|uniq|awk '{print $2 ":" $4}'|awk -F: '{print "s/" $1 ":" $2 ":" $3 "/" $1 ":" $2 ":" $4 "/g"}' > sed_commands
 sed -f sed_commands build.gradle > build.gradle.tmp
 mv build.gradle.tmp build.gradle
 svn commit build.gradle -m "fixed dependencies for branch $1"

build.gradle

@@ -12,22 +12,26 @@ dependencies {
 
 
 group="cisd"
-version="UNSPECIFIED_VERSION"
-
-if (version.equals("UNSPECIFIED_VERSION")) {
-	new ByteArrayOutputStream().withStream { os ->
-	    def result = exec {
-	        executable = 'svn'
-	        args = ['info']
-	        standardOutput = os
-	    }
-	    def outputAsString = os.toString()
-	    def matchLastChangedRev = outputAsString =~ /Last Changed Rev: (\d+)/
-	    project.version = "r${matchLastChangedRev[0][1]}"
+new ByteArrayOutputStream().withStream { os ->
+    def result = exec {
+        executable = 'svn'
+        args = ['info']
+        standardOutput = os
+    }
+    def outputAsString = os.toString()
+    def matchLastChangedRevMatcher = outputAsString =~ /Last Changed Rev: (\d+)/
+    def urlMatcher = outputAsString =~ /URL: .*\/(.+)/
+
+	def revision = "r${matchLastChangedRevMatcher[0][1]}"
+	def branch = urlMatcher[0][1]
+	
+	if (branch.equals('trunk')) {
+		project.version = revision
+	} else {
+		project.version = branch
 	}
 }
 
-
 publishing {
     publications {
     	ivy(IvyPublication) {

tag.sh

@@ -5,13 +5,5 @@ if [ $? -ne 0 ]; then echo "Branch does not exist!"; exit 1; fi
 svn info svn+ssh://svncisd.ethz.ch/repos/cisd/base/tags/$1/$2 2>/dev/null
 if [ $? -eq 0 ]; then echo "Tag already exists!"; exit 1; fi
 
+svn mkdir --parents svn+ssh://svncisd.ethz.ch/repos/cisd/base/tags/$1 -m "create tag folders $1/$2"
 svn copy svn+ssh://svncisd.ethz.ch/repos/cisd/base/branches/$1 svn+ssh://svncisd.ethz.ch/repos/cisd/base/tags/$1/$2 -m "create tag $1/$2"
-mkdir -p out
-rm -r out/temp_checkout
-svn checkout --depth=empty svn+ssh://svncisd.ethz.ch/repos/cisd/base/tags/$1/$2 out/temp_checkout
-cd out/temp_checkout
-svn update build.gradle
-sed -e "s/version=\"UNSPECIFIED_VERSION\"/version=\"$2\"/" build.gradle > build.gradle.tmp
-mv build.gradle.tmp build.gradle
-#svn commit build.gradle -m "fixed version for tag $1/$2"
-cd ../..