From 5391cefbc2a3af33e3283362ae854e3862059a07 Mon Sep 17 00:00:00 2001 From: Steven Hugg Date: Sat, 1 Aug 2020 13:17:19 -0500 Subject: [PATCH] moved some development files to meta/ directory, updated sync script --- Makefile | 22 ++++-------------- electron.diff => meta/electron.diff | 0 .../icons}/8bitworkshop-icon-1024.icns | Bin .../icons}/8bitworkshop-icon-1024.ico | Bin .../icons}/8bitworkshop-icon-1024.png | Bin {romsrc => meta/romsrc}/coleco/Makefile | 0 {romsrc => meta/romsrc}/coleco/minbios.asm | 0 package-lock.json | 6 +++++ package.json | 1 + scripts/sync-version-prod.sh | 11 ++------- 10 files changed, 14 insertions(+), 26 deletions(-) rename electron.diff => meta/electron.diff (100%) rename {images => meta/icons}/8bitworkshop-icon-1024.icns (100%) rename {images => meta/icons}/8bitworkshop-icon-1024.ico (100%) rename {images => meta/icons}/8bitworkshop-icon-1024.png (100%) rename {romsrc => meta/romsrc}/coleco/Makefile (100%) rename {romsrc => meta/romsrc}/coleco/minbios.asm (100%) diff --git a/Makefile b/Makefile index 231b2c5d..7745015d 100644 --- a/Makefile +++ b/Makefile @@ -3,8 +3,10 @@ TSC=./node_modules/typescript/bin/tsc --build TMP=./tmp/dist all: - patch -i electron.diff -o electron.html + patch -i meta/electron.diff -o electron.html cp nanoasm/src/assembler.ts src/worker/ + cp node_modules/jquery/dist/jquery.min.js ./jquery/ + cp -r node_modules/bootstrap/dist/* ./bootstrap/ cp node_modules/bootstrap-tourist/*.css node_modules/bootstrap-tourist/*.js ./lib/ cp node_modules/clipboard/dist/clipboard.min.js ./lib/ cp node_modules/mousetrap/mousetrap*.min.js ./lib/ @@ -21,29 +23,15 @@ 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 -r $(TMP)/doc $(TMP)/meta $(TMP)/scripts $(TMP)/test* $(TMP)/tools $(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 $* + ./node_modules/.bin/electron-packager $(TMP) --icon meta/icons/8bitworkshop-icon-1024.icns --out ./release --overwrite --platform $* package: dist darwin.dist win32.dist linux.dist -z80: src/cpu/z80fast.js - -src/cpu/z80.js: src/cpu/z80.coffee - coffee -c $< - -src/cpu/z80fast.js: src/cpu/buildz80.js src/cpu/z80.js - node $< > $@ - -check: - closure-compiler src/*.js src/cpu/*.js src/platform/*.js > /dev/null - -lint: - gjslint -r src - web: (ip addr || ifconfig) | grep inet python3 scripts/serveit.py 2>> /dev/null #http.out diff --git a/electron.diff b/meta/electron.diff similarity index 100% rename from electron.diff rename to meta/electron.diff diff --git a/images/8bitworkshop-icon-1024.icns b/meta/icons/8bitworkshop-icon-1024.icns similarity index 100% rename from images/8bitworkshop-icon-1024.icns rename to meta/icons/8bitworkshop-icon-1024.icns diff --git a/images/8bitworkshop-icon-1024.ico b/meta/icons/8bitworkshop-icon-1024.ico similarity index 100% rename from images/8bitworkshop-icon-1024.ico rename to meta/icons/8bitworkshop-icon-1024.ico diff --git a/images/8bitworkshop-icon-1024.png b/meta/icons/8bitworkshop-icon-1024.png similarity index 100% rename from images/8bitworkshop-icon-1024.png rename to meta/icons/8bitworkshop-icon-1024.png diff --git a/romsrc/coleco/Makefile b/meta/romsrc/coleco/Makefile similarity index 100% rename from romsrc/coleco/Makefile rename to meta/romsrc/coleco/Makefile diff --git a/romsrc/coleco/minbios.asm b/meta/romsrc/coleco/minbios.asm similarity index 100% rename from romsrc/coleco/minbios.asm rename to meta/romsrc/coleco/minbios.asm diff --git a/package-lock.json b/package-lock.json index 202f9f9e..80f1543d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -308,6 +308,12 @@ "dev": true, "optional": true }, + "bootstrap": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz", + "integrity": "sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==", + "dev": true + }, "bootstrap-tourist": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/bootstrap-tourist/-/bootstrap-tourist-0.2.1.tgz", diff --git a/package.json b/package.json index 5dbcb909..8865d5bf 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "@types/jquery": "^3.5.1", "@types/node": "^14.0.27", "atob": "^2.1.x", + "bootstrap": "^3.4.1", "bootstrap-tourist": "^0.2.1", "btoa": "^1.2.x", "clipboard": "^2.0.6", diff --git a/scripts/sync-version-prod.sh b/scripts/sync-version-prod.sh index f054756f..57c5e55a 100755 --- a/scripts/sync-version-prod.sh +++ b/scripts/sync-version-prod.sh @@ -9,18 +9,11 @@ if [ "$VERSION" == "" ]; then fi DESTPATH=$RSYNC_PATH/v$VERSION DEVPATH=/var/www/html/8bitworkshop.com/dev -TMPDIR=./tmp/$VERSION grep -H "var VERSION" web/redir.html grep -H "var VERSION" web/projects/projects.js echo "Upload version $VERSION to production?" read -echo "Listing submodules..." -SUBMODS=`git submodule | cut -d ' ' -f 3` -echo "Extracting to $TMPDIR..." -rm -fr $TMPDIR -mkdir -p $TMPDIR -git archive $VERSION | tar x -C $TMPDIR +make dist echo "Copying to $DESTPATH..." -rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules --copy-dest=$DEVPATH -rilz --chmod=a+rx -e "ssh" $TMPDIR/ $SUBMODS $DESTPATH -rsync --stats -rilvz --chmod=a+rx -e "ssh" --copy-dest=$DEVPATH ./gen config.js $DESTPATH/ +rsync --stats -riltz --chmod=a+rx -e "ssh" ./tmp/dist/ config.js $DESTPATH/ echo "Done."