Merge branch 'master' of makar:/var/www/git/pgfw

pgfw/Setup.py

@@ -86,12 +86,16 @@ class Setup:
         return translation
 
     def setup(self, windows=[], options={}):
+	print "running setup..."
         self.remove_old_mainfest()
         config = self.config.get_section("setup")
+	scripts = []
+	if config["init-script"]:
+	    scripts.append(config["init-script"])
         setup(cmdclass={"install": insert_resources_path},
               name=self.translate_title(),
               packages=self.build_package_list(),
-              scripts=[config["init-script"]],
+              scripts=scripts,
               data_files=self.build_data_map(),
               requires=config["requirements"],
               version=config["version"],
@@ -102,7 +106,9 @@ class Setup:
               platforms=config["platforms"],
               author=config["contact-name"],
               author_email=config["contact-email"],
-              url=config["url"])
+              url=config["url"],
+	      windows=windows,
+	      options=options)
 
 
 class insert_resources_path(install):

pgfw/SetupWin.py

@@ -24,10 +24,12 @@ class SetupWin(Setup):
 
     def setup(self):
         config = self.config.get_section("setup")
-        Setup.setup(self,
-                    [{"script": config["init-script"],
-                      "icon_resources": [(1, config["icon-path"])]
-                      }],
+	windows = [{}]
+	if config["init-script"]:
+	    windows[0]["script"] = config["init-script"]
+	if config["icon-path"]:
+	    windows[0]["icon-resources"] = [(1, config["icon-path"])] 
+        Setup.setup(self, windows,
                     {"py2exe": {"packages": self.build_package_list(),
                                 "dist_dir": config["windows-dist-path"]}})
         rmtree("build")