diff --git a/Makefile b/Makefile index abc4796c..c602cd48 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,26 @@ TSC=./node_modules/typescript/bin/tsc --build +TMP=./tmp/dist all: cp nanoasm/src/assembler.ts src/worker/ $(TSC) -v $(TSC) cd jsnes && npm i + patch -i electron.diff -o electron.html + +dist: + rm -fr $(TMP) && mkdir -p $(TMP) + git archive HEAD | tar x -C $(TMP) + cp -rp gen $(TMP) + rm -r $(TMP)/doc $(TMP)/romsrc $(TMP)/scripts $(TMP)/test* $(TMP)/tools $(TMP)/electron.diff $(TMP)/.[a-z]* $(TMP)/ts*.json + rm -f $(TMP)/javatari && mkdir -p $(TMP)/javatari && cp javatari.js/release/javatari/* $(TMP)/javatari/ + tar cf - `cat electron.html | egrep "^<(script|link)" | egrep -o '"([^"]+).(js|css)"' | cut -d '"' -f2` | tar x -C $(TMP) + +%.dist: + ./node_modules/.bin/electron-packager $(TMP) --icon images/8bitworkshop-icon-1024.icns --out ./release --overwrite --platform $* + +package: dist darwin.dist win32.dist linux.dist z80: src/cpu/z80fast.js @@ -21,7 +36,6 @@ check: lint: gjslint -r src - web: (ip addr || ifconfig) | grep inet python3 scripts/serveit.py 2>> /dev/null #http.out diff --git a/README.md b/README.md index f7289b2d..14a5b968 100644 --- a/README.md +++ b/README.md @@ -65,13 +65,14 @@ The IDE uses custom forks for many of these, found at https://github.com/sehugg? * http://mcpp.sourceforge.net/ * http://www.ifarchive.org/indexes/if-archiveXinfocomXcompilersXinform6.html * https://github.com/dmsc/fastbasic -* https://github.com/apple2accumulator/merlin32 ### Assemblers/Linkers * https://dasm-assembler.github.io/ * http://atjs.mbnet.fi/mc6809/Assembler/xasm-990104.tar.gz * http://48k.ca/zmac.html +* https://github.com/apple2accumulator/merlin32 +* https://github.com/camsaul/nesasm ### Dev Kits / Libraries diff --git a/_config.yml b/_config.yml deleted file mode 100644 index c4192631..00000000 --- a/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-cayman \ No newline at end of file diff --git a/electron-preload.js b/electron-preload.js new file mode 100644 index 00000000..103c1500 --- /dev/null +++ b/electron-preload.js @@ -0,0 +1,18 @@ +// preload.js for Electron app +const { ipcRenderer } = require('electron'); + +process.once('loaded', () => { + ipcRenderer.on('updateFile', (event, data) => { + console.log('updateFile', data); + data.cmd = 'updateFile'; + postMessage(data); + }); + window.addEventListener('message', event => { + const message = event.data; + console.log('MESSAGE', event, message); + //if (message.myTypeField === 'my-custom-message') { + //ipcRenderer.send('custom-message', message); + //} + }); + //ipcRenderer.send('hello', true); +}); diff --git a/electron.diff b/electron.diff new file mode 100644 index 00000000..80f94111 --- /dev/null +++ b/electron.diff @@ -0,0 +1,266 @@ +*** index.html 2020-07-30 21:15:48.000000000 -0500 +--- electron.html 2020-07-30 21:16:00.000000000 -0500 +*************** +*** 3,18 **** + +
+