summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-11-04 12:51:44 (GMT)
committeraxis <qt-info@nokia.com>2010-11-04 13:33:02 (GMT)
commit2c8f8c8553d11dc31e0c8b8d5eb39efefd8cfc21 (patch)
treedaf10903a82e3353b295f3b90c3d43c238f4911e /bin
parent953ff11a1b424dd288b6504c5a6f918acaebaa60 (diff)
downloadQt-2c8f8c8553d11dc31e0c8b8d5eb39efefd8cfc21.zip
Qt-2c8f8c8553d11dc31e0c8b8d5eb39efefd8cfc21.tar.gz
Qt-2c8f8c8553d11dc31e0c8b8d5eb39efefd8cfc21.tar.bz2
Fixed elf2e32_qtwrapper when not using def files.
RevBy: Liang Qi Task: QTBUG-14952
Diffstat (limited to 'bin')
-rwxr-xr-xbin/elf2e32_qtwrapper.pl30
1 files changed, 17 insertions, 13 deletions
diff --git a/bin/elf2e32_qtwrapper.pl b/bin/elf2e32_qtwrapper.pl
index c51c409..4eeb098 100755
--- a/bin/elf2e32_qtwrapper.pl
+++ b/bin/elf2e32_qtwrapper.pl
@@ -80,7 +80,9 @@ while (1) {
my $newDefFile;
my $origDefFile;
my $savedNewDefFileLine = "";
- open($origDefFile, "< $definput[1]") or die("Could not open $definput[1]");
+ if ($definput[1]) {
+ open($origDefFile, "< $definput[1]") or die("Could not open $definput[1]");
+ }
open($newDefFile, "< $defoutput[1]") or die("Could not open $defoutput[1]");
open($tmpDefFile, "> $defoutput[1].tmp") or die("Could not open $defoutput[1].tmp");
print($tmpDefFile "EXPORTS\n");
@@ -98,19 +100,21 @@ while (1) {
my $sym;
my $ordinal;
my $extraData;
- # Read from original def file, and skip non-symbol lines
- while (1) {
- $origDefLine = <$origDefFile>;
- if (defined($origDefLine)) {
- $origDefLine =~ s/[\n\r]//;
- if ($origDefLine =~ /([a-z0-9_]+) +\@ ([0-9]+) (.*)/i) {
- $origSym = $1;
- $origOrdinal = $2;
- $origExtraData = $3;
+ if ($definput[1]) {
+ # Read from original def file, and skip non-symbol lines
+ while (1) {
+ $origDefLine = <$origDefFile>;
+ if (defined($origDefLine)) {
+ $origDefLine =~ s/[\n\r]//;
+ if ($origDefLine =~ /([a-z0-9_]+) +\@ ([0-9]+) (.*)/i) {
+ $origSym = $1;
+ $origOrdinal = $2;
+ $origExtraData = $3;
+ last;
+ }
+ } else {
last;
}
- } else {
- last;
}
}
@@ -169,7 +173,7 @@ while (1) {
print($tmpDefFile "\t$sym \@ $ordinal $extraData\n");
}
print($tmpDefFile "\n");
- close($origDefFile);
+ close($origDefFile) if ($definput[1]);
close($newDefFile);
close($tmpDefFile);