[Commits] (markie) Make distributions always; upload only end-user distrib

[commits at osafoundation.org]

Commit by: markie
Modified files:
hardhat/tindertest.py 1.7 1.8

Log message:
Make distributions always; upload only end-user distrib


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/hardhat/tindertest.py.diff?r1=text&tr1=1.7&r2=text&tr2=1.8

Index: hardhat/tindertest.py
diff -u hardhat/tindertest.py:1.7 hardhat/tindertest.py:1.8
--- hardhat/tindertest.py:1.7	Tue May 11 14:46:56 2004
+++ hardhat/tindertest.py	Thu May 13 15:08:15 2004
@@ -40,21 +40,18 @@
     global buildscriptFile
     
     parser = OptionParser(usage="%prog [options] buildName", version="%prog 1.1")
-#    parser.add_option("-h", "--help", help="Print this message and options")
     parser.add_option("-t", "--toAddr", action="store", type="string", dest="toAddr",
       default="buildreport at osafoundation.org", help="Where to mail script reports\n"
       " [default] buildreport at osafoundation.org")
-#     parser.add_option("-b", "--buildName", action="store", type="string", dest="buildName",
-#       help="What identifier to use for your builds")
     parser.add_option("-p", "--project", action="store", type="string", dest="project",
       default="chandler", help="Name of script to use (without .py extension)\n"
       "[default] chandler")
     parser.add_option("-o", "--output", action="store", type="string", dest="outputDir",
       default=os.path.join(os.environ['HOME'],"output"), help="Name of temp output directory\n"
       " [default] ~/output")
-    parser.add_option("-D", "--distrib", action="store_true", dest="doDistrib",
-      default=False, help="Shall distribution archives be prepared and uploaded?\n"
-      " [default] False")
+#     parser.add_option("-D", "--distrib", action="store_true", dest="doDistrib",
+#       default=False, help="Shall distribution archives be prepared and uploaded?\n"
+#       " [default] False")
       
     (options, args) = parser.parse_args()
     if len(args) != 1:
@@ -147,26 +144,26 @@
                 print "There were changes, and the tests were successful"
                 log.write("There were changes, and the tests were successful\n")
                 status = "success"
-                if options.doDistrib:
-                    newDir = os.path.join(outputDir, buildVersion)
-                    os.rename(os.path.join(buildDir, "output"), newDir)
-                    log.write("Calling CreateIndex with " + newDir + "\n")
-                    if os.path.exists(outputDir+os.sep+"index.html"):
-                        os.remove(outputDir+os.sep+"index.html")
-                    if os.path.exists(outputDir+os.sep+"time.js"):
-                        os.remove(outputDir+os.sep+"time.js")
-                    for x in ["enduser", "developer"]:
-                        if os.path.exists(outputDir+os.sep+x+".html"):
-                            os.remove(outputDir+os.sep+x+".html")
-                    RotateDirectories(outputDir)
-                    CreateIndex(outputDir, buildVersion, nowString, buildName)
-    
-                    buildNameNoSpaces = buildName.replace(" ", "")
-                    print "Rsyncing..."
-                    outputList = hardhatutil.executeCommandReturnOutputRetry(
-                     [rsyncProgram, "-e", "ssh", "-avzp", "--delete",
-                     outputDir + os.sep, 
-                     "192.168.101.46:continuous/" + buildNameNoSpaces])
+
+                newDir = os.path.join(outputDir, buildVersion)
+                os.rename(os.path.join(buildDir, "output"), newDir)
+                log.write("Calling CreateIndex with " + newDir + "\n")
+                if os.path.exists(outputDir+os.sep+"index.html"):
+                    os.remove(outputDir+os.sep+"index.html")
+                if os.path.exists(outputDir+os.sep+"time.js"):
+                    os.remove(outputDir+os.sep+"time.js")
+                for x in ["enduser"]:      # was  ["enduser", "developer"]:
+                    if os.path.exists(outputDir+os.sep+x+".html"):
+                        os.remove(outputDir+os.sep+x+".html")
+                RotateDirectories(outputDir)
+                CreateIndex(outputDir, buildVersion, nowString, buildName)
+
+                buildNameNoSpaces = buildName.replace(" ", "")
+                print "Rsyncing..."
+                outputList = hardhatutil.executeCommandReturnOutputRetry(
+                 [rsyncProgram, "-e", "ssh", "-avzp", "--delete",
+                 outputDir + os.sep, 
+                 "192.168.101.46:continuous/" + buildNameNoSpaces])
 
             elif ret == "build_failed":
                 print "The build failed"
@@ -264,7 +261,7 @@
     fileOut = file(outputDir+os.sep+"index.html", "w")
     fileOut.write("<html><head><META HTTP-EQUIV=Pragma CONTENT=no-cache><link rel=Stylesheet href=http://www.osafoundation.org/css/OSAF.css type=text/css charset=iso-8859-1></head><body topmargin=0 leftmargin=0 marginwith=0 marginheight=0><img src=http://www.osafoundation.org/images/OSAFLogo.gif><table border=0><tr><td width=19>&nbsp;</td><td width=550>\n")
     fileOut.write("<h2>Chandler Build: " + nowString + " PDT (machine: " + buildName +")</h2>\n")
-    for x in ["enduser", "developer", "release", "debug"]:
+    for x in ["enduser"]:      # was  ["enduser", "developer"]:
         actual = _readFile(outputDir+os.sep+newDirName+os.sep+x)
         fileOut.write("<p><a href="+x+".html> "+ _descriptions[x][0] +"</a>: " + _descriptions[x][1] +"</p>\n")
         fileOut2 = file(outputDir+os.sep+x+".html", "w")