Browse Source

move most of cygpath stuff into section for CYGWIN only so more platform independant

Joseph Lee 22 years ago
parent
commit
d9d36d9a8e
1 changed files with 19 additions and 15 deletions
  1. 19 15
      direct/src/ffi/genPyCode

+ 19 - 15
direct/src/ffi/genPyCode

@@ -30,46 +30,50 @@ shift
 extra_genPyCode_libs="$extra_genPyCode_libs $*"
 
 if [ "$INSTALL_DIR" != "" ]; then
-    install_dir=$(cygpath -am "$INSTALL_DIR")
+    install_dir=$INSTALL_DIR
 elif [ "$PANDA_INSTALL" != "" ]; then
-    install_dir=$(cygpath -am "$PANDA_INSTALL")
+    install_dir="$PANDA_INSTALL
 elif [ "$DIRECT" != "" ]; then
-    install_dir=$(cygpath -am "$DIRECT")
+    install_dir=$DIRECT"
 else
-    install_dir=$(cygpath -am ./install)
+    install_dir=./install
+fi
+
+pyDir=$DIRECT/lib/py
+extDir=$DIRECT/src/extensions
+pSqueezer=$DIRECT/src/showbase/pandaSqueezer.py
+
+if [ $(uname) = "CYGWIN_NT-5.0" ]; then
+  install_dir=$(cygpath -am $install_dir)
+  pyDir=$(cygpath -m $pyDir)
+  extDir=$(cygpath -m $extDir)
+  pSqueezer=$(cygpath -m $pSqueezer)
 fi
 
 if [ "$buildType" = "linux" ]; then
-    pyDir=$DIRECT/lib/py
     cd $DIRECT/bin
-    ppython -d generatePythonCode -v -d $pyDir -e $DIRECT/src/extensions -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect $extra_genPyCode_libs || exit
+    ppython -d generatePythonCode -v -d $pyDir -e $extDir -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect $extra_genPyCode_libs || exit
     pSqueezer=$DIRECT/src/showbase/pandaSqueezer.py
 
 elif [ "$buildType" = "win-debug" ]; then
-    pyDir=$(cygpath -m $DIRECT/lib/py)
     cd $DIRECT/bin
-    ppython -d generatePythonCode -v -d $pyDir -e `cygpath -w $DIRECT/src/extensions` -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect $extra_genPyCode_libs || exit
+    ppython -d generatePythonCode -v -d $pyDir -e $extDir -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect $extra_genPyCode_libs || exit
 elif [ "$buildType" = "win-release" ]; then
-    pyDir=$(cygpath -m $DIRECT/lib/py)
     cd $DIRECT/bin
-    ppython generatePythonCode -v -d $pyDir -e `cygpath -w $DIRECT/src/extensions` -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect $extra_genPyCode_libs || exit
-    pSqueezer=`cygpath -w $DIRECT/src/showbase/pandaSqueezer.py`
+    ppython generatePythonCode -v -d $pyDir -e $extDir -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect $extra_genPyCode_libs || exit
 
 elif [ "$buildType" = "win-publish" ]; then
     # no assertions, no comments, no docstrings
-    pyDir=$(cygpath -m $DIRECT/lib/py)
     cd $DIRECT/bin
-    ppython -OO generatePythonCode -O -v -d $pyDir -e `cygpath -w $DIRECT/src/extensions` -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect $extra_genPyCode_libs || exit
+    ppython -OO generatePythonCode -O -v -d $pyDir -e $extDir -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect $extra_genPyCode_libs || exit
     optimizeFlag="-O"
     ppythonOptimizeFlag="-OO"
-    pSqueezer=`cygpath -w $DIRECT/src/showbase/pandaSqueezer.py`
 
 elif [ "$buildType" = "install" ]; then
     # Use relative paths; as installed on a machine without ctattach etc.
     pyDir=$install_dir/lib/py
     ppython=$install_dir/bin/ppython
     $ppython -d $install_dir/bin/generatePythonCode -O -v -d $pyDir -e direct/src/extensions -i libdtoolconfig libpandaexpress libpanda libpandaphysics libdirect $extra_genPyCode_libs || exit
-    pSqueezer=$(cygpath -m $base_dir/direct/src/showbase/pandaSqueezer.py) || exit
 
 elif [ "$buildType" = "release" ]; then
     # Use relative paths; as installed on a machine without ctattach etc.