Signed-off-by: Francois Gouget fgouget@codeweavers.com --- testbot/bin/build/Reconfig.pl | 16 ---------------- testbot/bin/build/WineReconfig.pl | 8 -------- 2 files changed, 24 deletions(-)
diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 8e50e2f82b..b720788e2b 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -53,14 +53,6 @@ sub BuildNative($) { my ($NoRm) = @_;
- # FIXME Temporary code to ensure compatibility during the transition - my $OldDir = "build-native"; - if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-native") - { - rename("$DataDir/$OldDir", "$DataDir/wine-native"); - # Add a symlink from compatibility with older server-side TestBot scripts - symlink("wine-native", "$DataDir/$OldDir"); - } mkdir "$DataDir/wine-native" if (!-d "$DataDir/wine-native");
# Rebuild from scratch to make sure cruft will not accumulate @@ -85,14 +77,6 @@ sub BuildCross($$$) my ($TaskMissions, $NoRm, $Build) = @_;
return 1 if (!$TaskMissions->{Builds}->{$Build}); - # FIXME Temporary code to ensure compatibility during the transition - my $OldDir = $Build eq "exe32" ? "build-mingw32" : "build-mingw64"; - if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") - { - rename("$DataDir/$OldDir", "$DataDir/wine-$Build"); - # Add a symlink from compatibility with older server-side TestBot scripts - symlink("wine-$Build", "$DataDir/$OldDir"); - } mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build");
# Rebuild from scratch to make sure cruft will not accumulate diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index 74fe4eab81..f46408b469 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -54,14 +54,6 @@ sub BuildWine($$$$) my ($TaskMissions, $NoRm, $Build, $Extras) = @_;
return 1 if (!$TaskMissions->{Builds}->{$Build}); - # FIXME Temporary code to ensure compatibility during the transition - my $OldDir = "build-$Build"; - if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") - { - rename("$DataDir/$OldDir", "$DataDir/wine-$Build"); - # Add a symlink from compatibility with older server-side TestBot scripts - symlink("wine-$Build", "$DataDir/$OldDir"); - } mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build");
# If $NoRm is not set, rebuild from scratch to make sure cruft will not