phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Add autobuilder support for glooxwrapper

Browse Source 
This was SVN commit r14103.
This commit is contained in:
Ykkrosh 2013-11-07 21:45:59 +00:00
parent 93cffe9deb
commit f53bd8974c
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/tools/autobuild2/build.pl
View File

@ -14,6 +14,8 @@ my $temp_trunk = "d:\\0ad\\svn";
my $log_dir = "d:\\0ad\\buildlogs";
my $vcbuild = "$svn_trunk\\source\\tools\\autobuild2\\vcbuild_env.bat";
my @gloox_libs = qw(glooxwrapper.dll glooxwrapper.lib glooxwrapper.pdb glooxwrapper_dbg.dll glooxwrapper_dbg.lib glooxwrapper_dbg.pdb);
my $time_start = time();
eval { # catch deaths
@ -66,6 +68,7 @@ for (qw(build source libraries))
my $updateworkspaces_args = '';
$updateworkspaces_args .= ' --atlas' if $build_options->{atlas};
$updateworkspaces_args .= ' --collada' if $build_options->{collada};
$updateworkspaces_args .= ' --build-shared-glooxwrapper' if $build_options->{glooxwrapper};
add_to_buildlog("Running update-workspaces$updateworkspaces_args");
chdir "$temp_trunk\\build\\workspaces" or die $!;
my $updateworkspaces_output = `update-workspaces.bat$updateworkspaces_args 2>&1`;
@ -77,19 +80,39 @@ die $? if $?;
mkdir "$temp_trunk\\binaries" or die $!;
mkdir "$temp_trunk\\binaries\\system" or die $!;
# Copy the prebuilt glooxwrapper, if needed
if (not $build_options->{glooxwrapper}) {
add_to_buildlog("copying glooxwrapper");
for (@gloox_libs) {
`copy $svn_trunk\\binaries\\system\\$_ $temp_trunk\\binaries\\system\\`;
die "Failed to copy $_: $?" if $?;
}
}
# Do the Release build
add_to_buildlog("Running vcbuild");
add_to_buildlog("Running vcbuild (release)");
my $build_output = `$vcbuild /time /M2 /logfile:$log_dir\\build_vcbuild.txt vc2008\\pyrogenesis.sln "Release|Win32" 2>&1`;
add_to_buildlog($build_output);
die $? if ($? and $? != 32768);
# Do the Debug build of glooxwrapper, if needed
if ($build_options->{glooxwrapper}) {
add_to_buildlog("Running vcbuild (debug glooxwrapper)");
my $build_output = `$vcbuild /time /M2 /logfile:$log_dir\\build_vcbuild.txt vc2008\\glooxwrapper.vcproj "Debug|Win32" 2>&1`;
add_to_buildlog($build_output);
die $? if ($? and $? != 32768);
}
# Copy the output
add_to_buildlog("Copying generated binaries");
my @binaries = qw(pyrogenesis.exe pyrogenesis.pdb);
push @binaries, 'AtlasUI.dll' if $build_options->{atlas};
push @binaries, 'Collada.dll' if $build_options->{collada};
push @binaries, @gloox_libs if $build_options->{glooxwrapper};
for (@binaries) {
`copy $temp_trunk\\binaries\\system\\$_ $svn_trunk\\binaries\\system\\`;
die "Failed to copy $_: $?" if $?;

1
source/tools/autobuild2/manage.cgi
View File

@ -32,6 +32,7 @@ my $ec2 = new Net::Amazon::EC2(
my @build_options = (
{ name => 'atlas', title => 'Atlas DLL' },
{ name => 'collada', title => 'Collada DLL' },
# { name => 'glooxwrapper', title => 'Glooxwrapper DLL' }, # this requires the autobuilder to use the same VS version gloox-1.0.dll was built with
);
my $action = $cgi->url_param('action');