Fixed several issues affecting win32 builds

Author: eminence

builder.py

@@ -182,21 +182,21 @@ def _checkBuildTools(self):
         #    raise Exception("Don't know where 7z is")
 
     def filename(self):
-        desc = b.getDesc()
+        desc = self.getDesc()
         zipname = "%s-%s.zip" % (self.platform, desc)
         return zipname
 
     def package(self):
         zipname = self.filename()
-        return b.zip(root="dist", archive=zipname)
+        return self.zip(root="dist", archive=zipname)
 
     def zip(self, root, archive):
         old_cwd = os.getcwd()
         print "old_cwd: ", old_cwd
         os.chdir(root)
         try:
             self.popen("zip", [self.zipper, "a", archive, "."])
-            if not os.path.exists(os.path.join(root,archive)):
+            if not os.path.exists(archive):
                 print "something went wrong, the archive dosn'et exist"
                 raise Exception("something went wrong.  the archive doesn't exist")
         finally:

uploader.py

@@ -28,14 +28,15 @@ def __init__(self):
         try:
             import boto
         except ImportError:
+            import sys
             sys.path.append(r"c:\devel\boto")
             import boto
 
         from boto.s3.connection import S3Connection
         from boto.s3.key import Key
 
         self.conn = S3Connection('1QWAVYJPN7K868CEDZ82')
-        self.bucket = conn.get_bucket("minecraft-overviewer")
+        self.bucket = self.conn.get_bucket("minecraft-overviewer")
 
     def check_exists(self, path):
         k = self.bucket.get_key(path)
@@ -47,7 +48,7 @@ def get_url(self, path):
         return "https://s3.amazonaws.com/minecraft-overviewer/%s" % path
 
     def upload(self, path, srcfile):
-        k = bucket.new_key(path)
+        k = self.bucket.new_key(path)
         options = {}
         if path.endswith(".txt"):
             options['headers'] = {'Content-Type': 'text/plain'}