fix for the release upload script

14 years ago · 232c79562c
parent 2503740153
commit 232c79562c
2 changed files with 8 additions and 8 deletions
--- a/build/PublishRelease.bat
+++ b/build/PublishRelease.bat
@ -1,5 +1,6 @@
 REM @ECHO OFF
@IF "%1" == "build" GOTO BUILD
+@IF "%1" == "fpush" GOTO FILEPUSH
@IF "%1" == "push" GOTO PUSH
 GOTO HELP

@ -23,7 +24,9 @@ goto EXIT
 hg commit -m "version %2"
 hg tag %2
 hg push
-SET GOOGLEUPLOAD=C:\Python25\python.exe %~dp0\googlecode_upload.py --project protobuf-csharp-port --user "%3" --password "%4"
+
+:FILEPUSH
+SET GOOGLEUPLOAD=python.exe %~dp0\googlecode_upload.py --project protobuf-csharp-port --user "%3" --password "%4"

 %GOOGLEUPLOAD% --labels Type-Source,Featured --summary "Version %2 source" %~dp0\%2\protobuf-csharp-port-%2-source.zip
 %GOOGLEUPLOAD% --labels Type-Executable,Featured --summary "Version %2 binaries (all configurations)" %~dp0\%2\protobuf-csharp-port-%2-full-binaries.zip
--- a/build/googlecode_upload.py
+++ b/build/googlecode_upload.py
@ -1,6 +1,4 @@
-
-<!-- saved from url=(0068)http://support.googlecode.com/svn/trunk/scripts/googlecode_upload.py -->
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"></head><body><pre style="word-wrap: break-word; white-space: pre-wrap;">#!/usr/bin/env python
+#!/usr/bin/env python
 #
 # Copyright 2006, 2007 Google Inc. All Rights Reserved.
 # Author: danderson@google.com (David Anderson)
@ -170,7 +168,7 @@ def upload_find_auth(file_path, project_name, summary, labels=None,
    tries: How many attempts to make.
  """

-  while tries &gt; 0:
+  while tries > 0:
    if user_name is None:
      # Read username if not specified or loaded from svn config, or on
      # subsequent tries.
@ -221,9 +219,9 @@ def main():
    parser.error('File summary is missing.')
  elif not options.project:
    parser.error('Project name is missing.')
-  elif len(args) &lt; 1:
+  elif len(args) < 1:
    parser.error('File to upload not provided.')
-  elif len(args) &gt; 1:
+  elif len(args) > 1:
    parser.error('Only one file may be specified.')

  file_path = args[0]
@ -248,4 +246,3 @@ def main():

 if __name__ == '__main__':
  sys.exit(main())
-</pre></body></html>