Fixes to the build system for Snow Leopard, and for 0.7 content packaging.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3532 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2010-03-15 04:39:40 +00:00
parent ce534168c0
commit 0cf53407d4
4 changed files with 32 additions and 30 deletions
+11 -15
View File
@@ -553,8 +553,7 @@ uqm_install_osx() {
echo "Creating directory structure..." >&2
mkdirhier "$INSTROOT/MacOS" 0755
mkdirhier "$INSTROOT/Frameworks" 0755
mkdirhier "$INSTROOT/Resources/Launcher.nib" 0755
mkdirhier "$INSTROOT/Resources/content/packages/addons" 0755
mkdirhier "$INSTROOT/Resources/content/addons" 0755
# Install misc. resources, icons, etc.
echo "Installing miscellaneous resources..." >&2
@@ -562,8 +561,6 @@ uqm_install_osx() {
"$INSTROOT/Info.plist"
cp src/res/darwin/PkgInfo "$INSTROOT"
cp "src/res/darwin/The Ur-Quan Masters.icns" "$INSTROOT/Resources"
cp src/res/darwin/Launcher.nib/objects.nib \
"$INSTROOT/Resources/Launcher.nib"
# Find Frameworks and copy them into the application.
echo "Copying dependancy Frameworks..." >&2
@@ -584,22 +581,21 @@ uqm_install_osx() {
echo "Creating base content package..." >&2
cp content/version "$INSTROOT/Resources/content/"
(cd content && \
find . \( -name CVS -o -name packages -o -name .svn \) -prune \
-o \! \( -type d -o -name \*.ogg \) -print | \
$SED 's/^..//' | zip -@ uqm-${VERSION}-prv-content.uqm)
find . -type f -not -path '*/CVS*' -not -path '*/.svn*' -not -path '*/addons*' -print | \
$SED 's/^..//' | zip -X -q -n .ogg -8 -@ uqm-${VERSION}-prv-content.uqm)
mv content/uqm-$VERSION-prv-content.uqm "$INSTROOT/Resources/content/packages"
echo "Creating voice content package..." >&2
(cd content && \
find . -name \*\[0-9\]\[0-9\]\[0-9\].ogg -print \
| $SED 's/^..//' | zip -0 -@ uqm-${VERSION}-prv-voice.uqm)
mv content/uqm-$VERSION-prv-voice.uqm "$INSTROOT/Resources/content/packages"
(cd content/addons && \
find 3dovoice -type f -not -path '*/CVS*' -not -path '*/.svn*' -print | \
zip -X -q -n .ogg -8 -@ ../uqm-${VERSION}-prv-voice.uqm)
mv content/uqm-$VERSION-prv-voice.uqm "$INSTROOT/Resources/content/addons"
echo "Creating 3do music content package..." >&2
(cd content && \
find . -name \*.ogg -a \! -name \*\[0-9\]\[0-9\]\[0-9\].ogg \
-print | $SED 's/^..//' | zip -0 -@ uqm-${VERSION}-prv-3domusic.uqm)
mv content/uqm-$VERSION-prv-3domusic.uqm "$INSTROOT/Resources/content/packages"
(cd content/addons && \
find 3domusic -type f -not -path '*/CVS*' -not -path '*/.svn*' -print | \
zip -X -q -n .ogg -8 -@ ../uqm-${VERSION}-prv-3domusic.uqm)
mv content/uqm-$VERSION-prv-3domusic.uqm "$INSTROOT/Resources/content/addons"
# Install game binary (and rename it)
echo "Installing executable..." >&2