[Greater-commits] r3786 - trunk/packaging
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Oct 6 15:14:05 CEST 2011
Author: aheinecke
Date: 2011-10-06 15:14:04 +0200 (Thu, 06 Oct 2011)
New Revision: 3786
Modified:
trunk/packaging/makeinstaller.py
Log:
Change to new installation layout
Modified: trunk/packaging/makeinstaller.py
===================================================================
--- trunk/packaging/makeinstaller.py 2011-10-05 10:20:15 UTC (rev 3785)
+++ trunk/packaging/makeinstaller.py 2011-10-06 13:14:04 UTC (rev 3786)
@@ -112,7 +112,7 @@
fptr.write(output)
def generate_clientfiles():
- instdirs = ["GREAT-ER", "GREAT-ERModel", "GREAT-ER-DB"]
+ instdirs = ["GREAT-ER-Cefic"]
for idir in instdirs:
compileall.compile_dir(idir, quiet = True)
def whitelist(f):
@@ -126,8 +126,9 @@
return True
return generate_files(instdirs, "client-in.nsi", "client-un.nsi", whitelist)
-def generate_sediment():
- instdirs = ["GREAT-ER-Sediment"]
+def generate_commonfiles():
+ instdirs = ["Lib", "python", "sciparam",
+ "Thuban", "GREAT-ER-DB"]
for idir in instdirs:
compileall.compile_dir(idir, quiet = True)
def whitelist(f):
@@ -139,14 +140,10 @@
if "GREAT-ER-DB" in f and not "GreaterDB" in f:
return False
return True
- return generate_files(instdirs, "sediment-in.nsi", "sediment-un.nsi", whitelist)
+ return generate_files(instdirs, "common-in.nsi", "common-un.nsi", whitelist)
-def generate_serverfiles():
-
- pass
-
-def generate_usf():
- instdirs = ["GREAT-ER-USF"]
+def generate_sediment():
+ instdirs = ["GREAT-ER-Sediment"]
for idir in instdirs:
compileall.compile_dir(idir, quiet = True)
def whitelist(f):
@@ -158,7 +155,7 @@
if "GREAT-ER-DB" in f and not "GreaterDB" in f:
return False
return True
- return generate_files(instdirs, "usf-in.nsi", "usf-un.nsi", whitelist)
+ return generate_files(instdirs, "sediment-in.nsi", "sediment-un.nsi", whitelist)
def walk_dependencies(executable):
""" Returns a list of all the files the executable depends on
@@ -197,6 +194,16 @@
prefix_subdir("greater-pre-processing\\bin", outfiles)
return outfiles
+def generate_python():
+ instdirs = ["python"]
+ def whitelist(f):
+ for bad in [".svn", "test_", ".log"]:
+ if bad in f:
+ return False
+ if os.path.basename(f).startswith("."):
+ return False
+ return True
+ return generate_files(instdirs, "python-in.nsi", "python-un.nsi", whitelist)
def join_files(input, output):
open(output, "a").write("\r\n" + open(input, "r").read())
@@ -228,10 +235,12 @@
INSTALLER_OPTIONS["client-un"]) = generate_clientfiles()
(INSTALLER_OPTIONS["admin-in"],
INSTALLER_OPTIONS["admin-un"]) = generate_administration()
+ (INSTALLER_OPTIONS["common-in"],
+ INSTALLER_OPTIONS["common-un"]) = generate_common()
(INSTALLER_OPTIONS["sediment-in"],
INSTALLER_OPTIONS["sediment-un"]) = generate_sediment()
- (INSTALLER_OPTIONS["usf-in"],
- INSTALLER_OPTIONS["usf-un"]) = generate_usf()
+ (INSTALLER_OPTIONS["python-in"],
+ INSTALLER_OPTIONS["python-un"]) = generate_python()
# INSTALLER_OPTIONS["allfiles"],
# INSTALLER_OPTIONS["un-allfiles"] = generate_allfiles()
More information about the Greater-commits
mailing list