Actually fix Unix scripts this time. :)
authorRyan C. Gordon <icculus@icculus.org>
Wed, 24 Dec 2014 13:23:48 -0500
changeset 9288573ebcb470a3
parent 9287 644bf5f51d5c
child 9289 5f857c00d25d
Actually fix Unix scripts this time. :)
build-scripts/emscripten-buildbot.sh
     1.1 --- a/build-scripts/emscripten-buildbot.sh	Wed Dec 24 13:21:28 2014 -0500
     1.2 +++ b/build-scripts/emscripten-buildbot.sh	Wed Dec 24 13:23:48 2014 -0500
     1.3 @@ -47,12 +47,11 @@
     1.4  set -x
     1.5  cd "$SDLBASE"
     1.6  rm -rf buildbot
     1.7 -rm -rf emscripten-sdl2-installed
     1.8  mkdir buildbot
     1.9  pushd buildbot
    1.10  
    1.11  echo "Configuring..."
    1.12 -emconfigure ../configure --host=asmjs-unknown-emscripten --disable-assembly --disable-threads --enable-cpuinfo=false CFLAGS="-O2 -Wno-warn-absolute-paths -Wdeclaration-after-statement -Werror=declaration-after-statement" --prefix="$SDLBASE/emscripten-sdl2-installed"
    1.13 +emconfigure ../configure --host=asmjs-unknown-emscripten --disable-assembly --disable-threads --enable-cpuinfo=false CFLAGS="-O2 -Wno-warn-absolute-paths -Wdeclaration-after-statement -Werror=declaration-after-statement" --prefix="$PWD/emscripten-sdl2-installed"
    1.14  
    1.15  echo "Building..."
    1.16  emmake $MAKE
    1.17 @@ -60,9 +59,9 @@
    1.18  echo "Moving things around..."
    1.19  emmake $MAKE install
    1.20  # Fix up a few things to a real install path
    1.21 -perl -w -pi -e "s#$SDLBASE/emscripten-sdl2-installed#/usr/local#g;" ./emscripten-sdl2-installed/lib/libSDL2.la ./emscripten-sdl2-installed/lib/pkgconfig/sdl2.pc ./emscripten-sdl2-installed/bin/sdl2-config
    1.22 +perl -w -pi -e "s#$PWD/emscripten-sdl2-installed#/usr/local#g;" ./emscripten-sdl2-installed/lib/libSDL2.la ./emscripten-sdl2-installed/lib/pkgconfig/sdl2.pc ./emscripten-sdl2-installed/bin/sdl2-config
    1.23  mkdir -p ./usr
    1.24 -mv "$SDLBASE/emscripten-sdl2-installed" ./usr/local
    1.25 +mv ./emscripten-sdl2-installed ./usr/local
    1.26  popd
    1.27  tar -cJvvf $TARBALL -C buildbot usr
    1.28  rm -rf buildbot