New panda3d.* import structure

This commit is contained in:
rdb 2009-11-04 16:15:49 +00:00
parent 8f83314ae3
commit 603ffa7215
3 changed files with 13 additions and 6 deletions

View File

@ -100,6 +100,8 @@ Section "${SMDIRECTORY}" SecCore
File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\filter\*.sha"
SetOutPath $INSTDIR\direct
File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\*.py"
SetOutPath $INSTDIR
File "${PSOURCE}\panda3d.py"
!else
File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\directscripts\*"
SetOutPath $INSTDIR\direct\filter
@ -107,6 +109,8 @@ Section "${SMDIRECTORY}" SecCore
SetOutPath $INSTDIR\direct
File /r /x CVS /x Opt?-Win32 "${PSOURCE}\direct\src\*.py"
File "${PANDA}\tmp\__init__.py"
SetOutPath $INSTDIR
File "${PSOURCE}\direct\src\ffi\panda3d.py"
!endif
SetOutPath $INSTDIR\pandac
File /r "${PANDA}\pandac\*.py"
@ -188,14 +192,14 @@ Section "${SMDIRECTORY}" SecCore
StrCmp $1 "" done
StrCmp $1 "." next
StrCmp $1 ".." next
Push $1
Push "-"
Push $1
Push "-"
Push " "
Call StrRep
Pop $R0
StrCpy $READABLE $R0
Push $1
Push "-"
Push $1
Push "-"
Push "_"
Call StrRep
Pop $R0
@ -816,6 +820,6 @@ done:
Pop $R1
Pop $R4
Exch $R3
FunctionEnd

View File

@ -122,6 +122,7 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"):
oscmd("cp -R direct/src/* "+destdir+prefix+"/share/panda3d/direct")
oscmd("cp -R "+outputdir+"/pandac "+destdir+prefix+"/share/panda3d/pandac")
oscmd("cp -R "+outputdir+"/models "+destdir+prefix+"/share/panda3d/models")
oscmd("cp direct/src/ffi/panda3d.py "+destdir+prefix+"/share/panda3d/panda3d.py")
if os.path.isdir("samples"): oscmd("cp -R samples "+destdir+prefix+"/share/panda3d/samples")
if os.path.isdir(outputdir+"/Pmw"): oscmd("cp -R "+outputdir+"/Pmw "+destdir+prefix+"/share/panda3d/Pmw")
if os.path.isdir(outputdir+"/plugins"): oscmd("cp -R "+outputdir+"/plugins "+destdir+prefix+"/share/panda3d/plugins")

View File

@ -1486,7 +1486,7 @@ CreatePandaVersionFiles()
##########################################################################################
#
# Copy the "direct" tree
# Copy the "direct" tree and panda3d.py
#
##########################################################################################
@ -4524,6 +4524,7 @@ def MakeInstallerOSX():
oscmd("ln -s /usr/bin/python Panda3D-tpl-rw/Panda3D/%s/bin/ppython" % VERSION)
oscmd("sed -e 's@\\$1@%s@' < direct/src/directscripts/profilepaths-osx.command >> Panda3D-tpl-rw/panda3dpaths.command" % VERSION)
WriteFile("Panda3D-tpl-rw/Panda3D/%s/lib/direct/__init__.py" % VERSION, "")
oscmd("cp direct/src/ffi/panda3d.py Panda3D-tpl-rw/Panda3D/%s/lib/panda3d.py" % VERSION)
oscmd("cp %s/etc/Config.prc Panda3D-tpl-rw/Panda3D/%s/etc/Config.prc" % (GetOutputDir(), VERSION))
oscmd("cp %s/etc/Confauto.prc Panda3D-tpl-rw/Panda3D/%s/etc/Confauto.prc" % (GetOutputDir(), VERSION))
oscmd("cp -R %s/include Panda3D-tpl-rw/Panda3D/%s/include" % (GetOutputDir(), VERSION))
@ -4547,6 +4548,7 @@ def MakeInstallerOSX():
compileall.compile_dir("Panda3D-tpl-rw/Panda3D/"+VERSION+"/lib/Pmw")
oscmd("chmod -R 555 Panda3D-tpl-rw/Panda3D/"+VERSION+"/lib/direct")
oscmd("chmod -R 555 Panda3D-tpl-rw/Panda3D/"+VERSION+"/lib/pandac")
oscmd("chmod 555 Panda3D-tpl-rw/Panda3D/"+VERSION+"/lib/panda3d.py")
oscmd("chmod -R 555 Panda3D-tpl-rw/Panda3D/"+VERSION+"/models")
if os.path.isdir("samples"): oscmd("chmod -R 555 Panda3D-tpl-rw/Panda3D/"+VERSION+"/samples")
if os.path.isdir(GetOutputDir()+"/Pmw"): oscmd("chmod -R 555 Panda3D-tpl-rw/Panda3D/"+VERSION+"/lib/Pmw")