Updated symstore step, fixed packager path bug.

This commit is contained in:
David Anderson 2009-08-29 23:10:46 -07:00
parent 6608766829
commit 40149ba650
3 changed files with 11 additions and 3 deletions

View File

@ -186,18 +186,22 @@ bincopies = []
def AddNormalLibrary(name, dest): def AddNormalLibrary(name, dest):
dest = os.path.join('addons', 'sourcemod', dest) dest = os.path.join('addons', 'sourcemod', dest)
bincopies.append(CopyFile(os.path.join('..', name, name + osutil.SharedLibSuffix()), dest)) bincopies.append(CopyFile(os.path.join('..', name, name + osutil.SharedLibSuffix()), dest))
pdb_list.append(name + '\\' + name + '.pdb')
def AddHL2Library(name, dest): def AddHL2Library(name, dest):
for i in SM.sdkInfo: for i in SM.sdkInfo:
sdk = SM.sdkInfo[i] sdk = SM.sdkInfo[i]
AddNormalLibrary(name + '.' + sdk['ext'], dest) AddNormalLibrary(name + '.' + sdk['ext'], dest)
pdb_list = []
if AMBuild.target['platform'] == 'linux': if AMBuild.target['platform'] == 'linux':
bincopies.append(CopyFile(os.path.join('..', 'loader', 'sourcemod_mm_i486.so'), bincopies.append(CopyFile(os.path.join('..', 'loader', 'sourcemod_mm_i486.so'),
os.path.join('addons', 'sourcemod', 'bin'))) os.path.join('addons', 'sourcemod', 'bin')))
elif AMBuild.target['platform'] == 'windows': elif AMBuild.target['platform'] == 'windows':
bincopies.append(CopyFile(os.path.join('..', 'loader', 'sourcemod_mm.dll'), bincopies.append(CopyFile(os.path.join('..', 'loader', 'sourcemod_mm.dll'),
os.path.join('addons', 'sourcemod', 'bin'))) os.path.join('addons', 'sourcemod', 'bin')))
pdb_list.append('loader\\sourcemod_mm.pdb')
AddHL2Library('sourcemod', 'bin') AddHL2Library('sourcemod', 'bin')
AddNormalLibrary('sourcepawn.jit.x86', 'bin') AddNormalLibrary('sourcepawn.jit.x86', 'bin')
@ -223,4 +227,8 @@ if AMBuild.target['platform'] == 'windows':
job.AddCommand(CopyFile( job.AddCommand(CopyFile(
os.path.join(AMBuild.sourceFolder, 'sourcepawn', 'batchtool', 'compile.exe'), os.path.join(AMBuild.sourceFolder, 'sourcepawn', 'batchtool', 'compile.exe'),
os.path.join('addons', 'sourcemod', 'scripting'))) os.path.join('addons', 'sourcemod', 'scripting')))
pdblog = open(os.path.join(AMBuild.outputFolder, 'pdblog.txt'), 'wt')
for pdb in pdb_list:
pdblog.write(pdb + '\n')
pdblog.close()

View File

@ -33,7 +33,7 @@ my ($version);
$version = Build::ProductVersion(Build::PathFormat('../../build/product.version')); $version = Build::ProductVersion(Build::PathFormat('../../build/product.version'));
$version =~ s/-dev//g; $version =~ s/-dev//g;
$version .= '-hg' . Build::HgRevNum('../..'); $version .= '-hg' . Build::HgRevNum('../../build');
my ($filename); my ($filename);
$filename = 'sourcemod-' . $version; $filename = 'sourcemod-' . $version;

View File

@ -12,7 +12,7 @@ chdir('..');
our $SSH = 'ssh -i ../../smpvkey'; our $SSH = 'ssh -i ../../smpvkey';
open(PDBLOG, 'OUTPUT/pdblog.txt') or die "Could not open pdblog.txt: $!\n"; open(PDBLOG, '../OUTPUT/pdblog.txt') or die "Could not open pdblog.txt: $!\n";
#Sync us up with the main symbol store #Sync us up with the main symbol store
rsync('sourcemod@alliedmods.net:~/public_html/symbols/', '..\\..\\symstore'); rsync('sourcemod@alliedmods.net:~/public_html/symbols/', '..\\..\\symstore');
@ -40,7 +40,7 @@ while (<PDBLOG>)
$line = $_; $line = $_;
$line =~ s/\.pdb/\*/; $line =~ s/\.pdb/\*/;
chomp $line; chomp $line;
Build::Command("symstore add /r /f \"$line\" /s ..\\..\\symstore /t \"SourceMod\" /v \"$version\" /c \"$build_type\""); Build::Command("symstore add /r /f \"..\\OUTPUT\\$line\" /s ..\\..\\symstore /t \"SourceMod\" /v \"$version\" /c \"$build_type\"");
} }
close(PDBLOG); close(PDBLOG);