platform id like '.mame' shares same presets

This commit is contained in:
Steven Hugg 2018-08-13 17:16:33 -04:00
parent f7129e9fde
commit 690b3ac013
7 changed files with 16 additions and 6 deletions

View File

@ -0,0 +1,10 @@
processor 6502
seg.u ZEROPAGE ; uninitialized zero-page variables
org $0
seg CODE
org $803 ; starting address
Start
jmp Start ; endless loop

View File

@ -3,5 +3,4 @@
. ./scripts/env.sh
DESTPATH=$RSYNC_PATH/dev/
git ls-files -z | rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules -ril --chmod=a+rx -e "ssh -p 2222" --files-from - -0 . $DESTPATH
git archive --format tar.gz --prefix 8bitworkshop- HEAD tools/ > release/8bitworkshop-tools.tgz
rsync --stats -rpilvz --chmod=a+rx -e "ssh -p 2222" ./gen ./mame $DESTPATH/

View File

@ -1,5 +1,7 @@
#!/bin/bash
. ./scripts/env.sh
VERSION=`git tag | tail -1`
DESTPATH=$RSYNC_PATH/
rsync --stats -rilv -e "ssh -p 2222" ./release/ $DESTPATH/release
git archive --format tar.gz --prefix 8bitworkshop- HEAD tools/ > release/8bitworkshop-tools.tgz
rsync --stats -rpilvz --chmod=a+rx -e "ssh -p 2222" ./release $DESTPATH/

View File

@ -21,6 +21,5 @@ mkdir -p $TMPDIR
git archive $VERSION | tar x -C $TMPDIR
echo "Copying to $DESTPATH..."
rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules --copy-dest=$DEVPATH -rilz --chmod=a+rx -e "ssh -p 2222" $TMPDIR/ $SUBMODS $DESTPATH
git archive --format tar.gz --prefix 8bitworkshop- HEAD tools/ > release/8bitworkshop-tools-$VERSION.tgz
rsync --stats -rpilvz --chmod=a+rx -e "ssh -p 2222" ./gen ./mame $DESTPATH/
echo "Done."

View File

@ -388,4 +388,4 @@ var VCSMAMEPlatform = function(mainElement) {
////////////////
PLATFORMS['vcs'] = VCSPlatform;
PLATFORMS['vcs-mame'] = VCSMAMEPlatform;
PLATFORMS['vcs.mame'] = VCSMAMEPlatform;

View File

@ -172,7 +172,7 @@ export class CodeProject {
} else {
// found on remote fetch?
var preset_id = this.platform_id;
preset_id = preset_id.replace("-mame","");
preset_id = preset_id.replace(/[.]\w+/,''); // remove .suffix from preset name
var webpath = "presets/" + preset_id + "/" + path;
if (this.platform_id.startsWith('vcs') && path.indexOf('.') <= 0)
webpath += ".a"; // legacy stuff

View File

@ -926,7 +926,7 @@ function startUI(loadplatform : boolean) {
} else {
// load and start platform object
if (loadplatform) {
var scriptfn = 'src/platform/' + platform_id.split('-')[0] + '.js';
var scriptfn = 'src/platform/' + platform_id.split(/[.-]/)[0] + '.js';
var script = document.createElement('script');
script.onload = function() {
console.log("loaded platform", platform_id);