From 0080b3cb6ba4b1f048698287adadb4872ed3f788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Fri, 23 Nov 2018 14:37:10 +0100 Subject: [PATCH] Refactor & clean up repository tree. --- .gitignore | 2 +- LICENCE | 30 +---------- .../asciiblaster.cmd | 0 asciiblaster-nw/assets | 1 + asciiblaster-nw/index.html | 1 + {assets => asciiblaster-nw}/nwjs.manifest | 0 .../package-lock.json | 0 package.json => asciiblaster-nw/package.json | 6 +-- {assets => asciiblaster-nw}/release.sh | 15 +++--- assets/{ => css}/ak.css | 0 assets/{ => css}/nitelite.css | 2 +- assets/{ => css}/sally.css | 18 +++---- {doc => assets/doc}/index.html | 6 +-- {doc => assets/doc}/irssi.txt | 0 {doc => assets/doc}/nopaint.txt | 0 {doc => assets/doc}/shaders/brush.txt | 0 {doc => assets/doc}/shaders/canvas.txt | 0 {doc => assets/doc}/shaders/util.txt | 0 {doc => assets/doc}/shadetut.txt | 0 {doc => assets/doc}/tips.txt | 0 assets/{ => fonts}/fsex300-webfont.eot | Bin assets/{ => fonts}/fsex300-webfont.svg | 0 assets/{ => fonts}/fsex300-webfont.ttf | Bin assets/{ => fonts}/fsex300-webfont.woff | Bin assets/{ => images}/bucket.png | Bin assets/{ => images}/dropper.gif | Bin assets/{ => images}/gray-dither.gif | Bin assets/{ => images}/tile.jpg | Bin {js => assets/js}/app.js | 0 {js => assets/js}/clipboard.js | 0 {js => assets/js}/ext/color.js | 0 {js => assets/js}/ext/nopaint.js | 0 {js => assets/js}/ext/oktween.js | 0 {js => assets/js}/ext/unicode.js | 0 {js => assets/js}/ext/util.js | 0 {js => assets/js}/gfx.js | 0 {js => assets/js}/lex.js | 0 {js => assets/js}/matrix.js | 0 {js => assets/js}/ui/brush.js | 0 {js => assets/js}/ui/canvas.js | 0 {js => assets/js}/ui/controls.js | 0 {js => assets/js}/ui/custom.js | 0 {js => assets/js}/ui/keys.js | 0 {js => assets/js}/ui/letters.js | 0 {js => assets/js}/ui/palette.js | 0 {js => assets/js}/ui/selection.js | 0 {js => assets/js}/ui/tool.js | 0 {js => assets/js}/ui/transform.js | 0 assets/text/LICENCE | 29 +++++++++++ assets/{ => text}/TODO | 0 index.html | 48 +++++++++--------- 51 files changed, 80 insertions(+), 78 deletions(-) mode change 100644 => 120000 LICENCE rename asciiblaster.cmd => asciiblaster-nw/asciiblaster.cmd (100%) create mode 120000 asciiblaster-nw/assets create mode 120000 asciiblaster-nw/index.html rename {assets => asciiblaster-nw}/nwjs.manifest (100%) rename package-lock.json => asciiblaster-nw/package-lock.json (100%) rename package.json => asciiblaster-nw/package.json (91%) rename {assets => asciiblaster-nw}/release.sh (94%) rename assets/{ => css}/ak.css (100%) rename assets/{ => css}/nitelite.css (96%) rename assets/{ => css}/sally.css (91%) rename {doc => assets/doc}/index.html (86%) rename {doc => assets/doc}/irssi.txt (100%) rename {doc => assets/doc}/nopaint.txt (100%) rename {doc => assets/doc}/shaders/brush.txt (100%) rename {doc => assets/doc}/shaders/canvas.txt (100%) rename {doc => assets/doc}/shaders/util.txt (100%) rename {doc => assets/doc}/shadetut.txt (100%) rename {doc => assets/doc}/tips.txt (100%) rename assets/{ => fonts}/fsex300-webfont.eot (100%) rename assets/{ => fonts}/fsex300-webfont.svg (100%) rename assets/{ => fonts}/fsex300-webfont.ttf (100%) rename assets/{ => fonts}/fsex300-webfont.woff (100%) rename assets/{ => images}/bucket.png (100%) rename assets/{ => images}/dropper.gif (100%) rename assets/{ => images}/gray-dither.gif (100%) rename assets/{ => images}/tile.jpg (100%) rename {js => assets/js}/app.js (100%) rename {js => assets/js}/clipboard.js (100%) rename {js => assets/js}/ext/color.js (100%) rename {js => assets/js}/ext/nopaint.js (100%) rename {js => assets/js}/ext/oktween.js (100%) rename {js => assets/js}/ext/unicode.js (100%) rename {js => assets/js}/ext/util.js (100%) rename {js => assets/js}/gfx.js (100%) rename {js => assets/js}/lex.js (100%) rename {js => assets/js}/matrix.js (100%) rename {js => assets/js}/ui/brush.js (100%) rename {js => assets/js}/ui/canvas.js (100%) rename {js => assets/js}/ui/controls.js (100%) rename {js => assets/js}/ui/custom.js (100%) rename {js => assets/js}/ui/keys.js (100%) rename {js => assets/js}/ui/letters.js (100%) rename {js => assets/js}/ui/palette.js (100%) rename {js => assets/js}/ui/selection.js (100%) rename {js => assets/js}/ui/tool.js (100%) rename {js => assets/js}/ui/transform.js (100%) create mode 100644 assets/text/LICENCE rename assets/{ => text}/TODO (100%) diff --git a/.gitignore b/.gitignore index 97f798e..e8e64d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *.sw[op] -releases/ +asciiblaster-nw/releases/* diff --git a/LICENCE b/LICENCE deleted file mode 100644 index b451736..0000000 --- a/LICENCE +++ /dev/null @@ -1,29 +0,0 @@ - Jollo LNT license - Version 1 - February 2015 - - Copyright, 2015. JOLLO NET NA. - The Jollo IRC Network. - - Vu, fare wanderer, confronted with raw, programmatic instruction - dans la forme la plus pure. A hesitation, troubled to the terms - qui ce license affirme. Par un voyage du explorer le mechanisme - et ponder la fabrication. Voila! La remide: egress sans risque. - - Sans trace (Leave No Trace) via sept principales: - - 0. Modifique language en advance. L'Apposer Jollo LNT license - with copies en distribuer. - - 1. Non responsible pour neglige programme du problematique. - - 2. Non sympathie pour neglige programme du problematique. - - 3. Non permission l'modifique under any circumstance. - - 4. Non permission distribution under any circumstance. - - 5. Respect les programmatic instructions. - - 6. Non interfere avec l'harmonie d'une amitie. - - \ No newline at end of file diff --git a/LICENCE b/LICENCE new file mode 120000 index 0000000..7a85ef0 --- /dev/null +++ b/LICENCE @@ -0,0 +1 @@ +assets/text/LICENCE \ No newline at end of file diff --git a/asciiblaster.cmd b/asciiblaster-nw/asciiblaster.cmd similarity index 100% rename from asciiblaster.cmd rename to asciiblaster-nw/asciiblaster.cmd diff --git a/asciiblaster-nw/assets b/asciiblaster-nw/assets new file mode 120000 index 0000000..ec2e4be --- /dev/null +++ b/asciiblaster-nw/assets @@ -0,0 +1 @@ +../assets \ No newline at end of file diff --git a/asciiblaster-nw/index.html b/asciiblaster-nw/index.html new file mode 120000 index 0000000..79c5d6f --- /dev/null +++ b/asciiblaster-nw/index.html @@ -0,0 +1 @@ +../index.html \ No newline at end of file diff --git a/assets/nwjs.manifest b/asciiblaster-nw/nwjs.manifest similarity index 100% rename from assets/nwjs.manifest rename to asciiblaster-nw/nwjs.manifest diff --git a/package-lock.json b/asciiblaster-nw/package-lock.json similarity index 100% rename from package-lock.json rename to asciiblaster-nw/package-lock.json diff --git a/package.json b/asciiblaster-nw/package.json similarity index 91% rename from package.json rename to asciiblaster-nw/package.json index 83eb52d..83fb06d 100644 --- a/package.json +++ b/asciiblaster-nw/package.json @@ -5,12 +5,12 @@ }, "description": "asciiblaster (standalone NW app)", "directories": { - "doc": "doc" + "assets": "assets" }, "homepage": "https://github.com/lalbornoz/asciiblaster#readme", "license": "Jollo LNT license ", "main": "index.html", - "name": "asciiblaster", + "name": "asciiblaster-nw", "repository": { "type": "git", "url": "git+https://github.com/lalbornoz/asciiblaster.git" @@ -18,7 +18,7 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, - "version": "1.0.2", + "version": "1.0.3", "window": { "title": "asciiblaster (standalone NW app)", "toolbar": true, diff --git a/assets/release.sh b/asciiblaster-nw/release.sh similarity index 94% rename from assets/release.sh rename to asciiblaster-nw/release.sh index 849e990..553c1b9 100755 --- a/assets/release.sh +++ b/asciiblaster-nw/release.sh @@ -1,9 +1,9 @@ #!/bin/sh # -PACKAGE_NAME="asciiblaster"; +PACKAGE_NAME="asciiblaster-nw"; RELEASE_DEPS="cpio find gunzip rm sed tar unzip wget zip"; -NWJS_MANIFEST_FNAME="assets/nwjs.manifest"; +NWJS_MANIFEST_FNAME="nwjs.manifest"; NWJS_PLATFORMS="linux-ia32 linux-x64 win-ia32 win-x64"; NWJS_VERSION="0.34.5"; NWJS_SUBDIR="nwjs-v${NWJS_VERSION}-%NWJS_PLATFORM%"; @@ -63,15 +63,14 @@ release() { cpio --quiet -dmp ..; cd "${OLDPWD}"; rm -fr "${_release_dname}/${_nwjs_subdir}"; - find . \ + find -L . \ -mindepth 1 \ - -not -path './.git/*' \ - -not -path "./.git" \ -not -path "./${RELEASES_DNAME}/*" \ -not -path "./${RELEASES_DNAME}" \ - -not -name '.git*' \ - -not -name '*.sw*' |\ - cpio --quiet -dmp "${_release_dname}"; + -not -name '*.sw*' \ + -not -name "${0##*/}" \ + -not -name "${NWJS_MANIFEST_FNAME}" |\ + cpio --quiet -dLmp "${_release_dname}"; cd "${RELEASES_DNAME}"; if [ "${_vflag:-0}" -eq 0 ]; then zip -9 -r "${_release_fname##${RELEASES_DNAME}/}" "${_release_dname##${RELEASES_DNAME}/}" >/dev/null; diff --git a/assets/ak.css b/assets/css/ak.css similarity index 100% rename from assets/ak.css rename to assets/css/ak.css diff --git a/assets/nitelite.css b/assets/css/nitelite.css similarity index 96% rename from assets/nitelite.css rename to assets/css/nitelite.css index 4fc5eb8..dce015e 100644 --- a/assets/nitelite.css +++ b/assets/css/nitelite.css @@ -15,7 +15,7 @@ margin-bottom:8px; body { background:#000; -background-image:url('../assets/tile.jpg'); +background-image:url('../images/tile.jpg'); font-size:16pt; font-family:times new roman; color:rgb(255,255,0); diff --git a/assets/sally.css b/assets/css/sally.css similarity index 91% rename from assets/sally.css rename to assets/css/sally.css index ee58c07..82326e1 100644 --- a/assets/sally.css +++ b/assets/css/sally.css @@ -12,12 +12,12 @@ body { } @font-face { font-family: 'FixedsysExcelsior301Regular'; - src: url('../assets/fsex300-webfont.eot'); - src: url('../assets/fsex300-webfont.eot?#iefix') format('embedded-opentype'), - url('../assets/fsex300-webfont.woff') format('woff'), - url('../assets/fsex300-webfont.ttf') format('truetype'), - url('../assets/fsex300-webfont.svg#FixedsysExcelsior301Regular') format('svg'); - font-weight: normal; + src: url('../fonts/fsex300-webfont.eot'); + src: url('../fonts/fsex300-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/fsex300-webfont.woff') format('woff'), + url('../fonts/fsex300-webfont.ttf') format('truetype'), + url('../fonts/fsex300-webfont.svg#FixedsysExcelsior301Regular') format('svg'); + font-weighmal; font-style: normal; } @@ -66,7 +66,7 @@ a:hover { text-decoration: underline } } .transparent { background-color: transparent; - background-image: url(../assets/gray-dither.gif); + background-image: url(../images/gray-dither.gif); background-size: 8px 8px; } @@ -152,10 +152,10 @@ textarea { font-size:12pt; width: 37vw; height: 300px; background: #333; color: cursor: crosshair; } .dropper #canvas_rapper { - cursor: url(../assets/dropper.gif) 0 15, auto; + cursor: url(../images/dropper.gif) 0 15, auto; } .bucket #canvas_rapper { - cursor: url(../assets/bucket.png) 3 15, auto; + cursor: url(../images/bucket.png) 3 15, auto; } #brush_rapper { border: 1px solid; diff --git a/doc/index.html b/assets/doc/index.html similarity index 86% rename from doc/index.html rename to assets/doc/index.html index 1f3280f..9f49b8b 100644 --- a/doc/index.html +++ b/assets/doc/index.html @@ -1,8 +1,8 @@ - - - + + +