diff --git a/makepanda/installpanda.py b/makepanda/installpanda.py
index bea24b9d41..8bf9538017 100644
--- a/makepanda/installpanda.py
+++ b/makepanda/installpanda.py
@@ -21,6 +21,83 @@ if (platform.architecture()[0] == "64bit"):
else:
libdir = "/lib"
+MIME_INFO = (
+ ("egg", "model/x-egg", "EGG model file", "pview"),
+ ("bam", "model/x-bam", "Panda3D binary model file", "pview"),
+ ("egg.pz", "model/x-compressed-egg", "Compressed EGG model file", "pview"),
+ ("bam.pz", "model/x-compressed-bam", "Compressed Panda3D binary model file", "pview"),
+)
+
+MIME_INFO_PLUGIN = (
+ ("p3d", "application/x-panda3d", "Panda3D game/applet", "panda3d"),
+)
+
+APP_INFO = (
+ ("pview", "Panda3D Model Viewer", ("egg", "bam", "egg.pz", "bam.pz")),
+)
+
+APP_INFO_PLUGIN = (
+ ("panda3d", "Panda3D", ("p3d")),
+)
+
+def WriteApplicationsFile(fname, appinfo, mimeinfo):
+ fhandle = open(fname, "w")
+ for app, desc, exts in appinfo:
+ print >>fhandle, app
+ print >>fhandle, "\tcommand=" + app
+ print >>fhandle, "\tname=" + desc
+ print >>fhandle, "\tcan_open_multiple_files=true"
+ print >>fhandle, "\texpects_uris=false"
+ print >>fhandle, "\trequires_terminal=false"
+ print >>fhandle, "\tmime_types=",
+ first = True
+ for ext, mime, desc2, app2 in mimeinfo:
+ if (ext in exts):
+ if (first):
+ fhandle.write(mime)
+ first = False
+ else:
+ fhandle.write("," + mime)
+ fhandle.write("\n")
+ print >>fhandle
+ fhandle.close()
+
+def WriteMimeXMLFile(fname, info):
+ fhandle = open(fname, "w")
+ print >>fhandle, ""
+ print >>fhandle
+ print >>fhandle, ""
+ for ext, mime, desc, app in info:
+ print >>fhandle, "\t"
+ print >>fhandle, "\t\t" + desc + ""
+ print >>fhandle, "\t\t"
+ print >>fhandle, "\t"
+ print >>fhandle, ""
+ print >>fhandle
+ fhandle.close()
+
+def WriteMimeFile(fname, info):
+ fhandle = open(fname, "w")
+ for ext, mime, desc, app in info:
+ print >>fhandle, mime + ":"
+ if ("." in ext):
+ print >>fhandle, "\tregex,2: " + ext.replace(".", "\\.") + "$"
+ print >>fhandle, "\text: " + ext
+ print >>fhandle
+ fhandle.close()
+
+def WriteKeysFile(fname, info):
+ fhandle = open(fname, "w")
+ for ext, mime, desc, app in info:
+ print >>fhandle, mime + ":"
+ print >>fhandle, "\tdescription=" + desc
+ print >>fhandle, "\tdefault_action_type=application"
+ print >>fhandle, "\tshort_list_application_ids_for_novice_user_level=" + app
+ print >>fhandle, "\topen=" + app + " %f"
+ print >>fhandle, "\tview=" + app + " %f"
+ print >>fhandle
+ fhandle.close()
+
def InstallPanda(destdir="", prefix="/usr", outputdir="built"):
if (not prefix.startswith("/")): prefix = "/" + prefix
PPATH=get_python_lib()
@@ -32,9 +109,6 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"):
oscmd("mkdir -p "+destdir+prefix+"/share/mime/packages")
oscmd("mkdir -p "+destdir+prefix+"/share/application-registry")
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+PPATH)
oscmd("mkdir -p "+destdir+"/etc/ld.so.conf.d")
@@ -48,11 +122,10 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"):
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")
- oscmd("cp makepanda/panda3d.mime "+destdir+prefix+"/share/mime-info/panda3d.mime")
- oscmd("cp makepanda/panda3d.keys "+destdir+prefix+"/share/mime-info/panda3d.keys")
- oscmd("cp makepanda/mime.xml "+destdir+prefix+"/share/mime/packages/panda3d.xml")
- oscmd("cp makepanda/panda3d.applications "+destdir+prefix+"/share/application-registry/panda3d.applications")
- oscmd("cp makepanda/panda3d.desktop "+destdir+prefix+"/share/applications/panda3d.desktop")
+ WriteMimeFile(destdir+prefix+"/share/mime-info/panda3d.mime", MIME_INFO)
+ WriteKeysFile(destdir+prefix+"/share/mime-info/panda3d.keys", MIME_INFO)
+ WriteMimeXMLFile(destdir+prefix+"/share/mime/packages/panda3d.xml", MIME_INFO)
+ WriteApplicationsFile(destdir+prefix+"/share/application-registry/panda3d.applications", APP_INFO, MIME_INFO)
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")
@@ -73,12 +146,36 @@ def InstallPanda(destdir="", prefix="/usr", outputdir="built"):
# if ((base != "extensions") and (base != "extensions_native")):
# compileall.compile_dir(destdir+prefix+"/share/panda3d/direct/"+base)
#compileall.compile_dir(destdir+prefix+"/share/panda3d/Pmw")
- DeleteCVS(destdir)
+ DeleteCVS(destdir+prefix+"/include/panda3d")
+ DeleteCVS(destdir+prefix+"/share/panda3d")
# rpmlint doesn't like these files, for some reason.
DeleteBuildFiles(destdir+prefix+"/share/panda3d")
if (os.path.isfile(destdir+prefix+"/share/panda3d/direct/leveleditor/copyfiles.pl")):
os.remove(destdir+prefix+"/share/panda3d/direct/leveleditor/copyfiles.pl")
+def InstallPlugin(destdir="", prefix="/usr", outputdir="built"):
+ if (not prefix.startswith("/")): prefix = "/" + prefix
+ oscmd("mkdir -p "+destdir+prefix+"/bin")
+ oscmd("mkdir -p "+destdir+prefix+"/share/mime-info")
+ oscmd("mkdir -p "+destdir+prefix+"/share/mime/packages")
+ oscmd("mkdir -p "+destdir+prefix+"/share/application-registry")
+ oscmd("mkdir -p "+destdir+prefix+"/share/applications")
+ oscmd("mkdir -p "+destdir+prefix+libdir+"/panda3d")
+ if (os.path.exists(outputdir+"/lib/nppanda3d.so")):
+ 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("cp "+outputdir+"/lib/nppanda3d.so "+destdir+prefix+libdir+"/panda3d/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")
+ WriteMimeFile(destdir+prefix+"/share/mime-info/panda3d-runtime.mime", MIME_INFO_PLUGIN)
+ WriteKeysFile(destdir+prefix+"/share/mime-info/panda3d-runtime.keys", MIME_INFO_PLUGIN)
+ WriteMimeXMLFile(destdir+prefix+"/share/mime/packages/panda3d-runtime.xml", MIME_INFO_PLUGIN)
+ WriteApplicationsFile(destdir+prefix+"/share/application-registry/panda3d-runtime.applications", APP_INFO_PLUGIN, MIME_INFO_PLUGIN)
+ oscmd("cp makepanda/panda3d.desktop "+destdir+prefix+"/share/applications/panda3d.desktop")
+ oscmd("cp "+outputdir+"/bin/panda3d "+destdir+prefix+"/bin/")
+
if (__name__ == "__main__"):
if (sys.platform != "linux2"):
exit("This script only works on linux at the moment!")
diff --git a/makepanda/mime.xml b/makepanda/mime.xml
deleted file mode 100644
index 5d68851cd1..0000000000
--- a/makepanda/mime.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- EGG model file
-
-
-
-
- Compressed EGG model file
-
-
-
-
- Panda3D binary model file
-
-
-
-
- Compressed Panda3D binary model file
-
-
-
-
- Panda3D applet
-
-
-
diff --git a/makepanda/panda3d.applications b/makepanda/panda3d.applications
deleted file mode 100644
index 0baa6904cb..0000000000
--- a/makepanda/panda3d.applications
+++ /dev/null
@@ -1,16 +0,0 @@
-pview
- command=pview
- name=Panda3D Model Viewer
- can_open_multiple_files=true
- expects_uris=false
- requires_terminal=false
- mime_types=model/x-egg,model/x-bam,model/x-compressed-egg,model/x-compressed-bam
-
-panda3d
- command=panda3d
- name=Panda3D
- can_open_multiple_files=false
- expects_uris=false
- requires_terminal=false
- mime_types=application/x-panda3d
-
diff --git a/makepanda/panda3d.keys b/makepanda/panda3d.keys
deleted file mode 100644
index 7a174549bb..0000000000
--- a/makepanda/panda3d.keys
+++ /dev/null
@@ -1,35 +0,0 @@
-model/x-egg:
- description=EGG model file
- default_action_type=application
- short_list_application_ids_for_novice_user_level=pview
- open=pview %f
- view=pview %f
-
-model/x-compressed-egg:
- description=Compressed EGG model file
- default_action_type=application
- short_list_application_ids_for_novice_user_level=pview
- open=pview %f
- view=pview %f
-
-model/x-bam:
- description=Panda3D binary model file
- default_action_type=application
- short_list_application_ids_for_novice_user_level=pview
- open=pview %f
- view=pview %f
-
-model/x-compressed-bam:
- description=Compressed Panda3D binary model file
- default_action_type=application
- short_list_application_ids_for_novice_user_level=pview
- open=pview %f
- view=pview %f
-
-application/x-panda3d:
- description=Panda3D applet
- default_action_type=application
- short_list_application_ids_for_novice_user_level=panda3d
- open=panda3d %f
- view=panda3d %f
-
diff --git a/makepanda/panda3d.mime b/makepanda/panda3d.mime
deleted file mode 100644
index 2cc660b7d7..0000000000
--- a/makepanda/panda3d.mime
+++ /dev/null
@@ -1,17 +0,0 @@
-model/x-egg:
- ext: egg
-
-model/x-compressed-egg:
- regex,2: egg\.pz$
- ext: egg.pz
-
-model/x-bam:
- ext: bam
-
-model/x-compressed-bam:
- regex,2: bam\.pz$
- ext: bam.pz
-
-application/x-panda3d:
- ext: p3d
-