mirror of
				https://github.com/pocoproject/poco.git
				synced 2025-11-04 04:09:57 +01:00 
			
		
		
		
	Refactoring for Cygwin: add Poco cyg*.dll tp PATH.
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
This commit is contained in:
		@@ -1,4 +1,4 @@
 | 
				
			|||||||
#! /bin/sh
 | 
					#!/bin/bash
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# $Id: //poco/1.4/release/script/mkdoc#2 $
 | 
					# $Id: //poco/1.4/release/script/mkdoc#2 $
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
@@ -19,6 +19,18 @@ if [ "$POCO_BASE" = "" ] ; then
 | 
				
			|||||||
  exit 1
 | 
					  exit 1
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					osname=`uname -s | tr ' ' '_'`
 | 
				
			||||||
 | 
					osarch=`uname -m | tr ' ' '_'`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if [ ${osname:0:6} = "CYGWIN" ] ; then
 | 
				
			||||||
 | 
						osname="Cygwin"
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if [ $osname = "Darwin" ] ; then
 | 
				
			||||||
 | 
						archpath=`dirname stage/tools/PocoDoc/bin/Darwin/*/PocoDoc`
 | 
				
			||||||
 | 
						osarch=`basename $archpath`
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
spec=""
 | 
					spec=""
 | 
				
			||||||
docConfig=$POCO_BASE/PocoDoc/cfg/mkdoc-poco.xml
 | 
					docConfig=$POCO_BASE/PocoDoc/cfg/mkdoc-poco.xml
 | 
				
			||||||
while [ "$1" != "" ] ; 
 | 
					while [ "$1" != "" ] ; 
 | 
				
			||||||
@@ -59,6 +71,14 @@ if [ "$version" = "" ] ; then
 | 
				
			|||||||
fi
 | 
					fi
 | 
				
			||||||
release=$version$tag
 | 
					release=$version$tag
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if [ ! -f libversion ] ; then
 | 
				
			||||||
 | 
					  echo "Error: No libversion file found."
 | 
				
			||||||
 | 
					  exit 2
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
					if [ "$libversion" = "" ] ; then
 | 
				
			||||||
 | 
						read libversion <$POCO_BASE/libversion
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
# Build release
 | 
					# Build release
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
@@ -74,16 +94,20 @@ cd $tools
 | 
				
			|||||||
./configure --no-tests --no-samples
 | 
					./configure --no-tests --no-samples
 | 
				
			||||||
make -s -j8
 | 
					make -s -j8
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					if [ $osname = "Cygwin" ] ; then
 | 
				
			||||||
 | 
					    find $tools -type f -name "cyg*$libversion.dll" > $TMP/dlls
 | 
				
			||||||
 | 
					    rebase -O -T $TMP/dlls
 | 
				
			||||||
 | 
					    rm $TMP/dlls
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cd $POCO_BASE
 | 
					cd $POCO_BASE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
osname=`uname -s | tr ' ' '_'`
 | 
					if [ $osname = "Cygwin" ] ; then
 | 
				
			||||||
osarch=`uname -m | tr ' ' '_'`
 | 
					#   Poco dlls must be on PATH for Cygwin
 | 
				
			||||||
 | 
					    export PATH=$tools/lib/$osname/$osarch:$PATH
 | 
				
			||||||
if [ $osname = "Darwin" ] ; then
 | 
					 | 
				
			||||||
	archpath=`dirname stage/tools/PocoDoc/bin/Darwin/*/PocoDoc`
 | 
					 | 
				
			||||||
	osarch=`basename $archpath`
 | 
					 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export PATH=$tools/PocoDoc/bin/$osname/$osarch:$PATH
 | 
					export PATH=$tools/PocoDoc/bin/$osname/$osarch:$PATH
 | 
				
			||||||
echo PATH=$PATH
 | 
					echo PATH=$PATH
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user