Fixes from rename. Option to build us and boo

Unity-Technologies · Feb 1, 2016 · 23dfffd · 23dfffd
1 parent 4e6366a
commit 23dfffd
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/build.pl b/build.pl
@@ -28,6 +28,7 @@
 my $artifact=0;
 my $debug=0;
 my $disableMsc=0;
+my $buildUsAndBoo=0;
 my $artifactsCommon=0;
 my $runRuntimeTests=1;
 my $runClasslibTests=1;
@@ -52,6 +53,7 @@
 	'artifactscommon=i'=>\$artifactsCommon,
 	'debug=i'=>\$debug,
 	'disablemsc=i'=>\$disableMsc,
+	'buildusandboo=i'=>\$buildUsAndBoo,
 	'runtimetests=i'=>\$runRuntimeTests,
 	'classlibtests=i'=>\$runClasslibTests,
 	'arch32=i'=>\$arch32,
@@ -287,6 +289,12 @@
 	print(">>> Skipping build\n");
 }
 
+if ($buildUsAndBoo)
+{
+	print(">>> Building Unity Script and Boo...\n");
+	system("perl", "$buildscriptsdir/build_us_and_boo.pl") eq 0 or die ("Failed builidng Unity Script and Boo\n");
+}
+
 if ($artifact)
 {
 	print(">>> Creating artifact...\n");
@@ -314,10 +322,10 @@
 
 		#TODO by Mike : Deal with copying to expected structure
 
-		system("cp -r $monoprefix/bin $distdir/") eq 0 or die ("failed copying bin folder");
-		system("cp -r $monoprefix/etc $distdir/") eq 0 or die("failed copying etc folder");
-		system("cp -r $monoprefix/lib/mono/gac $distdirlibmono") eq 0 or die("failed copying gac");
-		system("cp -r $monoprefix/lib/mono/xbuild-frameworks $distdirlibmono") eq 0 or die("failed copying xbuild-frameworks");
+		system("cp -r $monoprefix/bin $distdir/") eq 0 or die ("failed copying bin folder\n");
+		system("cp -r $monoprefix/etc $distdir/") eq 0 or die("failed copying etc folder\n");
+		system("cp -r $monoprefix/lib/mono/gac $distdirlibmono") eq 0 or die("failed copying gac\n");
+		system("cp -r $monoprefix/lib/mono/xbuild-frameworks $distdirlibmono") eq 0 or die("failed copying xbuild-frameworks\n");
 
 		# now remove nunit
 		for my $profile (@profiles)

diff --git a/build_all_linux.pl b/build_all_linux.pl
@@ -21,7 +21,7 @@
 }
 
 print(">>> Building i386\n");
-system("perl", "$buildscriptsdir/build_all.pl", "--arch32=1", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ('failing building i386');
+system("perl", "$buildscriptsdir/build.pl", "--arch32=1", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ('failing building i386');
 
 print(">>> Building x86_64\n");
-system("perl", "$buildscriptsdir/build_all.pl", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ('failing building x86_64');
+system("perl", "$buildscriptsdir/build.pl", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ('failing building x86_64');
diff --git a/build_all_osx.pl b/build_all_osx.pl
@@ -40,10 +40,10 @@
 );
 
 print(">>> Building i386\n");
-system("perl", "$buildscriptsdir/build_all.pl", "--arch32=1", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ('failing building i386');
+system("perl", "$buildscriptsdir/build.pl", "--arch32=1", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ('failing building i386');
 
 print(">>> Building x86_64\n");
-system("perl", "$buildscriptsdir/build_all.pl", "--clean=1", "--artifactsCommon=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ('failing building x86_64');
+system("perl", "$buildscriptsdir/build.pl", "--clean=1", "--artifactsCommon=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ('failing building x86_64');
 
 if ($artifact)
 {

diff --git a/build_all_win.pl b/build_all_win.pl
@@ -21,7 +21,7 @@
 }
 
 print(">>> Building i386\n");
-system("perl", "$buildscriptsdir/build_all_win_wrapper.pl", "--arch32=1", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ('failing building win32');
+system("perl", "$buildscriptsdir/build_win_wrapper.pl", "--arch32=1", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ('failing building win32');
 
 print(">>> Building x86_64\n");
-system("perl", "$buildscriptsdir/build_all_win_wrapper.pl", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ('failing building x64');
+system("perl", "$buildscriptsdir/build_win_wrapper.pl", "--clean=1", "--classlibtests=0", @passAlongArgs) eq 0 or die ('failing building x64');
diff --git a/build_win_wrapper.pl b/build_win_wrapper.pl
@@ -97,4 +97,4 @@
 push @passAlongArgs, "--winmonoroot=$monoroot";
 
 print ">>> Calling $cygwinRootWindows\\bin\\sh.exe with @passAlongArgs";
-system("$cygwinRootWindows\\bin\\sh.exe", "$monoroot/external/buildscripts/build_all_win.sh", @passAlongArgs) eq 0 or die("failed building mono\n");
+system("$cygwinRootWindows\\bin\\sh.exe", "$monoroot/external/buildscripts/build_win_wrapper.sh", @passAlongArgs) eq 0 or die("failed building mono\n");
diff --git a/build_win_wrapper.sh b/build_win_wrapper.sh
@@ -9,4 +9,4 @@ echo
 echo ">>> PATH in Win Shell Script = $PATH"
 echo
 
-perl "$BUILD_SCRIPT_ROOT/build_all.pl" "$@"
+perl "$BUILD_SCRIPT_ROOT/build.pl" "$@"