Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update libpng to 1.4.2 and upgrade warnings to force rebuilds. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10866 4a71c877-e1ca-e34f-864e-861f7616d084
master
dak180 2010-05-24 02:33:14 +00:00 committed by Git SVN Gateway
parent 5447668a78
commit c61a6b8632
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macosx/Warzone.xcodeproj/project.pbxproj
View File

@ -3918,7 +3918,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "DirectorY=\"libpng-1.4.1\"\nOutDir=\"libpng\"\nFileName=\"libpng-1.4.1.tar.gz\"\nSourceDLP=\"http://downloads.sourceforge.net/project/libpng/01-libpng-master/1.4.1/libpng-1.4.1.tar.gz\"\nMD5Sum=\"fa0b2a84733463f90d3ac9f43ccafabc\"\n\nconfigs/FetchSource.sh \"${DirectorY}\" \"${OutDir}\" \"${FileName}\" \"${SourceDLP}\" \"${MD5Sum}\"\nexit ${?}"; shellScript = "DirectorY=\"libpng-1.4.2\"\nOutDir=\"libpng\"\nFileName=\"libpng-1.4.2.tar.gz\"\nSourceDLP=\"http://downloads.sourceforge.net/project/libpng/01-libpng-master/1.4.2/libpng-1.4.2.tar.gz\"\nMD5Sum=\"89fd334dc5fc84ff146b9269c4fa452f\"\n\nconfigs/FetchSource.sh \"${DirectorY}\" \"${OutDir}\" \"${FileName}\" \"${SourceDLP}\" \"${MD5Sum}\"\nexit ${?}";
}; };
02FD38340BD4012A00776FD3 /* Fetch source */ = { 02FD38340BD4012A00776FD3 /* Fetch source */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;

9
macosx/configs/FetchPrebuilt.sh
View File

@ -32,14 +32,14 @@ elif [ -d "prebuilt/${DirectorY}" ]; then
exit 1 exit 1
elif [[ -d "external/${OutDir}" ]] && [[ ! -f "prebuilt/${FileName}" ]]; then elif [[ -d "external/${OutDir}" ]] && [[ ! -f "prebuilt/${FileName}" ]]; then
# Clean up when updating versions # Clean up when updating versions
echo "warning: Cached file is outdated or incomplete, removing" >&2 echo "error: Cached file is outdated or incomplete, removing" >&2
rm -fRv "prebuilt/${DirectorY}" "external/${OutDir}" rm -fR "prebuilt/${DirectorY}" "external/${OutDir}"
elif [[ -d "external/${OutDir}" ]] && [[ -f "prebuilt/${FileName}" ]]; then elif [[ -d "external/${OutDir}" ]] && [[ -f "prebuilt/${FileName}" ]]; then
# Check to make sure we have the right file # Check to make sure we have the right file
MD5SumLoc=`md5 -q "prebuilt/${FileName}"` MD5SumLoc=`md5 -q "prebuilt/${FileName}"`
if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
echo "warning: Cached file is outdated or incorrect, removing" >&2 echo "error: Cached file is outdated or incorrect, removing" >&2
rm -fRv "prebuilt/${FileName}" "prebuilt/${DirectorY}" "external/${OutDir}" rm -fR "prebuilt/${FileName}" "prebuilt/${DirectorY}" "external/${OutDir}"
else else
# Do not do more work then we have to # Do not do more work then we have to
echo "${OutDir} already exists, skipping" echo "${OutDir} already exists, skipping"
@ -82,6 +82,7 @@ if [ ! -d "${DirectorY}" ]; then
else else
cd .. cd ..
mv "prebuilt/${DirectorY}" "external/${OutDir}" mv "prebuilt/${DirectorY}" "external/${OutDir}"
touch external/${OutDir}/*
fi fi
exit 0 exit 0

9
macosx/configs/FetchSource.sh
View File

@ -31,14 +31,14 @@ elif [ -d "${DirectorY}" ]; then
exit 1 exit 1
elif [[ -d "${OutDir}" ]] && [[ ! -f "${FileName}" ]]; then elif [[ -d "${OutDir}" ]] && [[ ! -f "${FileName}" ]]; then
# Clean up when updating versions # Clean up when updating versions
echo "warning: Cached file is outdated or incomplete, removing" >&2 echo "error: Cached file is outdated or incomplete, removing" >&2
rm -fRv "${DirectorY}" "${OutDir}" rm -fR "${DirectorY}" "${OutDir}"
elif [[ -d "${OutDir}" ]] && [[ -f "${FileName}" ]]; then elif [[ -d "${OutDir}" ]] && [[ -f "${FileName}" ]]; then
# Check to make sure we have the right file # Check to make sure we have the right file
MD5SumLoc=`md5 -q "${FileName}"` MD5SumLoc=`md5 -q "${FileName}"`
if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
echo "warning: Cached file is outdated or incorrect, removing" >&2 echo "error: Cached file is outdated or incorrect, removing" >&2
rm -fRv "${FileName}" "${DirectorY}" "${OutDir}" rm -fR "${FileName}" "${DirectorY}" "${OutDir}"
else else
# Do not do more work then we have to # Do not do more work then we have to
echo "${OutDir} already exists, skipping" echo "${OutDir} already exists, skipping"
@ -90,6 +90,7 @@ if [ ! -d "${DirectorY}" ]; then
exit 1 exit 1
else else
mv "${DirectorY}" "${OutDir}" mv "${DirectorY}" "${OutDir}"
touch ${OutDir}/*
fi fi
exit 0 exit 0