Skip to content

Commit d286af3

Browse files
ashwinimurtashwinimurt
authored
Merge pull request #1071 from Unity-Technologies/support-rearranged-mono-build-deps-unity-2018.3
Update external build-deps tools paths (2018.3 mono)
2 parents a5dd800 + 09ce2ef commit d286af3

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎external/buildscripts/build_classlibs_osx.pl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,16 @@
9696
my $autoconfVersion = "2.69";
9797
my $automakeVersion = "1.15";
9898
my $libtoolVersion = "2.4.6";
99-
my $autoconfDir = "$externalBuildDeps/autoconf-$autoconfVersion";
100-
my $automakeDir = "$externalBuildDeps/automake-$automakeVersion";
101-
my $libtoolDir = "$externalBuildDeps/libtool-$libtoolVersion";
99+
my $autoconfDir = "$externalBuildDeps/autoconf-2-69/autoconf-$autoconfVersion";
100+
my $automakeDir = "$externalBuildDeps/automake-1-15/automake-$automakeVersion";
101+
my $libtoolDir = "$externalBuildDeps/libtool-2-4-6/libtool-$libtoolVersion";
102102
my $builtToolsDir = "$externalBuildDeps/built-tools";
103103

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

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

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

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

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

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

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

‎external/buildscripts/build_runtime_osx.pl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,17 @@
6464
my $autoconfVersion = "2.69";
6565
my $automakeVersion = "1.15";
6666
my $libtoolVersion = "2.4.6";
67-
my $autoconfDir = "$externalBuildDeps/autoconf-$autoconfVersion";
68-
my $automakeDir = "$externalBuildDeps/automake-$automakeVersion";
69-
my $libtoolDir = "$externalBuildDeps/libtool-$libtoolVersion";
67+
my $autoconfDir = "$externalBuildDeps/autoconf-2-69/autoconf-$autoconfVersion";
68+
my $automakeDir = "$externalBuildDeps/automake-1-15/automake-$automakeVersion";
69+
my $libtoolDir = "$externalBuildDeps/libtool-2-4-6/libtool-$libtoolVersion";
7070

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

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

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

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

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

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

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

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

‎external/buildscripts/prepare_osx_build.pl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
my $autoconfVersion = "2.69";
1111
my $automakeVersion = "1.15";
1212
my $libtoolVersion = "2.4.6";
13-
my $autoconfDir = "$externalBuildDeps/autoconf-$autoconfVersion";
14-
my $automakeDir = "$externalBuildDeps/automake-$automakeVersion";
15-
my $libtoolDir = "$externalBuildDeps/libtool-$libtoolVersion";
13+
my $autoconfDir = "$externalBuildDeps/autoconf-2-69/autoconf-$autoconfVersion";
14+
my $automakeDir = "$externalBuildDeps/automake-1-15/automake-$automakeVersion";
15+
my $libtoolDir = "$externalBuildDeps/libtool-2-4-6/libtool-$libtoolVersion";
1616

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

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

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

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

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

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

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

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

0 commit comments

Comments
 (0)