diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-05-14 11:05:28 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-05-14 11:05:28 (GMT) |
| commit | 34b2757159453e21c68d76fdb47e27f622c144fe (patch) | |
| tree | 6949f4084561a2951c57c5a794d8b0b5291338b2 | |
| parent | b898367612c79374bf20dbb84cc4ec11ffde0bc5 (diff) | |
| download | Qt-34b2757159453e21c68d76fdb47e27f622c144fe.zip Qt-34b2757159453e21c68d76fdb47e27f622c144fe.tar.gz Qt-34b2757159453e21c68d76fdb47e27f622c144fe.tar.bz2 | |
Fixed epocroot handling in build_release_package.pl for non-trivial roots
| -rw-r--r-- | bin/build_release_package.pl | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/bin/build_release_package.pl b/bin/build_release_package.pl index aecfb20..0a35062 100644 --- a/bin/build_release_package.pl +++ b/bin/build_release_package.pl @@ -47,6 +47,13 @@ if (@ARGV) $epocroot = "\\"; } + if ($epocroot =~ m/.*[^\\]$/) + { + $epocroot = "${epocroot}\\"; + } + + $epocroot =~ s/.://; + my $releaseDirQt = "${releaseDir}\\qt"; my $releaseDirEpocroot = "${releaseDir}\\epocroot"; my $releaseDirSis = "${releaseDir}\\sis"; @@ -128,6 +135,10 @@ if (@ARGV) else { $destinationPath =~ s/.://; + if ($epocroot !~ m/\\/) + { + $destinationPath =~ s/($epocroot)//i; + } $destinationPath = $releaseDirEpocroot.$destinationPath; } |