Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 3 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Showing with 95 additions and 99 deletions.
  1. +0 −4 macosx/Warzone.xcodeproj/project.pbxproj
  2. +44 −44 macosx/configs/FetchPrebuilt.sh
  3. +51 −51 macosx/configs/FetchSource.sh
View
4 macosx/Warzone.xcodeproj/project.pbxproj
@@ -145,7 +145,6 @@
0246A0E40BD3CC0B004D1C70 /* animobj.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0246A0D90BD3CC0B004D1C70 /* animobj.cpp */; };
0246A0E70BD3CC0B004D1C70 /* gtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0246A0DD0BD3CC0B004D1C70 /* gtime.cpp */; };
0246A1030BD3CC29004D1C70 /* bitimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0246A0EA0BD3CC29004D1C70 /* bitimage.cpp */; };
- 0246A1040BD3CC29004D1C70 /* imd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0246A0EE0BD3CC29004D1C70 /* imd.cpp */; };
0246A1050BD3CC29004D1C70 /* imdload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0246A0F00BD3CC29004D1C70 /* imdload.cpp */; };
0246A1070BD3CC29004D1C70 /* pieclip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0246A0F60BD3CC29004D1C70 /* pieclip.cpp */; };
0246A11D0BD3CC43004D1C70 /* ivi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0246A10B0BD3CC43004D1C70 /* ivi.cpp */; };
@@ -1281,7 +1280,6 @@
0246A0E20BD3CC0B004D1C70 /* parser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = parser.h; path = ../lib/gamelib/parser.h; sourceTree = SOURCE_ROOT; };
0246A0EA0BD3CC29004D1C70 /* bitimage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bitimage.cpp; path = ../lib/ivis_opengl/bitimage.cpp; sourceTree = SOURCE_ROOT; };
0246A0EB0BD3CC29004D1C70 /* bitimage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bitimage.h; path = ../lib/ivis_opengl/bitimage.h; sourceTree = SOURCE_ROOT; };
- 0246A0EE0BD3CC29004D1C70 /* imd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imd.cpp; path = ../lib/ivis_opengl/imd.cpp; sourceTree = SOURCE_ROOT; };
0246A0EF0BD3CC29004D1C70 /* imd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imd.h; path = ../lib/ivis_opengl/imd.h; sourceTree = SOURCE_ROOT; };
0246A0F00BD3CC29004D1C70 /* imdload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imdload.cpp; path = ../lib/ivis_opengl/imdload.cpp; sourceTree = SOURCE_ROOT; };
0246A0F10BD3CC29004D1C70 /* ivi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ivi.h; path = ../lib/ivis_opengl/ivi.h; sourceTree = SOURCE_ROOT; };
@@ -2386,7 +2384,6 @@
43A29BF61503C9F700E66094 /* pietypes.h */,
0246A0EA0BD3CC29004D1C70 /* bitimage.cpp */,
0246A0EB0BD3CC29004D1C70 /* bitimage.h */,
- 0246A0EE0BD3CC29004D1C70 /* imd.cpp */,
0246A0EF0BD3CC29004D1C70 /* imd.h */,
0246A0F00BD3CC29004D1C70 /* imdload.cpp */,
0246A0F10BD3CC29004D1C70 /* ivi.h */,
@@ -4880,7 +4877,6 @@
0246A0E40BD3CC0B004D1C70 /* animobj.cpp in Sources */,
0246A0E70BD3CC0B004D1C70 /* gtime.cpp in Sources */,
0246A1030BD3CC29004D1C70 /* bitimage.cpp in Sources */,
- 0246A1040BD3CC29004D1C70 /* imd.cpp in Sources */,
0246A1050BD3CC29004D1C70 /* imdload.cpp in Sources */,
0246A1070BD3CC29004D1C70 /* pieclip.cpp in Sources */,
0246A11D0BD3CC43004D1C70 /* ivi.cpp in Sources */,
View
88 macosx/configs/FetchPrebuilt.sh
@@ -12,75 +12,75 @@ BackupDLP="http://wz2100.net/~dak180/BuildTools/Mac/"
# Make sure we are in the right place
cd "${SRCROOT}"
if [ ! -d "external" ]; then
- mkdir external
+ mkdir external
fi
if [ ! -d "prebuilt" ]; then
- mkdir prebuilt
+ mkdir prebuilt
fi
# Checks
if [ "${ACTION}" = "clean" ]; then
- # Force cleaning when directed
- rm -fRv "prebuilt/${DirectorY}" "external/${OutDir}"
- MD5SumLoc=`md5 -q "prebuilt/${FileName}"`
- if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
- rm -fRv "prebuilt/${FileName}"
- fi
- exit 0
+ # Force cleaning when directed
+ rm -fRv "prebuilt/${DirectorY}" "external/${OutDir}"
+ MD5SumLoc="$(md5 -q "prebuilt/${FileName}")"
+ if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
+ rm -fRv "prebuilt/${FileName}"
+ fi
+ exit 0
elif [ -d "prebuilt/${DirectorY}" ]; then
- # Clean if dirty
- echo "error: ${DirectorY} exists, probably from an earlier failed run" >&2
- #rm -frv "prebuilt/${DirectorY}"
- exit 1
+ # Clean if dirty
+ echo "error: ${DirectorY} exists, probably from an earlier failed run" >&2
+# rm -frv "prebuilt/${DirectorY}"
+ exit 1
elif [[ -d "external/${OutDir}" ]] && [[ ! -f "prebuilt/${FileName}" ]]; then
- # Clean up when updating versions
- echo "warning: Cached file is outdated or incomplete, removing" >&2
- rm -fR "prebuilt/${DirectorY}" "external/${OutDir}"
+ # Clean up when updating versions
+ echo "warning: Cached file is outdated or incomplete, removing" >&2
+ rm -fR "prebuilt/${DirectorY}" "external/${OutDir}"
elif [[ -d "external/${OutDir}" ]] && [[ -f "prebuilt/${FileName}" ]]; then
- # Check to make sure we have the right file
- MD5SumLoc=`cat "external/${OutDir}/.MD5SumLoc" 2>/dev/null || echo ""`
- if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
- echo "warning: Cached file is outdated or incorrect, removing" >&2
- rm -fR "prebuilt/${DirectorY}" "external/${OutDir}"
+ # Check to make sure we have the right file
+ MD5SumLoc="$(cat "external/${OutDir}/.MD5SumLoc" 2>/dev/null || echo "")"
+ if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
+ echo "warning: Cached file is outdated or incorrect, removing" >&2
+ rm -fR "prebuilt/${DirectorY}" "external/${OutDir}"
MD5SumFle=`md5 -q "prebuilt/${FileName}"`
if [ "${MD5SumFle}" != "${MD5Sum}" ]; then
rm -fR "prebuilt/${FileName}"
fi
- else
- # Do not do more work then we have to
- echo "${OutDir} already exists, skipping"
- exit 0
- fi
+ else
+ # Do not do more work then we have to
+ echo "${OutDir} already exists, skipping" >&2
+ exit 0
+ fi
fi
# Fetch
cd prebuilt
if [ ! -f "${FileName}" ]; then
- echo "Fetching ${FileName}"
- if ! curl -LfO --connect-timeout "30" "${BuiltDLP}"; then
- if ! curl -LfOC - --connect-timeout "30" "${BackupDLP}${FileName}"; then
+ echo "Fetching ${FileName}"
+ if ! curl -LfO --connect-timeout "30" "${BuiltDLP}"; then
+ if ! curl -LfOC - --connect-timeout "30" "${BackupDLP}${FileName}"; then
echo "error: Unable to fetch ${SourceDLP}" >&2
exit 1
- fi
- fi
+ fi
+ fi
else
- echo "${FileName} already exists, skipping"
+ echo "${FileName} already exists, skipping" >&2
fi
# MD5 check
-MD5SumLoc=`md5 -q "${FileName}"`
+MD5SumLoc="$(md5 -q "${FileName}")"
if [ -z "${MD5SumLoc}" ]; then
- echo "error: Unable to compute md5 for ${FileName}" >&2
- exit 1
+ echo "error: Unable to compute md5 for ${FileName}" >&2
+ exit 1
elif [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
- echo "error: MD5 does not match for ${FileName}" >&2
- exit 1
+ echo "error: MD5 does not match for ${FileName}" >&2
+ exit 1
fi
# Unpack
if ! tar -xzf "${FileName}"; then
- echo "error: Unpacking $FileName failed" >&2
- exit 1
+ echo "error: Unpacking $FileName failed" >&2
+ exit 1
fi
# Save the sum
@@ -88,12 +88,12 @@ echo "${MD5SumLoc}" > "${DirectorY}/.MD5SumLoc"
# Move
if [ ! -d "${DirectorY}" ]; then
- echo "error: Can't find $DirectorY to rename" >&2
- exit 1
+ echo "error: Can't find $DirectorY to rename" >&2
+ exit 1
else
- cd ..
- mv "prebuilt/${DirectorY}" "external/${OutDir}"
- touch external/${OutDir}/*
+ cd ..
+ mv "prebuilt/${DirectorY}" "external/${OutDir}"
+ touch external/${OutDir}/*
fi
exit 0
View
102 macosx/configs/FetchSource.sh
@@ -12,83 +12,83 @@ BackupDLP="http://wz2100.net/~dak180/BuildTools/external/"
# Make sure we are in the right place
cd "${SRCROOT}"
if [ ! -d "external" ]; then
- mkdir external
+ mkdir external
fi
cd external
# Checks
if [ "${ACTION}" = "clean" ]; then
- # Force cleaning when directed
- rm -fRv "${DirectorY}" "${OutDir}"
- MD5SumLoc=`md5 -q "${FileName}"`
- if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
- rm -fRv "${FileName}"
- fi
- exit 0
+ # Force cleaning when directed
+ rm -fRv "${DirectorY}" "${OutDir}"
+ MD5SumLoc="$(md5 -q "${FileName}")"
+ if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
+ rm -fRv "${FileName}"
+ fi
+ exit 0
elif [ -d "${DirectorY}" ]; then
- # Clean if dirty
- echo "error: ${DirectorY} exists, probably from an earlier failed run" >&2
- #rm -fRv "${DirectorY}"
- exit 1
+ # Clean if dirty
+ echo "error: ${DirectorY} exists, probably from an earlier failed run" >&2
+# rm -fRv "${DirectorY}"
+ exit 1
elif [[ -d "${OutDir}" ]] && [[ ! -f "${FileName}" ]]; then
- # Clean up when updating versions
- echo "warning: Cached file is outdated or incomplete, removing" >&2
- rm -fR "${DirectorY}" "${OutDir}"
+ # Clean up when updating versions
+ echo "warning: Cached file is outdated or incomplete, removing" >&2
+ rm -fR "${DirectorY}" "${OutDir}"
elif [[ -d "${OutDir}" ]] && [[ -f "${FileName}" ]]; then
- # Check to make sure we have the right file
- MD5SumLoc=`cat "${OutDir}/.MD5SumLoc" 2>/dev/null || echo ""`
- if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
- echo "warning: Cached file is outdated or incorrect, removing" >&2
- rm -fR "${DirectorY}" "${OutDir}"
- MD5SumFle=`md5 -q "${FileName}"`
+ # Check to make sure we have the right file
+ MD5SumLoc="$(cat "${OutDir}/.MD5SumLoc" 2>/dev/null || echo "")"
+ if [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
+ echo "warning: Cached file is outdated or incorrect, removing" >&2
+ rm -fR "${DirectorY}" "${OutDir}"
+ MD5SumFle="$(md5 -q "${FileName}")"
if [ "${MD5SumFle}" != "${MD5Sum}" ]; then
rm -fR "${FileName}"
fi
- else
- # Do not do more work then we have to
- echo "${OutDir} already exists, skipping"
- exit 0
- fi
+ else
+ # Do not do more work then we have to
+ echo "${OutDir} already exists, skipping" >&2
+ exit 0
+ fi
fi
# Fetch
if [ ! -r "${FileName}" ]; then
- echo "Fetching ${SourceDLP}"
- if ! curl -Lfo "${FileName}" --connect-timeout "30" "${SourceDLP}"; then
- if ! curl -LfOC - --connect-timeout "30" "${BackupDLP}${FileName}"; then
+ echo "Fetching ${SourceDLP}"
+ if ! curl -Lfo "${FileName}" --connect-timeout "30" "${SourceDLP}"; then
+ if ! curl -LfOC - --connect-timeout "30" "${BackupDLP}${FileName}"; then
echo "error: Unable to fetch ${SourceDLP}" >&2
exit 1
- fi
- fi
+ fi
+ fi
else
- echo "${FileName} already exists, skipping"
+ echo "${FileName} already exists, skipping" >&2
fi
# Check our sums
-MD5SumLoc=`md5 -q "${FileName}"`
+MD5SumLoc="$(md5 -q "${FileName}")"
if [ -z "${MD5SumLoc}" ]; then
- echo "error: Unable to compute md5 for ${FileName}" >&2
- exit 1
+ echo "error: Unable to compute md5 for ${FileName}" >&2
+ exit 1
elif [ "${MD5SumLoc}" != "${MD5Sum}" ]; then
- echo "error: MD5 does not match for ${FileName}" >&2
- exit 1
+ echo "error: MD5 does not match for ${FileName}" >&2
+ exit 1
fi
# Unpack
-ExtensioN=`echo ${FileName} | sed -e 's:^.*\.\([^.]*\):\1:'`
+ExtensioN="$(echo "${FileName}" | sed -e 's:^.*\.\([^.]*\):\1:')"
if [[ "${ExtensioN}" = "gz" ]] || [[ "${ExtensioN}" = "tgz" ]]; then
- if ! tar -zxf "${FileName}"; then
- echo "error: Unpacking ${FileName} failed" >&2
- exit 1
- fi
+ if ! tar -zxf "${FileName}"; then
+ echo "error: Unpacking ${FileName} failed" >&2
+ exit 1
+ fi
elif [ "${ExtensioN}" = "bz2" ]; then
- if ! tar -jxf "${FileName}"; then
- echo "error: Unpacking ${FileName} failed" >&2
- exit 1
- fi
+ if ! tar -jxf "${FileName}"; then
+ echo "error: Unpacking ${FileName} failed" >&2
+ exit 1
+ fi
else
- echo "error: Unable to unpack ${FileName}" >&2
- exit 1
+ echo "error: Unable to unpack ${FileName}" >&2
+ exit 1
fi
# Save the sum
@@ -96,10 +96,10 @@ echo "${MD5SumLoc}" > "${DirectorY}/.MD5SumLoc"
# Move
if [ ! -d "${DirectorY}" ]; then
- echo "error: Can't find ${DirectorY} to rename" >&2
- exit 1
+ echo "error: Can't find ${DirectorY} to rename" >&2
+ exit 1
else
- mv "${DirectorY}" "${OutDir}"
+ mv "${DirectorY}" "${OutDir}"
fi
exit 0

No commit comments for this range

Something went wrong with that request. Please try again.