Skip to content

Commit

Permalink
Builder: Fixed copying of FMOD logs
Browse files Browse the repository at this point in the history
Compiler logs from dsfmod were not being copied to the
builds repository.
  • Loading branch information
skyjake committed Dec 23, 2011
1 parent 903920d commit 3de1b97
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
5 changes: 4 additions & 1 deletion distrib/autobuild.py
Expand Up @@ -71,9 +71,12 @@ def todays_platform_release():
remote_copy(os.path.join('releases', n),
os.path.join(builder.config.APT_REPO_DIR, 'dists/unstable/main/binary-%s' % arch, n))

# Also the build log.
# Also the build logs.
remote_copy('buildlog.txt', ev.file_path('doomsday-out-%s.txt' % sys_id()))
remote_copy('builderrors.txt', ev.file_path('doomsday-err-%s.txt' % sys_id()))
if 'linux' in sys_id():
remote_copy('dsfmod/fmod-out-%s.txt' % sys_id(), ev.file_path('fmod-out-%s.txt' % sys_id()))
remote_copy('dsfmod/fmod-err-%s.txt' % sys_id(), ev.file_path('fmod-err-%s.txt' % sys_id()))

git_checkout('master')

Expand Down
12 changes: 7 additions & 5 deletions distrib/platform_release.py
Expand Up @@ -98,8 +98,9 @@ def mac_os_version():
return platform.mac_ver()[0][:4]


"""The Mac OS X release procedure."""
def mac_release():
"""The Mac OS X release procedure."""

# Check Python dependencies.
try:
import wx
Expand Down Expand Up @@ -210,8 +211,9 @@ def mac_release():
remove('imaging.dmg')


"""The Windows release procedure."""
def win_release():
"""The Windows release procedure."""

PROD_DIR = os.path.join(LAUNCH_DIR, 'products')
if not os.path.exists(PROD_DIR):
print "Creating the products directory."
Expand Down Expand Up @@ -241,8 +243,9 @@ def win_release():
raise Exception("Failure in the Windows release script.")


"""The Linux release procedure."""
def linux_release():
"""The Linux release procedure."""

os.chdir(LAUNCH_DIR)

# Generate a launcher script.
Expand All @@ -259,7 +262,7 @@ def clean_products():
# Remove previously built deb packages.
os.system('rm -f ../doomsday*.deb ../doomsday*.changes ../doomsday*.tar.gz ../doomsday*.dsc')
os.system('rm -f doomsday-fmod*.deb doomsday-fmod*.changes doomsday-fmod*.tar.gz doomsday-fmod*.dsc')
os.system('rm -f dsfmod/fmod-*.txt')
#os.system('rm -f dsfmod/fmod-*.txt')

clean_products()

Expand All @@ -273,7 +276,6 @@ def clean_products():
raise Exception("Failure to build dsFMOD from source.")
shutil.copy(glob.glob('../doomsday-fmod*.deb')[0], OUTPUT_DIR)
shutil.copy(glob.glob('../doomsday-fmod*.changes')[0], OUTPUT_DIR)
shutil.copy(glob.glob('fmod-*.txt')[0], OUTPUT_DIR)
os.chdir('..')

# Place the result in the output directory.
Expand Down

0 comments on commit 3de1b97

Please sign in to comment.