Auto-install plugin into /usr/lib/mozilla/plugins, and fix a couple of PCBSD issues. Oh, and I forgot to commit pview.desktop.

This commit is contained in:
rdb 2009-07-22 10:24:31 +00:00
parent 06505c7874
commit 7177e3d43a
3 changed files with 21 additions and 1 deletions

View File

@ -32,6 +32,9 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"):
oscmd("mkdir -p "+destdir+prefix+"/share/mime/packages") oscmd("mkdir -p "+destdir+prefix+"/share/mime/packages")
oscmd("mkdir -p "+destdir+prefix+"/share/application-registry") oscmd("mkdir -p "+destdir+prefix+"/share/application-registry")
oscmd("mkdir -p "+destdir+prefix+"/share/applications") oscmd("mkdir -p "+destdir+prefix+"/share/applications")
oscmd("mkdir -p "+destdir+prefix+"/lib/mozilla/plugins")
oscmd("mkdir -p "+destdir+prefix+"/lib/mozilla-firefox/plugins")
oscmd("mkdir -p "+destdir+prefix+"/lib/xulrunner-addons/plugins")
oscmd("mkdir -p "+destdir+prefix+libdir+"/panda3d") oscmd("mkdir -p "+destdir+prefix+libdir+"/panda3d")
oscmd("mkdir -p "+destdir+PPATH) oscmd("mkdir -p "+destdir+PPATH)
oscmd("mkdir -p "+destdir+"/etc/ld.so.conf.d") oscmd("mkdir -p "+destdir+"/etc/ld.so.conf.d")
@ -51,6 +54,10 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"):
oscmd("cp makepanda/panda3d.applications "+destdir+prefix+"/share/application-registry/panda3d.applications") oscmd("cp makepanda/panda3d.applications "+destdir+prefix+"/share/application-registry/panda3d.applications")
oscmd("cp makepanda/panda3d.desktop "+destdir+prefix+"/share/applications/panda3d.desktop") oscmd("cp makepanda/panda3d.desktop "+destdir+prefix+"/share/applications/panda3d.desktop")
oscmd("cp makepanda/pview.desktop "+destdir+prefix+"/share/applications/pview.desktop") oscmd("cp makepanda/pview.desktop "+destdir+prefix+"/share/applications/pview.desktop")
if (os.path.exists(outputdir+"/lib/nppanda3d.so")):
oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+"/lib/mozilla/plugins/nppanda3d.so")
oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+"/lib/mozilla-firefox/plugins/nppanda3d.so")
oscmd("ln -s "+prefix+libdir+"/panda3d/nppanda3d.so "+destdir+prefix+"/lib/xulrunner-addons/plugins/nppanda3d.so")
oscmd("cp doc/LICENSE "+destdir+prefix+"/share/panda3d/LICENSE") oscmd("cp doc/LICENSE "+destdir+prefix+"/share/panda3d/LICENSE")
oscmd("cp doc/LICENSE "+destdir+prefix+"/include/panda3d/LICENSE") oscmd("cp doc/LICENSE "+destdir+prefix+"/include/panda3d/LICENSE")
oscmd("cp doc/ReleaseNotes "+destdir+prefix+"/share/panda3d/ReleaseNotes") oscmd("cp doc/ReleaseNotes "+destdir+prefix+"/share/panda3d/ReleaseNotes")

View File

@ -378,7 +378,6 @@ if (COMPILER=="LINUX"):
IncDirectory("FREETYPE", "/usr/X11/include/freetype2") IncDirectory("FREETYPE", "/usr/X11/include/freetype2")
IncDirectory("GLUT", "/usr/X11R6/include") IncDirectory("GLUT", "/usr/X11R6/include")
if (PkgSkip("PNG")==0): LibName("PNG", "-lpng") if (PkgSkip("PNG")==0): LibName("PNG", "-lpng")
if (PkgSkip("OPENSSL")==0): LibName("OPENSSL", "-lssl")
if (PkgSkip("FREETYPE")==0): LibName("FREETYPE", "-lfreetype") if (PkgSkip("FREETYPE")==0): LibName("FREETYPE", "-lfreetype")
elif (LocateBinary("pkg-config")): elif (LocateBinary("pkg-config")):
PkgConfigEnable("GTK2", "gtk+-2.0") PkgConfigEnable("GTK2", "gtk+-2.0")
@ -389,6 +388,7 @@ if (COMPILER=="LINUX"):
if (platform.uname()[1]=="pcbsd"): if (platform.uname()[1]=="pcbsd"):
IncDirectory("ALWAYS", "/usr/PCBSD/local/include") IncDirectory("ALWAYS", "/usr/PCBSD/local/include")
LibDirectory("ALWAYS", "/usr/PCBSD/local/lib")
if (os.path.exists("/usr/lib64")): if (os.path.exists("/usr/lib64")):
IncDirectory("GTK2", "/usr/lib64/glib-2.0/include") IncDirectory("GTK2", "/usr/lib64/glib-2.0/include")
@ -440,6 +440,7 @@ if (COMPILER=="LINUX"):
if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavformat") if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavformat")
if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavutil") if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lavutil")
if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lswscale") if (PkgSkip("FFMPEG")==0): LibName("FFMPEG", "-lswscale")
if (PkgSkip("OPENSSL")==0): LibName("OPENSSL", "-lssl")
if (PkgSkip("ZLIB")==0): LibName("ZLIB", "-lz") if (PkgSkip("ZLIB")==0): LibName("ZLIB", "-lz")
if (PkgSkip("JPEG")==0): LibName("JPEG", "-ljpeg") if (PkgSkip("JPEG")==0): LibName("JPEG", "-ljpeg")
if (PkgSkip("VRPN")==0): LibName("VRPN", "-lvrpn") if (PkgSkip("VRPN")==0): LibName("VRPN", "-lvrpn")

12
makepanda/pview.desktop Normal file
View File

@ -0,0 +1,12 @@
[Desktop Entry]
Name=Panda3D Model Viewer
GenericName=Model Viewer
Comment=View Panda3D model files
TryExec=pview
Exec=pview %U
StartupNotify=true
NoDisplay=true
Terminal=true
Type=Application
Categories=Viewer;
MimeType=model/x-egg;model/x-compressed-egg;model/x-bam;model/x-compressed-bam;