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

This commit is contained in:
Joseph Lee 2003-07-17 02:01:19 +00:00
parent acc6620779
commit d9d36d9a8e

View File

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