[Greater-commits] r3805 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-10-13 20:30:59 +0200 (Thu, 13 Oct 2011)
New Revision: 3805

Modified:
   trunk/packaging/makeinstaller.py
Log:
Fix installation paths for greater-pre-processing


Modified: trunk/packaging/makeinstaller.py
===================================================================
--- trunk/packaging/makeinstaller.py	2011-10-13 17:09:16 UTC (rev 3804)
+++ trunk/packaging/makeinstaller.py	2011-10-13 18:30:59 UTC (rev 3805)
@@ -185,11 +185,15 @@
 
 def generate_pre_processing_dependencies():
     gpp_files = ["awk"]
-    cygwin_exectables = ["gawk", "sh", "rm", "sort", "join", "cut", "paste", "echo",
-                         "gen2shp", "dbf2txt", "txt2dbf"]
+    cygwin_exectables = ["gawk", "sh", "rm", "sort", "join", "cut",
+                        "paste", "echo", "sed"]
+    exta_executables = ["gen2shp", "dbf2txt", "txt2dbf"]
     for exc in [os.path.abspath(os.path.join(CYGWIN_PATH, "%s.exe" % name)) \
             for name in cygwin_exectables]:
         gpp_files += walk_dependencies(exc)
+    for exc in [os.path.abspath(os.path.join(ADMINTOOL_PATH, "%s.exe" % name)) \
+            for name in extra_exectables]:
+        gpp_files += exc
 
     outfiles = generate_files([CYGWIN_PATH], "gpp-dep-in.nsi", "gpp-dep-un.nsi",
                  lambda f: os.path.basename(f).lower() in gpp_files,