raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

StevanP's changes, so vc variables don't need setting now

Browse Source
This commit is contained in:
Jonathan Corwin 2011-04-22 23:32:08 +01:00
parent c0b0c1a82d
commit a73012e3f6
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/windows-builder.py
View File

@ -108,8 +108,8 @@ sphinx_exe = os.path.join(os.path.split(python_exe)[0], u'Scripts',
u'sphinx-build.exe') u'sphinx-build.exe')
hhc_exe = os.path.join(os.getenv(u'PROGRAMFILES'), 'HTML Help Workshop', hhc_exe = os.path.join(os.getenv(u'PROGRAMFILES'), 'HTML Help Workshop',
u'hhc.exe') u'hhc.exe')
vcenv_bat = os.path.join(os.getenv(u'PROGRAMFILES'), 'Microsoft Visual Studio 9.0', vcbuild_exe = os.path.join(os.getenv(u'PROGRAMFILES'),
u'VC', 'vcvarsall.bat') 'Microsoft Visual Studio 9.0', 'VC','vcpackages','vcbuild.exe')
# Base paths # Base paths
script_path = os.path.split(os.path.abspath(__file__))[0] script_path = os.path.split(os.path.abspath(__file__))[0]
@ -280,13 +280,8 @@ def run_innosetup():
def build_pptviewlib(): def build_pptviewlib():
print u'Building PPTVIEWLIB.DLL...' print u'Building PPTVIEWLIB.DLL...'
vcenv = Popen(vcenv_bat) vcbuild = Popen((vcbuild_exe, '/rebuild',
code = vcenv.wait() os.path.join(pptviewlib_path, u'pptviewlib.vcproj'), u'Release|Win32'))
if code != 0:
raise Exception(u'Error creating VC++ environment')
vcbuild = Popen((u'vcbuild', '/rebuild',
os.path.join(pptviewlib_path, u'pptviewlib.vcproj'),
u'Release|Win32'))
code = vcbuild.wait() code = vcbuild.wait()
if code != 0: if code != 0:
raise Exception(u'Error building pptviewlib.dll') raise Exception(u'Error building pptviewlib.dll')
@ -305,7 +300,7 @@ def main():
print "PyInstaller:", pyi_build print "PyInstaller:", pyi_build
print "Inno Setup path:", innosetup_exe print "Inno Setup path:", innosetup_exe
print "Windows resources:", winres_path print "Windows resources:", winres_path
print "VC++ path:", vcenv_bat print "VCBuild path:", vcbuild_exe
print "PPTVIEWLIB path:", pptviewlib_path print "PPTVIEWLIB path:", pptviewlib_path
elif arg == u'--skip-update': elif arg == u'--skip-update':
skip_update = True skip_update = True