TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed target option, and deprecated --installer in favor of make install

Browse Source
This commit is contained in:
rdb 2009-05-25 06:12:19 +00:00
parent c31f100fd7
commit e946ae8ac0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
makepanda/makepanda.py
View File

@ -77,7 +77,6 @@ def usage(problem):
print " --help (print the help message you're reading now)" print " --help (print the help message you're reading now)"
print " --target T (target can be 'all','panda3d','plugins','installer')" print " --target T (target can be 'all','panda3d','plugins','installer')"
print " --optimize X (optimization level can be 1,2,3,4)" print " --optimize X (optimization level can be 1,2,3,4)"
print " --installer (build an installer)"
print " --version (set the panda version number)" print " --version (set the panda version number)"
print " --lzma (use lzma compression when building installer)" print " --lzma (use lzma compression when building installer)"
print " --threads N (use the multithreaded build system. see manual)" print " --threads N (use the multithreaded build system. see manual)"
@ -99,7 +98,7 @@ def parseopts(args):
global TARGET,OPTIMIZE,INSTALLER,GENMAN global TARGET,OPTIMIZE,INSTALLER,GENMAN
global VERSION,COMPRESSOR,VERBOSE,THREADCOUNT global VERSION,COMPRESSOR,VERBOSE,THREADCOUNT
longopts = [ longopts = [
"help","target", "help","target=",
"optimize=","everything","nothing", "optimize=","everything","nothing",
"version=","lzma","no-python","threads=","outputdir="] "version=","lzma","no-python","threads=","outputdir="]
anything = 0 anything = 0
@ -156,7 +155,7 @@ if (os.environ.has_key("RPM_OPT_FLAGS")):
MakeBuildTree() MakeBuildTree()
SdkLocateDirectX() SdkLocateDirectX()
if TARGET not in ["all", "plugins"]: if TARGET in ["all", "plugins"]:
SdkLocateMaya() SdkLocateMaya()
SdkLocateMax() SdkLocateMax()
SdkLocateMacOSX() SdkLocateMacOSX()
@ -165,7 +164,7 @@ SdkLocateVisualStudio()
SdkLocateMSPlatform() SdkLocateMSPlatform()
SdkAutoDisableDirectX() SdkAutoDisableDirectX()
if TARGET not in ["all", "plugins"]: if TARGET in ["all", "plugins"]:
SdkAutoDisableMaya() SdkAutoDisableMaya()
SdkAutoDisableMax() SdkAutoDisableMax()
@ -3859,7 +3858,7 @@ def MakeInstallerOSX():
oscmd("rm -f Panda3D-tpl-rw.dmg") oscmd("rm -f Panda3D-tpl-rw.dmg")
oscmd("rm -rf Panda3D-tpl-rw") oscmd("rm -rf Panda3D-tpl-rw")
if (INSTALLER != 0 and TARGET in ["all", "installer"]): if (INSTALLER != 0 or (TARGET in ["all", "installer"])):
if (sys.platform == "win32"): if (sys.platform == "win32"):
MakeInstallerNSIS("Panda3D-"+VERSION+".exe", "Panda3D", "Panda3D "+VERSION, "C:\\Panda3D-"+VERSION) MakeInstallerNSIS("Panda3D-"+VERSION+".exe", "Panda3D", "Panda3D "+VERSION, "C:\\Panda3D-"+VERSION)
elif (sys.platform == "linux2"): elif (sys.platform == "linux2"):