moved some development files to meta/ directory, updated sync script

This commit is contained in:
Steven Hugg 2020-08-01 13:17:19 -05:00
parent ba916728f0
commit 5391cefbc2
10 changed files with 14 additions and 26 deletions

View File

@ -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

View File

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

View File

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 67 KiB

6
package-lock.json generated
View File

@ -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",

View File

@ -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",

View File

@ -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."