From 3ebbf1688c28a62e3ad725f9a9f39ab7e7b4809a Mon Sep 17 00:00:00 2001 From: meep-eep Date: Sun, 15 May 2005 23:28:22 +0000 Subject: [PATCH] Status updates during MacOS X install. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1782 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/build/unix/build.config | 7 +++++++ sc2/build/unix/build_functions | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config index c607d3dda..974a3baf3 100644 --- a/sc2/build/unix/build.config +++ b/sc2/build/unix/build.config @@ -322,12 +322,14 @@ uqm_install_osx() { INSTROOT="$BUILD_WORK/The Ur-Quan Masters.app/Contents" # Make directory structure + 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 # Install misc. resources, icons, etc. + echo "Installing miscellaneous resources..." >&2 $SED "s/@@VERSION@@/$VERSION/g" src/res/darwin/Info.plist > \ "$INSTROOT/Info.plist" cp src/res/darwin/PkgInfo "$INSTROOT" @@ -336,6 +338,7 @@ uqm_install_osx() { "$INSTROOT/Resources/Launcher.nib" # Find Frameworks and copy them into the application. + echo "Copying dependancy Frameworks..." >&2 HEADERS="Ogg/Ogg.h SDL/SDL.h SDL_image/SDL_image.h Vorbis/vorbisfile.h" if [ "$uqm_SOUNDMODULE" = openal ]; then HEADERS="$HEADERS OpenAL/al.h" @@ -350,6 +353,7 @@ uqm_install_osx() { done # Install game content (it should probably make a zipfile) + echo "Creating base content package..." >&2 cp content/starcon.key content/version "$INSTROOT/Resources/content" (cd content && \ find . \( -name CVS -o -name packages \) -prune -o \ @@ -358,17 +362,20 @@ uqm_install_osx() { -print | $SED 's/^..//' | zip -@ 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" + 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" # Install game binary (and rename it) + echo "Installing executable..." >&2 cp $uqm_NAME "$INSTROOT/MacOS/The Ur-Quan Masters" } diff --git a/sc2/build/unix/build_functions b/sc2/build/unix/build_functions index 29088f1fc..438bb53ff 100644 --- a/sc2/build/unix/build_functions +++ b/sc2/build/unix/build_functions @@ -78,7 +78,7 @@ build_dependencies() { build_rec_dependencies() { local DEPEND_FILE EXTRA_OFILES - echo "Building dependency information..." 1>&2 + echo "Building dependency information..." >&2 BUILD_WORK_ESC=`escape_string "$BUILD_WORK"` export BUILD_WORK_ESC @@ -165,7 +165,7 @@ build_reconfig() { eval "${TARGET}_load_config" build_process_config - echo "Reconfiguring complete..." 1>&2 + echo "Reconfiguring complete..." >&2 } # Process the configuration information @@ -331,7 +331,7 @@ generic_install() { eval "${TARGET}_pre_install" local LIB LIBS LIBDIR - echo "Installing system-dependent data..." 1>&2 + echo "Installing system-dependent data..." >&2 eval LIBS="\${${BUILD_PROJECT}_INSTALL_LIBS}" eval LIBDIR="\${${BUILD_PROJECT}_INSTALL_LIBDIR%/}/" mkdirhier "$LIBDIR" 0755 @@ -344,7 +344,7 @@ generic_install() { done local SHARE SHARED SHAREDIR - echo "Installing system-independent data..." 1>&2 + echo "Installing system-independent data..." >&2 eval SHARED="\${${BUILD_PROJECT}_INSTALL_SHARED}" eval SHAREDIR="\${${BUILD_PROJECT}_INSTALL_SHAREDIR%/}/" mkdirhier "$SHAREDIR" 0755 @@ -357,7 +357,7 @@ generic_install() { done local BINS BINDIR - echo "Installing binaries..." 1>&2 + echo "Installing binaries..." >&2 eval BINS="\${${BUILD_PROJECT}_INSTALL_BINS}" eval BINDIR="\${${BUILD_PROJECT}_INSTALL_BINDIR%/}/" mkdirhier "$BINDIR" 0755