diff options
Diffstat (limited to 'utils/common')
-rwxr-xr-x | utils/common/deploy-themeeditor.py | 1 | ||||
-rwxr-xr-x | utils/common/deploy.py | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/utils/common/deploy-themeeditor.py b/utils/common/deploy-themeeditor.py index 566c04d68d..c769d924fa 100755 --- a/utils/common/deploy-themeeditor.py +++ b/utils/common/deploy-themeeditor.py | |||
@@ -48,7 +48,6 @@ else: | |||
48 | # (zip on w32, tar.bz2 on Linux). Does not apply on Mac which uses dmg. | 48 | # (zip on w32, tar.bz2 on Linux). Does not apply on Mac which uses dmg. |
49 | deploy.programfiles = [ deploy.progexe ] | 49 | deploy.programfiles = [ deploy.progexe ] |
50 | deploy.nsisscript = "utils/themeeditor/themeeditor.nsi" | 50 | deploy.nsisscript = "utils/themeeditor/themeeditor.nsi" |
51 | deploy.nsissetup = "utils/themeeditor/rbthemeeditor-setup.exe" | ||
52 | 51 | ||
53 | deploy.deploy() | 52 | deploy.deploy() |
54 | 53 | ||
diff --git a/utils/common/deploy.py b/utils/common/deploy.py index ae3817f284..662a104e34 100755 --- a/utils/common/deploy.py +++ b/utils/common/deploy.py | |||
@@ -70,7 +70,6 @@ progexe = "" | |||
70 | make = "make" | 70 | make = "make" |
71 | programfiles = [] | 71 | programfiles = [] |
72 | nsisscript = "" | 72 | nsisscript = "" |
73 | nsissetup = "" | ||
74 | 73 | ||
75 | svnserver = "" | 74 | svnserver = "" |
76 | # Paths and files to retrieve from svn when creating a tarball. | 75 | # Paths and files to retrieve from svn when creating a tarball. |
@@ -257,7 +256,15 @@ def runnsis(versionstring, nsis, srcfolder): | |||
257 | print "NSIS failed!" | 256 | print "NSIS failed!" |
258 | return -1 | 257 | return -1 |
259 | setupfile = program + "-" + versionstring + "-setup.exe" | 258 | setupfile = program + "-" + versionstring + "-setup.exe" |
260 | shutil.copy(srcfolder + "/" + nsissetup, setupfile) | 259 | # find output filename in nsis script file |
260 | nsissetup = "" | ||
261 | for line in open(srcfolder + "/" + nsisscript): | ||
262 | if re.match(r'^[^;]*OutFile\s+', line) != None: | ||
263 | nsissetup = re.sub(r'^[^;]*OutFile\s+"(.+)"', r'\1', line).rstrip() | ||
264 | if nsissetup == "": | ||
265 | print "Could not retrieve output file name!" | ||
266 | return -1 | ||
267 | shutil.copy(srcfolder + "/" + os.path.dirname(nsisscript) + "/" + nsissetup, setupfile) | ||
261 | return 0 | 268 | return 0 |
262 | 269 | ||
263 | 270 | ||