From 310f3ca08561e6b84f4aae349fa3409a6df2562e Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 20 Dec 2020 11:46:23 +0100 Subject: [PATCH 1/3] samples: Add deprecation notice to rocket-console sample [skip ci] --- samples/rocket-console/main.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/samples/rocket-console/main.py b/samples/rocket-console/main.py index 7269c4b960..f504679ab5 100644 --- a/samples/rocket-console/main.py +++ b/samples/rocket-console/main.py @@ -1,5 +1,9 @@ """ Show how to use libRocket in Panda3D. + +NOTE: libRocket is only available for Python 2.7, which is itself deprecated. +We have therefore deprecated libRocket support in Panda3D, and it will be +removed in Panda3D 1.11. """ import sys from panda3d.core import loadPrcFile, loadPrcFileData, Point3,Vec4, Mat4, LoaderOptions # @UnusedImport From 5cd6469fd893612a36f5e86ef5ff331b7fcec37b Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 21 Dec 2020 22:08:45 +0100 Subject: [PATCH 2/3] makepanda: Don't make built/Frameworks directory unless needed It is no longer needed if we don't ship Cg as a framework, see #1079 [skip ci] --- makepanda/makepanda.py | 1 + makepanda/makepandacore.py | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index eadb8ce189..fa7df48550 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -3337,6 +3337,7 @@ if tp_dir is not None: JustBuilt([target], [tp_lib]) for fwx in glob.glob(tp_pkg + "/*.framework"): + MakeDirectory(GetOutputDir() + "/Frameworks") CopyTree(GetOutputDir() + "/Frameworks/" + os.path.basename(fwx), fwx) else: # Linux / FreeBSD case. diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index fdb10d8388..de8fd0a991 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1255,10 +1255,7 @@ def MakeBuildTree(): MakeDirectory(OUTPUTDIR + "/pandac/input") MakeDirectory(OUTPUTDIR + "/panda3d") - if GetTarget() == 'darwin': - MakeDirectory(OUTPUTDIR + "/Frameworks") - - elif GetTarget() == 'android': + if GetTarget() == 'android': MakeDirectory(OUTPUTDIR + "/classes") ######################################################################## From eea0abe4886011827e42b8accc6372a64a0ee997 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 21 Dec 2020 22:16:36 +0100 Subject: [PATCH 3/3] makepackage: Only copy Frameworks dir if present and not empty This directory may now be vestigial as of the previous commit. [skip ci] --- makepanda/makepackage.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/makepanda/makepackage.py b/makepanda/makepackage.py index 274f159ce4..31835cfd99 100755 --- a/makepanda/makepackage.py +++ b/makepanda/makepackage.py @@ -509,7 +509,8 @@ def MakeInstallerOSX(version, runtime=False, python_versions=[], installdir=None oscmd("cp -R %s/models dstroot/base/%s/models" % (outputdir, installdir)) oscmd("cp -R doc/LICENSE dstroot/base/%s/LICENSE" % installdir) oscmd("cp -R doc/ReleaseNotes dstroot/base/%s/ReleaseNotes" % installdir) - oscmd("cp -R %s/Frameworks dstroot/base/%s/Frameworks" % (outputdir, installdir)) + if os.path.isdir(outputdir+"/Frameworks") and os.listdir(outputdir+"/Frameworks"): + oscmd("cp -R %s/Frameworks dstroot/base/%s/Frameworks" % (outputdir, installdir)) if os.path.isdir(outputdir+"/plugins"): oscmd("cp -R %s/plugins dstroot/base/%s/plugins" % (outputdir, installdir))