[wwwsearch-commits] r18436 - wwwsearch/release_scripts

[jjlee at codespeak.net]

Author: jjlee
Date: Wed Oct 12 00:35:15 2005
New Revision: 18436

Modified:
   wwwsearch/release_scripts/cfrelease.py
   wwwsearch/release_scripts/mrelease.py
   wwwsearch/release_scripts/pprelease.py
Log:
Various release script changes

Modified: wwwsearch/release_scripts/cfrelease.py
==============================================================================
--- wwwsearch/release_scripts/cfrelease.py	(original)
+++ wwwsearch/release_scripts/cfrelease.py	Wed Oct 12 00:35:15 2005
@@ -15,36 +15,35 @@
 NAME = "ClientForm"
 
 def main():
-    tag, version, branch = getargs(sys.argv)
+    tag, version, branch, revision = getargs(sys.argv)
 
     if tag:
-        maketag(version, REPOSITORY_URL, NAME, branch)
+        maketag(version, REPOSITORY_URL, NAME, branch, revision, pretend=0)
         sys.exit()
 
     os.system("svn co %s/%s/%s %s" % (REPOSITORY_URL, NAME, branch, NAME))
 
     os.system("svn co %s/www" % REPOSITORY_URL)
     os.system("svn co %s/%s/common" % (REPOSITORY_URL, NAME))
-    os.system("cp www/GeneralFAQ.html common/ChangeLog %s" % NAME)
+    os.system("em.py www/GeneralFAQ.html.in > www/GeneralFAQ.html")
+    os.system("cp www/GeneralFAQ.html %s" % NAME)
+    os.system("cp common/ChangeLog %s/ChangeLog.txt" % NAME)
 
     release_dir = "%s-%s" % (NAME, version)
     os.mkdir(release_dir)
     os.chdir(NAME)
-    if "0.0." not in version:
-        os.system("em.py README.html.in > README.html")
+    os.system("em.py README.html.in > README.html")
     bad_files = check_versions(
-        [NAME+".py", "ChangeLog", "README.html"], version)
+        [NAME+".py", "ChangeLog.txt", "README.html"], version)
     if bad_files:
         sys.exit("version doesn't match in %s" % " ".join(bad_files))
-    bad_files = check_date(["README.html"])
-    if bad_files:
-        sys.exit("missing or incorrect date in %s" % " ".join(bad_files))
     os.system("lynx -dump README.html > README.txt")
     os.system("cp README.html ../%s/README-%s.html" % (
         release_dir, win_version(version)))
-    os.system("cp ChangeLog ../%s/ChangeLog.txt" % release_dir)
-    os.system("rm MANIFEST")
+    os.system("cp ChangeLog.txt ../%s/ChangeLog.txt" % release_dir)
     os.system("cp ../www/GeneralFAQ.html ../%s/" % release_dir)
+    os.system("em.py setup.py.in > setup.py")
+    os.system("chmod +x setup.py")
     os.system("python setup.py sdist --formats=gztar,zip")
     os.chdir("dist")
     distutils_zip = "%s-%s.zip" % (NAME, version)
@@ -61,8 +60,7 @@
     os.system("rm -rf %s" % release_dir)
 
     os.chdir(NAME)
-    for py in ("python2.3", "python2.2", "python2.1", "python2.0",
-               "python1.5"):
+    for py in ("python2.3", "python2.2", "python2.1", "python2.0"):
         os.system("%s test.py" % py)
 
 main()

Modified: wwwsearch/release_scripts/mrelease.py
==============================================================================
--- wwwsearch/release_scripts/mrelease.py	(original)
+++ wwwsearch/release_scripts/mrelease.py	Wed Oct 12 00:35:15 2005
@@ -36,9 +36,6 @@
         version)
     if bad_files:
         sys.exit("version doesn't match in %s" % " ".join(bad_files))
-    bad_files = check_date(["README.html"])
-    if bad_files:
-        sys.exit("missing or incorrect date in %s" % " ".join(bad_files))
     os.system("lynx -dump README.html > README.txt")
     os.system("cp README.html ../%s/README-%s.html" % (
         release_dir, win_version(version)))
@@ -61,7 +58,7 @@
     os.system("rm -rf %s" % release_dir)
 
     os.chdir(NAME)
-    for py in ("python2.3", "python2.2"):
+    for py in ("python2.4", "python2.3", "python2.2"):
         os.system("%s test.py" % py)
 
 main()

Modified: wwwsearch/release_scripts/pprelease.py
==============================================================================
--- wwwsearch/release_scripts/pprelease.py	(original)
+++ wwwsearch/release_scripts/pprelease.py	Wed Oct 12 00:35:15 2005
@@ -40,9 +40,6 @@
         ["%s.py" % NAME, "README.html"], version)
     if bad_files:
         sys.exit("version doesn't match in %s" % " ".join(bad_files))
-    bad_files = check_date(["README.html"])
-    if bad_files:
-        sys.exit("missing or incorrect date in %s" % " ".join(bad_files))
     os.system("lynx -dump README.html > README.txt")
     os.system("cp README.html ../%s/README-%s.html" % (
         release_dir, win_version(version)))
@@ -64,7 +61,7 @@
     os.system("rm -rf %s" % release_dir)
 
     os.chdir(NAME)
-    for py in ("python2.3", "python2.2"):
+    for py in ("python2.4", "python2.3", "python2.2"):
         os.system("%s test.py" % py)
 
 main()