diff --git a/presets/apple2/skeleton.dasm b/presets/apple2/skeleton.dasm new file mode 100644 index 00000000..4d06de5d --- /dev/null +++ b/presets/apple2/skeleton.dasm @@ -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 diff --git a/scripts/sync-dev.sh b/scripts/sync-dev.sh index 0c085f37..ef2cd630 100755 --- a/scripts/sync-dev.sh +++ b/scripts/sync-dev.sh @@ -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/ diff --git a/scripts/sync-tools.sh b/scripts/sync-tools.sh index a7bdea22..430535a9 100755 --- a/scripts/sync-tools.sh +++ b/scripts/sync-tools.sh @@ -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/ diff --git a/scripts/sync-version-prod.sh b/scripts/sync-version-prod.sh index 1f213f96..fa0b927f 100755 --- a/scripts/sync-version-prod.sh +++ b/scripts/sync-version-prod.sh @@ -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." diff --git a/src/platform/vcs.js b/src/platform/vcs.js index 116bd58a..afb6d240 100644 --- a/src/platform/vcs.js +++ b/src/platform/vcs.js @@ -388,4 +388,4 @@ var VCSMAMEPlatform = function(mainElement) { //////////////// PLATFORMS['vcs'] = VCSPlatform; -PLATFORMS['vcs-mame'] = VCSMAMEPlatform; +PLATFORMS['vcs.mame'] = VCSMAMEPlatform; diff --git a/src/project.ts b/src/project.ts index db1be4da..4ad43f23 100644 --- a/src/project.ts +++ b/src/project.ts @@ -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 diff --git a/src/ui.ts b/src/ui.ts index ce0cf250..d431dcbd 100644 --- a/src/ui.ts +++ b/src/ui.ts @@ -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);