backport of mkdoc from the develop branch except CYGWIN versus Cygwin

This commit is contained in:
zosrothko 2017-11-08 07:46:18 +01:00
parent 5488cc47e3
commit 4d2dac9237

View File

@ -1,4 +1,4 @@
#! /bin/sh #!/bin/bash
# #
# mkdoc # mkdoc
# #
@ -12,6 +12,11 @@
# usage: mkdoc [-l <perforce-label>] [<specfile>] # usage: mkdoc [-l <perforce-label>] [<specfile>]
# #
if [ "$POCO_BASE" = "" ] ; then
echo "Error: POCO_BASE not set."
exit 1
fi
osname=`uname -s | tr ' ' '_'` osname=`uname -s | tr ' ' '_'`
osarch=`uname -m | tr ' ' '_'` osarch=`uname -m | tr ' ' '_'`
@ -19,14 +24,14 @@ if [ ${osname:0:6} = "CYGWIN" ] ; then
osname="CYGWIN" osname="CYGWIN"
fi fi
if [ "$POCO_BASE" = "" ] ; then if [ $osname = "Darwin" ] ; then
echo "Error: POCO_BASE not set." archpath=`dirname stage/tools/PocoDoc/bin/Darwin/*/PocoDoc`
exit 1 osarch=`basename $archpath`
fi fi
spec="" spec=""
docConfig=$POCO_BASE/PocoDoc/cfg/mkdoc-poco.xml docConfig=$POCO_BASE/PocoDoc/cfg/mkdoc-poco.xml
while [ "$1" != "" ] ; while [ "$1" != "" ] ;
do do
if [ "$1" = "-C" ] ; then if [ "$1" = "-C" ] ; then
shift shift
@ -88,18 +93,13 @@ cd $tools
make -s -j8 make -s -j8
if [ $osname = "CYGWIN" ] ; then if [ $osname = "CYGWIN" ] ; then
find $tools -type f -name "*.$libversion.dll" > $TMP/dlls find $tools -type f -name "cyg*$libversion.dll" > $TMP/dlls
rebase -O -T $TMP/dlls rebase -O -T $TMP/dlls
rm $TMP/dlls rm $TMP/dlls
fi fi
cd $POCO_BASE cd $POCO_BASE
if [ $osname = "Darwin" ] ; then
archpath=`dirname stage/tools/PocoDoc/bin/Darwin/*/PocoDoc`
osarch=`basename $archpath`
fi
if [ $osname = "CYGWIN" ] ; then if [ $osname = "CYGWIN" ] ; then
# Poco dlls must be on PATH for Cygwin # Poco dlls must be on PATH for Cygwin
export PATH=$tools/lib/$osname/$osarch:$PATH export PATH=$tools/lib/$osname/$osarch:$PATH