deploy-ng: Move distribution related files from direct.showtutil to direct.dist

direct/src/showutil/pfreeze.py → direct/src/dist/pfreeze.py

@@ -59,7 +59,7 @@ Options::
 import getopt
 import sys
 import os
-from direct.showutil import FreezeTool
+from . import FreezeTool
 
 def usage(code, msg = ''):
     if __doc__:

direct/src/p3d/Packager.py

@@ -19,7 +19,7 @@ from direct.p3d.SeqValue import SeqValue
 from direct.p3d.HostInfo import HostInfo
 from direct.showbase import Loader
 from direct.showbase import AppRunnerGlobal
-from direct.showutil import FreezeTool
+from direct.dist import FreezeTool
 from direct.directnotify.DirectNotifyGlobal import *
 
 vfs = VirtualFileSystem.getGlobalPtr()

makepanda/makepanda.py

@@ -2061,7 +2061,7 @@ def FreezePy(target, inputs, opts):
     if sys.version_info >= (2, 6):
         cmdstr += "-B "
 
-    cmdstr += os.path.join(GetOutputDir(), "direct", "showutil", "pfreeze.py")
+    cmdstr += os.path.join(GetOutputDir(), "direct", "dist", "pfreeze.py")
 
     if 'FREEZE_STARTUP' in opts:
         cmdstr += " -s"
@@ -2992,8 +2992,8 @@ Author-email: [email protected]
 """
 
 ENTRY_POINTS = """[distutils.commands]
-build_apps = direct.showutil.dist:build_apps
-bdist_apps = direct.showutil.dist:bdist_apps
+build_apps = direct.dist.commands:build_apps
+bdist_apps = direct.dist.commands:bdist_apps
 """
 
 if not PkgSkip("DIRECT"):

makepanda/makewheel.py

@@ -643,7 +643,7 @@ __version__ = '{0}'
     # Add a panda3d-tools directory containing the executables.
     entry_points = '[console_scripts]\n'
     entry_points += 'eggcacher = direct.directscripts.eggcacher:main\n'
-    entry_points += 'pfreeze = direct.showutil.pfreeze:main\n'
+    entry_points += 'pfreeze = direct.dist.pfreeze:main\n'
     tools_init = ''
     for file in os.listdir(bin_dir):
         basename = os.path.splitext(file)[0]
@@ -661,8 +661,8 @@ __version__ = '{0}'
             entry_points += '{0} = panda3d_tools:{1}\n'.format(basename, funcname)
             tools_init += '{0} = lambda: _exec_tool({1!r})\n'.format(funcname, file)
     entry_points += '[distutils.commands]\n'
-    entry_points += 'build_apps = direct.showutil.dist:build_apps\n'
-    entry_points += 'bdist_apps = direct.showutil.dist:bdist_apps\n'
+    entry_points += 'build_apps = direct.dist.commands:build_apps\n'
+    entry_points += 'bdist_apps = direct.dist.commands:bdist_apps\n'
 
     whl.write_file_data('panda3d_tools/__init__.py', PANDA3D_TOOLS_INIT.format(tools_init))
 

makepanda/test_imports.py

@@ -62,6 +62,7 @@ import direct.directutil.LargeBlobSenderConsts
 import direct.directutil.Mopath
 import direct.directutil.Verify
 import direct.directutil.WeightedChoice
+import direct.dist.FreezeTool
 import direct.distributed.AsyncRequest
 import direct.distributed.CRCache
 import direct.distributed.CRDataCache
@@ -234,7 +235,6 @@ import direct.showbase.VFSImporter
 import direct.showbase.WxGlobal
 import direct.showutil.BuildGeometry
 import direct.showutil.Effects
-import direct.showutil.FreezeTool
 import direct.showutil.Rope
 import direct.showutil.TexMemWatcher
 import direct.showutil.TexViewer

panda/src/iphone/ipfreeze.py

@@ -14,7 +14,7 @@ Usage:
 import getopt
 import sys
 import os
-from direct.showutil import FreezeTool
+from direct.dist import FreezeTool
 
 def usage(code, msg = ''):
     print >> sys.stderr, __doc__