From 0eee6f63b6bf338da5f7e0ccd23e241710f29f7a Mon Sep 17 00:00:00 2001
From: Mark Mine <mark.mine@disney.com>
Date: Tue, 29 Jun 2004 23:20:26 +0000
Subject: [PATCH] match new world order

---
 direct/src/leveleditor/copyfiles  | 29 +++++++++++++++++++++++++++--
 direct/src/leveleditor/printfiles | 25 +++++++++++++++----------
 direct/src/leveleditor/run.bat    |  4 +++-
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/direct/src/leveleditor/copyfiles b/direct/src/leveleditor/copyfiles
index 63fc67d21c..34838e9d3b 100755
--- a/direct/src/leveleditor/copyfiles
+++ b/direct/src/leveleditor/copyfiles
@@ -25,11 +25,36 @@ fi
 
 for file in `$printfilesCmd $debug_state`
 do
-	if cp -R ${file} ${destdir}
+	copyTo=${destdir}
+
+        moduleDir=`dirname ${file}`
+	srcDir=`dirname ${moduleDir}`
+        packageDir=`dirname ${srcDir}`
+
+        moduleDir=`basename ${moduleDir}`
+        srcDir=`basename ${srcDir}`
+        packageDir=`basename ${packageDir}`
+        
+        if [ `basename ${file} .py` != `basename ${file}` -o \
+             `basename ${file} .pyz` != `basename ${file}` ]; then
+            # The file is a Python file.  Is it in a src directory?
+            if [ ${srcDir} = src ]; then
+		copyPkg=${destdir}/${packageDir}
+                copyTo=${copyPkg}/${moduleDir}
+                (mkdir ${copyPkg}; touch ${copyPkg}/__init__.py) > /dev/null 2>&1
+                (mkdir ${copyTo}; touch ${copyTo}/__init__.py) > /dev/null 2>&1
+	    elif [ ${moduleDir} = pandac ]; then
+                copyTo=${destdir}/pandac
+                (mkdir ${copyTo}; touch ${copyTo}/__init__.py) > /dev/null 2>&1
+            fi
+        fi
+
+	if cp -R ${file} ${copyTo}
 	then
-	    echo "copying ${file} to ${destdir}"
+	    echo "copying ${file} to ${copyTo}"
 	else
 	    echo "ERROR: could not find ${file}"
 	    exit 1
 	fi
 done
+
diff --git a/direct/src/leveleditor/printfiles b/direct/src/leveleditor/printfiles
index 75ac855a8b..bbcb5d915d 100755
--- a/direct/src/leveleditor/printfiles
+++ b/direct/src/leveleditor/printfiles
@@ -3,6 +3,7 @@
 # Configrc for running the show
 # This uses the executable system now, not the configrc
 echo $DIRECT/src/leveleditor/Configrc
+echo $DIRECT/src/leveleditor/run.bat
 
 # Python files
 echo $WINTOOLS/bin/python.exe
@@ -62,12 +63,20 @@ echo $DIRECT/lib/libdirect.dll
 echo $OTP/lib/libotp.dll
 echo $TOONTOWN/lib/libtoontown.dll
 
-# Generated code for libpandaexpress
-printlib $DIRECT/lib/py libpandaexpress
-printlib $DIRECT/lib/py libpanda
-printlib $DIRECT/lib/py libpandaphysics
-printlib $DIRECT/lib/py libdirect
-printlib $DIRECT/lib/py libtoontown
+# Generated code for libpanda
+printlib $DIRECT/lib/pandac libpanda
+printlib $DIRECT/lib/pandac libpandaphysics
+echo $DIRECT/lib/pandac/PandaModules.py
+echo $DIRECT/lib/pandac/PandaModules.pyz
+
+# Generated code for libdirect
+printlib $DIRECT/lib/pandac libdirect
+
+# Generated code for libotp
+printlib $DIRECT/lib/pandac libotp
+
+# Generated code for libtoontown
+printlib $DIRECT/lib/pandac libtoontown
 
 # DIRECT stuff
 printdir $DIRECT/src/actor .py
@@ -84,7 +93,6 @@ printdir $DIRECT/src/fsm .py
 printdir $DIRECT/src/gui .py
 printdir $DIRECT/src/interval .py
 printdir $DIRECT/src/leveleditor .py
-echo $DIRECT/src/leveleditor/run.bat
 printdir $DIRECT/src/particles .py
 printdir $DIRECT/src/showbase .py
 printdir $DIRECT/src/task .py
@@ -97,6 +105,3 @@ echo $PANDA/etc/layout_db
 echo $PANDA/etc/setup_db
 echo $PANDA/etc/window_db
 
-# Generated code for libpanda
-echo $DIRECT/lib/py/PandaModules.py
-echo $DIRECT/lib/py/PandaModules.pyz
diff --git a/direct/src/leveleditor/run.bat b/direct/src/leveleditor/run.bat
index 959cef25ee..e37bc0e6ad 100755
--- a/direct/src/leveleditor/run.bat
+++ b/direct/src/leveleditor/run.bat
@@ -2,4 +2,6 @@ set PATH=lib
 set PYTHONPATH=.;lib-tk
 set TTMODELS=/i/alpha/player/install/ttmodels
 set DMODELS=/i/alpha/player/install/dmodels
-python.exe LevelEditor.py
+set CFG_PATH=.
+set CONFIG_CONFIG=:configpath=CFG_PATH
+python.exe direct\leveleditor\LevelEditor.py