Author: adhamh
Date: 2005-03-31 13:47:10 -0500 (Thu, 31 Mar 2005)
New Revision: 42439
Modified:
trunk/release/macosx/buildLibrary.sh
trunk/release/macosx/gdipBuild.sh
trunk/release/macosx/packageLibrary.sh
Log:
Fixes for 74244 and 74248
Modified: trunk/release/macosx/buildLibrary.sh
===================================================================
--- trunk/release/macosx/buildLibrary.sh 2005-03-31 18:46:48 UTC (rev
42438)
+++ trunk/release/macosx/buildLibrary.sh 2005-03-31 18:47:10 UTC (rev
42439)
@@ -17,96 +17,13 @@
ln -sf $2 Current
echo "Creating framework links"
cd $BASEPREFIX/$1
- if [ $FRAMEWORKNAME != "PkgConfig.framework" ]; then
- ln -sf Versions/Current/lib Libraries
- ln -sf Versions/Current/include Headers
- fi
+
+ ln -sf Versions/Current/Resources Resources
+ ln -sf Versions/Current/lib Libraries
+ ln -sf Versions/Current/include Headers
ln -sf Versions/Current/bin Commands
}
-icuSpecificBuild()
-{
- PREFIX=$1
- DEPNAME=$3
- if [ ! -d $BUILDROOT/Dependancies/icu ]; then
- echo "Downloading icu-2.8"
- curl -L -Z 5 -s -O --disable-epsv
ftp://www-126.ibm.com/pub/icu/2.8/icu-2.8.tgz
- gnutar xzf $3
- fi
- if [ $REMOVE == "YES" ]; then rm $3; fi
-
- cd icu/source
- if [ ${CONFIGURE} == "YES" ]; then
- #echo "Configuring ICU"
- #exit
- echo ""
- echo "=================================================="
- echo "Configuring $DEPNAME"
- echo "=================================================="
- echo ""
- ./runConfigureICU MacOSX --with-data-packaging=library --quiet
--prefix=$PREFIX --libdir=$PREFIX/lib/
- gnumake
- fi
- echo $PWD
- if [ $CLEAN == "YES" ]; then
- echo ""
- echo "=================================================="
- echo "Cleaning $DEPNAME"
- echo "=================================================="
- echo ""
- make clean
- fi
- echo ""
- echo "=================================================="
- echo "Building $DEPNAME"
- echo "=================================================="
- echo ""
- make install
- #make clean
-
- cd $PREFIX/lib
-
- echo ""
- echo "=================================================="
- echo "Installing $DEPNAME"
- echo "=================================================="
- echo ""
- # libicudata
- install_name_tool -id $PREFIX/lib/libicudata.dylib.28 libicudata.dylib.28.0
-
- # libicui18n
- install_name_tool -id $PREFIX/lib/libicui18n.dylib.28 libicui18n.dylib.28.0
- install_name_tool -change libicuuc.dylib.28 $PREFIX/lib/libicuuc.dylib.28
libicui18n.dylib.28.0
- install_name_tool -change libicudata.dylib.28
$PREFIX/lib/libicudata.dylib.28 libicui18n.dylib.28.0
-
- # libicuio
- install_name_tool -id $PREFIX/lib/libicuio.dylib.28 libicuio.dylib.28.0
- install_name_tool -change libicuuc.dylib.28 $PREFIX/lib/libicuuc.dylib.28
libicuio.dylib.28.0
- install_name_tool -change libicudata.dylib.28
$PREFIX/lib/libicudata.dylib.28 libicuio.dylib.28.0
- install_name_tool -change libicui18n.dylib.28
$PREFIX/lib/libicui18n.dylib.28 libicuio.dylib.28.0
-
- # libicule
- install_name_tool -id $PREFIX/lib/libicule.dylib.28 libicule.dylib.28.0
- install_name_tool -change libicuuc.dylib.28 $PREFIX/lib/libicuuc.dylib.28
libicule.dylib.28.0
- install_name_tool -change libicudata.dylib.28
$PREFIX/lib/libicudata.dylib.28 libicule.dylib.28.0
-
- # libiculx
- install_name_tool -id $PREFIX/lib/libiculx.dylib.28 libiculx.dylib.28.0
- install_name_tool -change libicuuc.dylib.28 $PREFIX/lib/libicuuc.dylib.28
libiculx.dylib.28.0
- install_name_tool -change libicudata.dylib.28
$PREFIX/lib/libicudata.dylib.28 libiculx.dylib.28.0
- install_name_tool -change libicule.dylib.28 $PREFIX/lib/libicule.dylib.28
libiculx.dylib.28.0
-
- # libicutoolutil
- install_name_tool -id $PREFIX/lib/libicutoolutil.dylib.28
libicutoolutil.dylib.28.0
- install_name_tool -change libicuuc.dylib.28 $PREFIX/lib/libicuuc.dylib.28
libicutoolutil.dylib.28.0
- install_name_tool -change libicudata.dylib.28
$PREFIX/lib/libicudata.dylib.28 libicutoolutil.dylib.28.0
-
- # libicuuc
- install_name_tool -id $PREFIX/lib/libicuuc.dylib.28 libicuuc.dylib.28.0
- install_name_tool -change libicudata.dylib.28
$PREFIX/lib/libicudata.dylib.28 libicuuc.dylib.28.0
-
-}
-
createConfigFiles()
{
#Create gacutil config files specific to OS X
@@ -170,7 +87,7 @@
else
if [ ! -d $BUILDROOT/Dependancies/$DIR ]; then
echo "Downloading $DIR"
- curl -L -Z 5 -s -O $URL
+ curl -L --max-redirs 5 -s -O $URL
gnutar xzf $TARBALL
CLEAN=NO
fi
Modified: trunk/release/macosx/gdipBuild.sh
===================================================================
--- trunk/release/macosx/gdipBuild.sh 2005-03-31 18:46:48 UTC (rev 42438)
+++ trunk/release/macosx/gdipBuild.sh 2005-03-31 18:47:10 UTC (rev 42439)
@@ -33,8 +33,9 @@
#################################################
cd ${DEPS}
if [ ! -e ${DEPS}/${WORKSRCDIR} ];then
- curl -L -Z 5 -s -O ${URL}
+ curl -L --max-redirs 5 -s -O ${URL}
gnutar -xzf ${DISTNAME}
+fi
cd ${WORKSRCDIR}
patch config.guess ${PATCHDIR}/patch-config.guess
patch config.sub ${PATCHDIR}/patch-config.sub
@@ -47,8 +48,8 @@
./configure --enable-shared --enable-static --prefix=${MONOPREFIX}
make
make install
-fi
+
################################
PATCHDIR=${MONOBUILDFILES}/libgdiplus/tiff/files
NAME=tiff
@@ -60,32 +61,32 @@
cd ${DEPS}
if [ ! -e ${DEPS}/${WORKSRCDIR} ];then
- curl -L -Z 5 -s -O ${URL}
+ curl -L --max-redirs 5 -s -O ${URL}
gnutar -xzf ${DISTNAME}
cd ${WORKSRCDIR}
-
+fi
./configure --prefix=${MONOPREFIX} --mandir=${MONOPREFIX}/share/man \
--with-jpeg-include-dir=${MONOPREFIX}/include \
--with-jpeg-lib-dir=${MONOPREFIX}/lib
make
make install
-fi
+
###############################################
#PATCHDIR=${MONOBUILDFILES}/libgdiplus/tiff/files
NAME=libpng
VERSION=1.2.8
DISTNAME=${NAME}-${VERSION}-config.tar.gz
-URL=http://umn.dl.sourceforge.net/sourceforge/libpng/${DISTNAME}
+URL=http://easynews.dl.sourceforge.net/sourceforge/libpng/${DISTNAME}
WORKSRCDIR=${NAME}-${VERSION}-config
#MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/Current
cd ${DEPS}
if [ ! -e ${DEPS}/${WORKSRCDIR} ];then
- curl -L -Z 5 -s -O ${URL}
+ curl -L --max-redirs 5 -s -O ${URL}
gnutar -xzf ${DISTNAME}
cd ${WORKSRCDIR}
-
+fi
#cp scripts/makefile.darwin Makefile
./configure --prefix=${MONOPREFIX}
#sed -e "s/\/usr\/local/\${MONOPREFIX}/g" Makefile > Makefile.patched
@@ -94,32 +95,32 @@
make
make install
-fi
+
###############################################
#PATCHDIR=${MONOBUILDFILES}/libgdiplus/tiff/files
NAME=libungif
VERSION=4.1.3
DISTNAME=${NAME}-${VERSION}.tar.gz
-URL=http://umn.dl.sourceforge.net/sourceforge/libungif/${DISTNAME}
+URL=http://easynews.dl.sourceforge.net/sourceforge/libungif/libungif-4.1.3.tar.gz
WORKSRCDIR=${NAME}-${VERSION}
#MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/Current
cd ${DEPS}
if [ ! -e ${DEPS}/${WORKSRCDIR} ];then
- curl -L -Z 5 -s -O ${URL}
+ curl -L --max-redirs 5 -s -O ${URL}
gnutar -xzf ${DISTNAME}
cd ${WORKSRCDIR}
-
+fi
./configure --prefix=${MONOPREFIX}
make
make install
-fi
+
###############################################
NAME=libgdiplus
-VERSION=1.1.4
+VERSION=1.1.5
DISTNAME=${NAME}-${VERSION}.tar.gz
-URL=http://www.go-mono.com/archive/1.1.4/${DISTNAME}
+URL=http://www.go-mono.com/archive/1.1.5/${DISTNAME}
WORKSRCDIR=${NAME}-${VERSION}
#MONOPREFIX=/Library/Frameworks/Mono.framework/Versions/Current
@@ -127,8 +128,8 @@
cd ${DEPS}
if [ ! -e ${DEPS}/${WORKSRCDIR} ];then
- if [ ! -e ${DISTNAME} ];then
- curl -L -Z 5 -s -O ${URL}
+ if [ ! -e ${DEPS}/${DISTNAME} ];then
+ curl -L --max-redirs 5 -s -O ${URL}
gnutar -xzf ${DISTNAME}
fi
@@ -138,4 +139,4 @@
make
make install
-#http://www.go-mono.com/archive/1.1.4/libgdiplus-1.1.4.tar.gz
\ No newline at end of file
+#http://www.go-mono.com/archive/1.1.5/libgdiplus-1.1.5.tar.gz
\ No newline at end of file
Modified: trunk/release/macosx/packageLibrary.sh
===================================================================
--- trunk/release/macosx/packageLibrary.sh 2005-03-31 18:46:48 UTC (rev
42438)
+++ trunk/release/macosx/packageLibrary.sh 2005-03-31 18:47:10 UTC (rev
42439)
@@ -107,7 +107,7 @@
<key>BuildVersion</key>
<string>${VERSION}</string>
<key>CFBundleShortVersionString</key>
- <string${VERSION}</string>
+ <string>${VERSION}</string>
<key>CFBundleVersion</key>
<string>${VERSION}</string>
<key>ProjectName</key>
@@ -145,7 +145,8 @@
ln -sf Versions/Current/lib Libraries
ln -sf Versions/Current/include Headers
ln -sf Versions/Current/bin Commands
-
+ ln -sf Versions/Current/Resources Resources
+
if [ ! -d
/Library/Frameworks/Mono.framework/Versions/Current/Resources ]; then
mkdir -p
/Library/Frameworks/Mono.framework/Versions/Current/Resources
fi
@@ -180,7 +181,6 @@
cp ${BUILDROOT}/plists/Info.plist
${BUILDROOT}/PKGROOT/Library/Frameworks/${FRAMEWORKNAME}.framework/Versions/${VERSION}/Resources/
cp ${BUILDROOT}/resources/version.plist
${BUILDROOT}/PKGROOT/Library/Frameworks/${FRAMEWORKNAME}.framework/Versions/${VERSION}/Resources/
-
# PackageMaker will package everything in the PKGROOT directory. We really
don't want
# that because then we would be creating packages that have duplicate
information thus
# defeating the purpose of have individual packages. So once the package has
been created
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
