|
4 | 4 | use File::Basename;
|
5 | 5 | use File::Path;
|
6 | 6 | use lib ('external/buildscripts', "../../Tools/perl_lib","perl_lib", 'external/buildscripts/perl_lib');
|
| 7 | +use strict; |
| 8 | +use warnings; |
7 | 9 | use Tools qw(InstallNameTool);
|
8 | 10 |
|
9 | 11 | print ">>> PATH in Build All = $ENV{PATH}\n\n";
|
10 | 12 |
|
11 | 13 | my $currentdir = getcwd();
|
12 | 14 |
|
13 | 15 | my $monoroot = File::Spec->rel2abs(dirname(__FILE__) . "/../..");
|
14 |
| -my $monoroot = abs_path($monoroot); |
| 16 | +$monoroot = abs_path($monoroot); |
15 | 17 |
|
16 | 18 | my $buildscriptsdir = "$monoroot/external/buildscripts";
|
17 | 19 | my $addtoresultsdistdir = "$buildscriptsdir/add_to_build_results/monodistribution";
|
|
294 | 296 | }
|
295 | 297 | else
|
296 | 298 | {
|
297 |
| - if (not $checkoutonthefly) |
| 299 | + if (not $checkoutOnTheFly) |
298 | 300 | {
|
299 | 301 | print(">>> No external build deps found. Might as well try to check them out. If it fails, we'll continue and trust mono is in your PATH\n");
|
300 | 302 | }
|
|
681 | 683 | my $platformRootPostfix = "";
|
682 | 684 | my $useKraitPatch = 1;
|
683 | 685 | my $kraitPatchPath = "$monoroot/../../android_krait_signal_handler/build";
|
684 |
| - my $toolChainExtension = ""; |
685 | 686 |
|
686 | 687 | $ENV{ANDROID_PLATFORM} = "android-$apiLevel";
|
687 | 688 |
|
|
759 | 760 |
|
760 | 761 | if ($runningOnWindows)
|
761 | 762 | {
|
762 |
| - $toolChainExtension = ".exe"; |
763 |
| - |
764 | 763 | $androidPlatformRoot = `cygpath -w $androidPlatformRoot`;
|
765 | 764 | # clean up trailing new lines that end up in the output from cygpath.
|
766 | 765 | $androidPlatformRoot =~ s/\n+$//;
|
|
968 | 967 |
|
969 | 968 | if ($runningOnWindows)
|
970 | 969 | {
|
971 |
| - $toolChainExtension = ".exe"; |
972 |
| - |
973 | 970 | $tizenPlatformRoot = `cygpath -w $tizenPlatformRoot`;
|
974 | 971 | # clean up trailing new lines that end up in the output from cygpath.
|
975 | 972 | $tizenPlatformRoot =~ s/\n+$//;
|
|
1598 | 1595 | system("ln","-f", "$monoroot/mono/mini/.libs/libmonosgen-2.0.dylib","$embedDirArchDestination/libmonosgen-2.0.dylib") eq 0 or die ("failed symlinking libmonosgen-2.0.dylib\n");
|
1599 | 1596 |
|
1600 | 1597 | print "Hardlinking libMonoPosixHelper.dylib\n";
|
1601 |
| - system("ln","-f", "$monoroot/support/.libs/libMonoPosixHelper.dylib","$embedDirArchDestination/libMonoPosixHelper.dylib") eq 0 or die ("failed symlinking $libtarget/libMonoPosixHelper.dylib\n"); |
| 1598 | + system("ln","-f", "$monoroot/support/.libs/libMonoPosixHelper.dylib","$embedDirArchDestination/libMonoPosixHelper.dylib") eq 0 or die ("failed symlinking $embedDirArchDestination/libMonoPosixHelper.dylib\n"); |
1602 | 1599 |
|
1603 | 1600 | InstallNameTool("$embedDirArchDestination/libmonobdwgc-2.0.dylib", "\@executable_path/../Frameworks/MonoEmbedRuntime/osx/libmonobdwgc-2.0.dylib");
|
1604 | 1601 | InstallNameTool("$embedDirArchDestination/libmonosgen-2.0.dylib", "\@executable_path/../Frameworks/MonoEmbedRuntime/osx/libmonosgen-2.0.dylib");
|
|
1691 | 1688 |
|
1692 | 1689 | if ($test)
|
1693 | 1690 | {
|
| 1691 | + my $runtimeTestsDir = "$monoroot/mono/mini"; |
1694 | 1692 | if ($runRuntimeTests)
|
1695 | 1693 | {
|
1696 |
| - my $runtimeTestsDir = "$monoroot/mono/mini"; |
1697 | 1694 | chdir("$runtimeTestsDir") eq 1 or die ("failed to chdir");
|
1698 | 1695 | print("\n>>> Calling make check in $runtimeTestsDir\n\n");
|
1699 | 1696 | system("make","check") eq 0 or die ("runtime tests failed\n");
|
|
0 commit comments