[infinispan-commits] Infinispan SVN: r1603 - trunk/bin.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-03-12 10:22:09 -0500 (Fri, 12 Mar 2010)
New Revision: 1603

Modified:
   trunk/bin/pythonTools.py
   trunk/bin/release.py
Log:
API docs archive now packages API docs in <VER_MAJOR>.<VER_MINOR>/apidocs/... rather than apidocs/... to prevent overwriting older major.minor versions of the docs.

Modified: trunk/bin/pythonTools.py
===================================================================
--- trunk/bin/pythonTools.py	2010-03-12 15:06:02 UTC (rev 1602)
+++ trunk/bin/pythonTools.py	2010-03-12 15:22:09 UTC (rev 1603)
@@ -127,3 +127,13 @@
   subprocess.check_call(["mvn", "install", "-Pjmxdoc", "-Dmaven.test.skip.exec=true"])
   subprocess.check_call(["mvn", "install", "-Pconfigdoc", "-Dmaven.test.skip.exec=true"])
   subprocess.check_call(["mvn", "deploy", "-Pdistribution", "-Dmaven.test.skip.exec=true"])
+
+def get_version_pattern(): 
+  return re.compile("^([4-9]\.[0-9])\.[0-9]\.(Final|(ALPHA|BETA|CR)[1-9][0-9]?)$", re.IGNORECASE)
+
+def get_version_major_minor(full_version):
+  pattern = get_version_pattern()
+  matcher = pattern.match(full_version)
+  return matcher.group(1)
+
+  
\ No newline at end of file

Modified: trunk/bin/release.py
===================================================================
--- trunk/bin/release.py	2010-03-12 15:06:02 UTC (rev 1602)
+++ trunk/bin/release.py	2010-03-12 15:22:09 UTC (rev 1603)
@@ -51,8 +51,8 @@
     '''
     sys.exit(0)
 
-def validateVersion(version):
-  versionPattern = re.compile("^[4-9]\.[0-9]\.[0-9]\.(Final|(ALPHA|BETA|CR)[1-9][0-9]?)$", re.IGNORECASE)
+def validateVersion(version):  
+  versionPattern = get_version_pattern()
   if versionPattern.match(version):
     return version.strip().upper()
   else:
@@ -207,13 +207,17 @@
   shutil.rmtree(".tmp", ignore_errors = True)  
 
 def uploadJavadocs(base_dir, workingDir, version):
+  version_short = get_version_major_minor(version)
+  
   os.chdir("%s/target/distribution" % workingDir)
   ## Grab the distribution archive and un-arch it
   subprocess.check_call(["unzip", "infinispan-%s-all.zip" % version])
   os.chdir("infinispan-%s/doc" % version)
   ## "Fix" the docs to use the appropriate analytics tracker ID
   subprocess.check_call(["%s/bin/updateTracker.sh" % workingDir])
-  subprocess.check_call(["tar", "zcf", "%s/apidocs-%s.tar.gz" % (base_dir, version), "apidocs"])
+  os.mkdir(version_short)
+  os.rename("apidocs", "%s/apidocs" % version_short)
+  subprocess.check_call(["tar", "zcf", "%s/apidocs-%s.tar.gz" % (base_dir, version), version_short])
   ## Upload to sourceforge
   os.chdir(base_dir)
   subprocess.check_call(["scp", "apidocs-%s.tar.gz" % version, "sourceforge_frs:"])