Skip to content

Update external build-deps tools paths (2018.3 mono) #1071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions external/buildscripts/build_classlibs_osx.pl
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,16 @@
my $autoconfVersion = "2.69";
my $automakeVersion = "1.15";
my $libtoolVersion = "2.4.6";
my $autoconfDir = "$externalBuildDeps/autoconf-$autoconfVersion";
my $automakeDir = "$externalBuildDeps/automake-$automakeVersion";
my $libtoolDir = "$externalBuildDeps/libtool-$libtoolVersion";
my $autoconfDir = "$externalBuildDeps/autoconf-2-69/autoconf-$autoconfVersion";
my $automakeDir = "$externalBuildDeps/automake-1-15/automake-$automakeVersion";
my $libtoolDir = "$externalBuildDeps/libtool-2-4-6/libtool-$libtoolVersion";
my $builtToolsDir = "$externalBuildDeps/built-tools";

$ENV{PATH} = "$builtToolsDir/bin:$ENV{PATH}";

if (!(-d "$autoconfDir"))
{
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
chdir("$externalBuildDeps/autoconf-2-69") eq 1 or die ("failed to chdir to external directory\n");
system("tar xzf autoconf-$autoconfVersion.tar.gz") eq 0 or die ("failed to extract autoconf\n");

chdir("$autoconfDir") eq 1 or die ("failed to chdir to autoconf directory\n");
Expand All @@ -120,7 +120,7 @@

if (!(-d "$automakeDir"))
{
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
chdir("$externalBuildDeps/automake-1-15") eq 1 or die ("failed to chdir to external directory\n");
system("tar xzf automake-$automakeVersion.tar.gz") eq 0 or die ("failed to extract automake\n");

chdir("$automakeDir") eq 1 or die ("failed to chdir to automake directory\n");
Expand All @@ -136,7 +136,7 @@

if (!(-d "$libtoolDir"))
{
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
chdir("$externalBuildDeps/libtool-2-4-6") eq 1 or die ("failed to chdir to external directory\n");
system("tar xzf libtool-$libtoolVersion.tar.gz") eq 0 or die ("failed to extract libtool\n");

chdir("$libtoolDir") eq 1 or die ("failed to chdir to libtool directory\n");
Expand Down
12 changes: 6 additions & 6 deletions external/buildscripts/build_runtime_osx.pl
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@
my $autoconfVersion = "2.69";
my $automakeVersion = "1.15";
my $libtoolVersion = "2.4.6";
my $autoconfDir = "$externalBuildDeps/autoconf-$autoconfVersion";
my $automakeDir = "$externalBuildDeps/automake-$automakeVersion";
my $libtoolDir = "$externalBuildDeps/libtool-$libtoolVersion";
my $autoconfDir = "$externalBuildDeps/autoconf-2-69/autoconf-$autoconfVersion";
my $automakeDir = "$externalBuildDeps/automake-1-15/automake-$automakeVersion";
my $libtoolDir = "$externalBuildDeps/libtool-2-4-6/libtool-$libtoolVersion";

my $builtToolsDir = "$externalBuildDeps/built-tools";

$ENV{PATH} = "$builtToolsDir/bin:$ENV{PATH}";

if (!(-d "$autoconfDir"))
{
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
chdir("$externalBuildDeps/autoconf-2-69") eq 1 or die ("failed to chdir to external directory\n");
system("tar xzf autoconf-$autoconfVersion.tar.gz") eq 0 or die ("failed to extract autoconf\n");

chdir("$autoconfDir") eq 1 or die ("failed to chdir to autoconf directory\n");
Expand All @@ -89,7 +89,7 @@

if (!(-d "$automakeDir"))
{
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
chdir("$externalBuildDeps/automake-1-15") eq 1 or die ("failed to chdir to external directory\n");
system("tar xzf automake-$automakeVersion.tar.gz") eq 0 or die ("failed to extract automake\n");

chdir("$automakeDir") eq 1 or die ("failed to chdir to automake directory\n");
Expand All @@ -104,7 +104,7 @@

if (!(-d "$libtoolDir"))
{
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
chdir("$externalBuildDeps/libtool-2-4-6") eq 1 or die ("failed to chdir to external directory\n");
system("tar xzf libtool-$libtoolVersion.tar.gz") eq 0 or die ("failed to extract libtool\n");

chdir("$libtoolDir") eq 1 or die ("failed to chdir to libtool directory\n");
Expand Down
12 changes: 6 additions & 6 deletions external/buildscripts/prepare_osx_build.pl
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
my $autoconfVersion = "2.69";
my $automakeVersion = "1.15";
my $libtoolVersion = "2.4.6";
my $autoconfDir = "$externalBuildDeps/autoconf-$autoconfVersion";
my $automakeDir = "$externalBuildDeps/automake-$automakeVersion";
my $libtoolDir = "$externalBuildDeps/libtool-$libtoolVersion";
my $autoconfDir = "$externalBuildDeps/autoconf-2-69/autoconf-$autoconfVersion";
my $automakeDir = "$externalBuildDeps/automake-1-15/automake-$automakeVersion";
my $libtoolDir = "$externalBuildDeps/libtool-2-4-6/libtool-$libtoolVersion";

my $builtToolsDir = "$externalBuildDeps/built-tools";

$ENV{PATH} = "$builtToolsDir/bin:$ENV{PATH}";

if (!(-d "$autoconfDir"))
{
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
chdir("$externalBuildDeps/autoconf-2-69") eq 1 or die ("failed to chdir to external directory\n");
system("tar xzf autoconf-$autoconfVersion.tar.gz") eq 0 or die ("failed to extract autoconf\n");

chdir("$autoconfDir") eq 1 or die ("failed to chdir to autoconf directory\n");
Expand All @@ -35,7 +35,7 @@

if (!(-d "$automakeDir"))
{
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
chdir("$externalBuildDeps/automake-1-15") eq 1 or die ("failed to chdir to external directory\n");
system("tar xzf automake-$automakeVersion.tar.gz") eq 0 or die ("failed to extract automake\n");

chdir("$automakeDir") eq 1 or die ("failed to chdir to automake directory\n");
Expand All @@ -50,7 +50,7 @@

if (!(-d "$libtoolDir"))
{
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
chdir("$externalBuildDeps/libtool-2-4-6") eq 1 or die ("failed to chdir to external directory\n");
system("tar xzf libtool-$libtoolVersion.tar.gz") eq 0 or die ("failed to extract libtool\n");

chdir("$libtoolDir") eq 1 or die ("failed to chdir to libtool directory\n");
Expand Down