Release scripts: docs are no longer part of the repo

- don't copy the files to release_path when building the release
- remove options to exclude files or docs when uploading the release,
  since the file can only upload files now

2 files changed, 4 insertions, 41 deletions

diff --git a/scripts/buildrelease.py b/scripts/buildrelease.py
index 9b126bce..658733aa 100755
--- a/scripts/buildrelease.py
+++ b/scripts/buildrelease.py
@@ -244,14 +244,6 @@ def main():
         shell=True
     )
 
-    print "Copying documentation"
-    docs = path.join(release_path, "docs")
-    shutil.rmtree(docs, ignore_errors=True)
-    shutil.copytree(
-        path.join(release_tmp_dir, "docs"),
-        path.join(release_path, "docs")
-    )
-
     if cleanup:
         print "Deleting working directories"
         shutil.rmtree(release_tmp_dir)
diff --git a/scripts/uploadrelease.py b/scripts/uploadrelease.py
index 04e13ed9..5b295cbb 100755
--- a/scripts/uploadrelease.py
+++ b/scripts/uploadrelease.py
@@ -15,12 +15,11 @@ import sys
 
 # Directories and files to exclude from release tarballs
 sf_files = "frs.sourceforge.net:/home/frs/project/adodb/"
-sf_doc = "web.sourceforge.net:/home/project-web/adodb/htdocs/"
 rsync_cmd = "rsync -vP --rsh ssh {opt} {src} {usr}@{dst}"
 
 # Command-line options
-options = "hfdn"
-long_options = ["help", "files", "doc", "dry-run"]
+options = "hn"
+long_options = ["help", "dry-run"]
 
 
 def usage():
@@ -36,8 +35,6 @@ def usage():
 
     Options:
         -h | --help             Show this usage message
-        -f | --files            Upload release files only
-        -d | --doc              Upload documentation only
         -n | --dry-run          Do not upload the files
 ''' % (
         path.basename(__file__)
@@ -121,8 +118,6 @@ def process_command_line():
         sys.exit(1)
 
     # Default values for flags
-    upload_files = True
-    upload_doc = True
     dry_run = False
 
     for opt, val in opts:
@@ -130,12 +125,6 @@ def process_command_line():
             usage()
             sys.exit(0)
 
-        elif opt in ("-f", "--files"):
-            upload_doc = False
-
-        elif opt in ("-d", "--doc"):
-            upload_files = False
-
         elif opt in ("-n", "--dry-run"):
             dry_run = True
 
@@ -163,37 +152,19 @@ def upload_release_files():
     print
     call_rsync(
         username,
-        "--exclude=docs",
+        "",
         path.join(release_path, "*"),
         target
     )
 
 
-def upload_documentation():
-    ''' Upload documentation to Sourceforge web site
-    '''
-    print
-    print "Uploading documentation..."
-    print
-    call_rsync(
-        username,
-        "",
-        path.join(release_path, "docs", "*"),
-        sf_doc
-    )
-
-
 def main():
     process_command_line()
 
     # Start upload process
     print "ADOdb release upload script"
 
-    if upload_files:
-        upload_release_files()
-
-    if upload_doc:
-        upload_documentation()
+    upload_release_files()
 
 #end main()