changeset 2630:0d7b538990f0

Fix web nightly script
author Michael Pavone <pavone@retrodev.com>
date Sun, 23 Feb 2025 01:00:58 -0800
parents 537a2f3b880d
children 94c05d4ead51
files build_upload_web_nightly
diffstat 1 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/build_upload_web_nightly	Sun Feb 23 00:08:45 2025 -0800
+++ b/build_upload_web_nightly	Sun Feb 23 01:00:58 2025 -0800
@@ -1,5 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env bash
 name=$1
+. $HOME/software/emsdk/emsdk_env.sh
 . "$HOME/$name.params"
 cd $HOME/$DIR
 hg revert -a
@@ -7,9 +8,9 @@
 hg up
 rev=`hg summary |  sed -E -n 's/^parent: [^:]+:([^ ]+) .*$/\1/p'`
 sed -i -E "s/(define BLASTEM_VERSION \"[^-]+)-pre\"/\1-pre-$rev\"/" version.inc
-. $HOME/software/emsdk/emsdk_env.sh
-make CC=emcc CPU=wasm m68k.o z80.o -j2
+make CC=emcc CPU=wasm m68k.c z80.c -j2
 result=$?
+echo "DIR $DIR"
 if [ $result -ne 0 ]; then
 	echo Build falied with return code $result
 	curdate=`date -Iseconds`
@@ -27,6 +28,7 @@
 }
 WEBHOOKEOF
 	exit $result
+fi
 make CC=emcc CPU=wasm blastem.html -j4
 result=$?
 if [ $result -ne 0 ]; then
@@ -49,7 +51,7 @@
 fi
 . $HOME/remote.params
 echo "Uploaing blastem.wasm and blastem.js to $REMOTE_HOST"
-scp -i "$REMOTE_IDENT" "$HOME/$DIR/$blastem.wasm" "$HOME/$DIR/$blastem.js" $REMOTE_USER@$REMOTE_HOST:/home/$REMOTE_USER/web
+scp -i "$REMOTE_IDENT" "$HOME/$DIR/blastem.wasm" "$HOME/$DIR/blastem.js" $REMOTE_USER@$REMOTE_HOST:/home/$REMOTE_USER/web
 curdate=`date -Iseconds`
 version=`sed -E 's/^[^"]+"([^"]+)"$/\1/' version.inc`
 curl -d'@-' -H 'Content-Type: application/json' "$WEBHOOKURL" <<WEBHOOKEOF
@@ -71,4 +73,4 @@
 		}
 	]
 }
-WEBHOOKEOF
\ No newline at end of file
+WEBHOOKEOF