1
0
forked from 0ad/0ad

Updated autobuilder to update ps.pdb.

Animation files with filename="" are now ignored.

This was SVN commit r2368.
This commit is contained in:
Ykkrosh 2005-06-02 18:04:20 +00:00
parent b657a1cbca
commit e583af307f
3 changed files with 26 additions and 6 deletions

View File

@ -156,9 +156,12 @@ bool CObjectEntry::BuildRandomVariant(CObjectBase::variation_key& vars, CObjectB
else if (name == "chop") name = "gather";
else if (name == "decay") name = "corpse";
CSkeletonAnim* anim = m_Model->BuildAnimation(it->second.m_FileName, name, it->second.m_Speed, it->second.m_ActionPos, it->second.m_ActionPos2);
if (anim)
m_Animations.insert(std::make_pair(name, anim));
if (it->second.m_FileName.Length())
{
CSkeletonAnim* anim = m_Model->BuildAnimation(it->second.m_FileName, name, it->second.m_Speed, it->second.m_ActionPos, it->second.m_ActionPos2);
if (anim)
m_Animations.insert(std::make_pair(name, anim));
}
}
// start up idling

View File

@ -19,6 +19,8 @@ my $sevenz = '"C:\Program Files\7-Zip\7z.exe"';
# except I need to call vcvars32.bat then "vcbuild.exe /useenv", since the VS registry settings don't always exist
my $vcbuild = '"C:\0ad\autobuild\vcbuild_env.bat"';
my $time_start = time();
eval { # catch deaths
# Capture all output
@ -34,6 +36,7 @@ do 'login_details.pl' or die "Cannot find login details: $! / $@";
# (but with a valid password, which I'm not going to tell you)
add_to_buildlog("Starting build at ".(gmtime($time_start))." GMT.\n");
chdir $svn_trunk or die $!;
@ -49,12 +52,14 @@ if (grep { $_ eq '--commitlatest' } @ARGV)
add_to_buildlog("Committing ps.exe for revision $rev");
### Copy ps.exe over the SVN copy ###
### Copy ps.exe and ps.pdb over the SVN copy ###
`copy $output_dir\\$rev\\ps.exe $svn_trunk\\binaries\\system\\`;
die $? if $?;
`copy $output_dir\\$rev\\ps.pdb $svn_trunk\\binaries\\data\\`;
die $? if $?;
### Commit ps.exe ###
my $svn_output = `svn commit binaries\\system\\ps.exe --username $username --password $password --message "Automated build." 2>&1`;
### Commit ps.exe and ps.pdb ###
my $svn_output = `svn commit binaries\\system\\ps.exe binaries\\data\\ps.pdb --username $username --password $password --message "Automated build." 2>&1`;
add_to_buildlog($svn_output);
die $? if $?;
@ -175,6 +180,8 @@ die $? if ($? and $? != 32768);
`copy $temp_trunk\\binaries\\system\\ps.exe $output_dir\\temp\\`;
die $? if $?;
`copy $temp_trunk\\binaries\\data\\ps.pdb $output_dir\\temp\\`;
die $? if $?;
### Store the output permanently ###
@ -204,6 +211,10 @@ else
# Exit, after copying the current log files over the previous ones
sub quit
{
my $time_end = time();
my $time_taken = $time_end - $time_start;
add_to_buildlog("\nBuild completed at ".(gmtime($time_end))." GMT - took $time_taken seconds.");
close BUILDLOG;
rename "$log_dir\\buildlog_temp.txt", "$log_dir\\buildlog.txt" or die $!;
close STDOUT;

View File

@ -60,6 +60,12 @@ POE::Component::Server::TCP->new(
$response->push_header('Content-type', 'text/plain');
$response->content("Build initiated.");
}
elsif ($url eq '/commit_latest.html')
{
$commit_required = time();
$response->push_header('Content-type', 'text/plain');
$response->content("Commit initiated.");
}
elsif ($url eq '/abort_build.html')
{
abort_build();