[Greater-commits] r376 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-07 17:49:51 +0200 (Thu, 07 Jul 2011)
New Revision: 376

Modified:
   trunk/packaging/greater-installer.nsi
   trunk/packaging/makeinstaller.py
Log:
Improvements to python banners and some better filtering in makeinstaller


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-07-07 14:47:31 UTC (rev 375)
+++ trunk/packaging/greater-installer.nsi	2011-07-07 15:49:51 UTC (rev 376)
@@ -97,7 +97,7 @@
 ;Installer Sections
 
 Section "PostgreSQL 9.0.4" SecPostgreSQL
-  Banner::show /NOUNLOAD /set 76 "PostgreSQL" "installing..." "" 
+  Banner::show /NOUNLOAD /set 76 "Installing..." "PostgreSQL 9.0.4" "" 
   SetOutPath "$TEMP"
   File "postgresql-9.0.4-1-windows.exe" ; Should be more generalized
   DetailPrint "Installing PostgreSQL..."
@@ -107,7 +107,7 @@
 SectionEnd
 
 Section "Python 2.7.2" SecPython
-  Banner::show /NOUNLOAD /set 76 "Python" "installing..." "" 
+  Banner::show /NOUNLOAD /set 76 "Installing..." "Python 2.7.2" "" 
   SetOutPath "$TEMP"
   File "python-2.7.2.msi" ; Should be more generalized
   DetailPrint "Installing Python..."

Modified: trunk/packaging/makeinstaller.py
===================================================================
--- trunk/packaging/makeinstaller.py	2011-07-07 14:47:31 UTC (rev 375)
+++ trunk/packaging/makeinstaller.py	2011-07-07 15:49:51 UTC (rev 376)
@@ -124,9 +124,13 @@
 def generate_clientfiles():
     instdirs = ["GREAT-ER", "GREAT-ERModel", "GREAT-ER-DB"]
     def whitelist(f):
-        for bad in [".svn", "postgres", ".pyc"]:
+        for bad in [".svn"]:
             if bad in f:
                 return False
+        if os.path.basename(f).startswith("."):
+            return False
+        if "GREAT-ER-DB" in f and not "GreaterDB" in f:
+            return False
         return True
     return generate_files(instdirs, "client-in.nsi", "client-un.nsi", whitelist)