[Greater-commits] r3715 - trunk/packaging

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-27 16:30:16 +0200 (Wed, 27 Jul 2011)
New Revision: 3715

Modified:
   trunk/packaging/greater-installer.nsi
   trunk/packaging/makeinstaller.py
Log:
Package sediment database and change the way the installation is sandboxed


Modified: trunk/packaging/greater-installer.nsi
===================================================================
--- trunk/packaging/greater-installer.nsi	2011-07-27 14:21:16 UTC (rev 3714)
+++ trunk/packaging/greater-installer.nsi	2011-07-27 14:30:16 UTC (rev 3715)
@@ -130,6 +130,20 @@
   ExecDos::exec '"$INSTDIR\postgres9\bin\psql" -d greater -U greater -f \
   "$TEMP\90_grant_access.sql"' "" "$TEMP\greater_insert.log"
 
+  ; Also the sediment database?
+  push $R0
+  SectionGetFlags ${sediment_section_id} $R0
+  IntCmp $R0 0 no_sediment
+  File "defaultdata\sedimentdb.backup"
+  ExecDos::exec '"$INSTDIR\postgres9\bin\pg_restore.exe" -C -O -d postgres -U greater \
+  "$TEMP\sedimentdb.backup"' "" "$TEMP\greater_sediment_insert.log"
+  ExecDos::exec '"$INSTDIR\postgres9\bin\psql" -d greater-sediment -U greater -f \
+  "$TEMP\10_create_users.sql"' "" "$TEMP\greater_sediment_insert.log"
+  ExecDos::exec '"$INSTDIR\postgres9\bin\psql" -d greater-sediment -U greater -f \
+  "$TEMP\90_grant_access.sql"' "" "$TEMP\greater_sediment_insert.log"
+  
+  no_sediment:
+  pop $RO
   Delete "$TEMP\defaultdb.backup"
   Delete "$TEMP\10_create_users.sql"
   Delete "$TEMP\90_grant_access.sql"
@@ -237,7 +251,7 @@
   # Create new Start menu entries
   CreateDirectory "$SMPROGRAMS\${productname}"
   CreateShortCut "$SMPROGRAMS\${productname}\${productname_short} Sediment.lnk" \
-                 "$INSTDIR\GREAT-ER-Sediment\${executable}" "greater/greater at greater-sediment" \
+                 "$INSTDIR\GREAT-ER-Sediment\GREAT-ER\${executable}" "greater/greater at greater-sediment" \
                  "$INSTDIR\GREAT-ER\Resources\greater2.ico"
   no_start_menu:
 
@@ -250,8 +264,9 @@
   IntCmp $R0 0 no_desktop
   # Create new Desktop link
   CreateShortCut "$DESKTOP\${productname_short} Sediment.lnk" \
-                 "$INSTDIR\GREAT-ER-Sediment\${executable}" \
-                 "greater/greater at greater-sediment" "$INSTDIR\GREAT-ER\Resources\greater2.ico"
+                 "$INSTDIR\GREAT-ER-Sediment\GREAT-ER\${executable}" \
+                 "greater/greater at greater-sediment" \
+                 "$INSTDIR\GREAT-ER-Sediment\GREAT-ER\Resources\greater2.ico"
   no_desktop:
 
   Return

Modified: trunk/packaging/makeinstaller.py
===================================================================
--- trunk/packaging/makeinstaller.py	2011-07-27 14:21:16 UTC (rev 3714)
+++ trunk/packaging/makeinstaller.py	2011-07-27 14:30:16 UTC (rev 3715)
@@ -140,7 +140,7 @@
     return generate_files(instdirs, "client-in.nsi", "client-un.nsi", whitelist)
 
 def generate_sediment():
-    instdirs = ["GREAT-ER-Sediment", "SciParam", "Lib", "GREAT-ER-DB"]
+    instdirs = ["GREAT-ER-Sediment"]
     for idir in instdirs:
         compileall.compile_dir(idir, quiet = True)
     def whitelist(f):
@@ -152,7 +152,7 @@
         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)
+    return generate_files(instdirs, "sediment-in.nsi", "sediment-un.nsi", whitelist)
 
 def generate_serverfiles():