Skip to content

Commit 051e29e

Browse files
author
Ian Prest
committed
Cleaned up makefile & deploy scripts
-- I didn't want to deplot 100+MB of the bower_components folder -- Makefile now copies over just the stuff we want from bower_components -- Deploy scripts now only certain directories & files (opt-in vs. opt-out) -- Fixed "make install"
1 parent 09a4e62 commit 051e29e

File tree

4 files changed

+88
-40
lines changed

4 files changed

+88
-40
lines changed

‎.gitignore

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ npm-debug.log
1515
bower_components/
1616

1717
# Generated files
18-
fonts/kbd-custom.*
19-
js/jsonl.min.js
20-
js/jsonl.js
21-
css/kb.css
22-
css/kb.css.map
18+
js/*
19+
css/*
20+
fonts/*
2321

2422
# Backup/temporary files
2523
*~
24+
25+
# Saved layouts
26+
layouts/

‎Makefile

Lines changed: 55 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,67 @@
11
ifeq ($(OS),Windows_NT)
22
export NODE_PATH=$(APPDATA)/npm/node_modules
3+
cp = copy /y $(subst /,\,$1) $(subst /,\,$2)
4+
else
5+
cp = cp $1 $2
36
endif
47

5-
all: js css
8+
all: js css bower_copy
69

710
# Rules to minify our .js files
811
js: js/jsonl.min.js
9-
%.min.js: %.js
12+
js/%.min.js: js/%.js
1013
uglifyjs "$^" > "$@"
1114
js/%.js: %.grammar.js
1215
node "$^" > "$@"
1316

1417
.PRECIOUS: js/%.js
1518

19+
# Rules to copy stuff from bower_components to our folders
20+
bower_copy:
21+
.PHONY: bower_copy
22+
_BOWER_DIR[.js] = js
23+
_BOWER_DIR[.css] = css
24+
_BOWER_DIR[*] = fonts
25+
_BOWER_TARGET = $(or $(_BOWER_DIR[$(suffix $(1))]),$(_BOWER_DIR[*]))/$(notdir $(1))
26+
define _BOWER
27+
bower_copy: $(call _BOWER_TARGET,$(1))
28+
$(call _BOWER_TARGET,$(1)): $1
29+
$$(call cp,"$$<","$$@")
30+
endef
31+
BOWER = $(eval $(call _BOWER,$1,$2))
32+
33+
# Bootstrap
34+
$(call BOWER,bower_components/bootstrap/dist/css/bootstrap.min.css)
35+
$(call BOWER,bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot)
36+
$(call BOWER,bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg)
37+
$(call BOWER,bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf)
38+
$(call BOWER,bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff)
39+
$(call BOWER,bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2)
40+
# FontAwesome
41+
$(call BOWER,bower_components/fontawesome/css/font-awesome.min.css)
42+
$(call BOWER,bower_components/fontawesome/fonts/fontawesome-webfont.ttf)
43+
$(call BOWER,bower_components/fontawesome/fonts/fontawesome-webfont.eot)
44+
$(call BOWER,bower_components/fontawesome/fonts/fontawesome-webfont.svg)
45+
$(call BOWER,bower_components/fontawesome/fonts/fontawesome-webfont.woff)
46+
$(call BOWER,bower_components/fontawesome/fonts/fontawesome-webfont.woff2)
47+
# JQeury & Angular stuff
48+
$(call BOWER,bower_components/jquery/jquery.min.js)
49+
$(call BOWER,bower_components/angular/angular.min.js)
50+
$(call BOWER,bower_components/angular-bootstrap-colorpicker/css/colorpicker.min.css)
51+
$(call BOWER,bower_components/angular-sanitize/angular-sanitize.min.js)
52+
$(call BOWER,bower_components/angular-ui-utils/components/angular-ui-docs/build/ui-utils.min.js)
53+
$(call BOWER,bower_components/ng-file-upload/ng-file-upload.min.js)
54+
$(call BOWER,bower_components/angular-native-dragdrop/draganddrop.js)
55+
$(call BOWER,bower_components/angular-ui-bootstrap/dist/ui-bootstrap-tpls-0.12.0.min.js)
56+
$(call BOWER,bower_components/angular-bootstrap-colorpicker/js/bootstrap-colorpicker-module.min.js)
57+
# Misc
58+
$(call BOWER,bower_components/hint.css/hint.min.css)
59+
$(call BOWER,bower_components/crypto-js/crypto-js.js)
60+
$(call BOWER,bower_components/marked/marked.min.js)
61+
$(call BOWER,bower_components/FileSaver/FileSaver.min.js)
62+
$(call BOWER,bower_components/doT/doT.min.js)
63+
$(call BOWER,bower_components/URLON/src/urlon.js)
64+
1665

1766
# Rules to run Stylus on our .css files
1867
css: css/kb.css
@@ -54,10 +103,7 @@ test:
54103

55104
install:
56105
bower install
57-
cd bower_components/angular-ui-bootstrap
58-
npm install
59-
grunt before-test after-test
60-
cd ../angular-ui-utils
61-
npm install
62-
grunt build
63-
cd ../..
106+
cd bower_components/angular-ui-bootstrap & npm install
107+
cd bower_components/angular-ui-bootstrap & grunt before-test after-test
108+
cd bower_components/angular-ui-utils & npm install
109+
cd bower_components/angular-ui-utils & grunt build

‎deploy.bat

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
@echo off
2-
aws s3 sync . s3://www.keyboard-layout-editor.com ^
3-
--acl public-read ^
4-
--exclude aws-private-key.txt ^
5-
--exclude *.py ^
6-
--exclude mongoose* ^
7-
--exclude .git* ^
8-
--exclude *.bat ^
9-
--exclude upload-policy.txt ^
10-
%*
2+
SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
3+
set PARMS=
4+
if "%1"=="" SET PARMS=--dryrun
5+
for %%Q IN (css js fonts samples) DO (
6+
aws s3 sync .\%%Q s3://www.keyboard-layout-editor.com/%%Q --acl public-read %PARMS%
7+
)
8+
for %%Q IN (kb.html kb.js render.js serial.js extensions.js *.md *.json favicon.ico) DO (
9+
aws s3 cp .\%%Q s3://www.keyboard-layout-editor.com/%%Q --acl public-read %PARMS%
10+
)
11+
goto :EOF

‎kb.html

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@
88
<head>
99
<title>Keyboard Layout Editor</title>
1010
<meta charset="utf-8">
11-
<link rel="stylesheet" type="text/css" href="bower_components/bootstrap/dist/css/bootstrap.min.css" media="screen">
12-
<link rel="stylesheet" type="text/css" href="bower_components/fontawesome/css/font-awesome.min.css">
13-
<link rel="stylesheet" type="text/css" href="bower_components/hint.css/hint.min.css">
14-
<link rel="stylesheet" type="text/css" href="bower_components/angular-bootstrap-colorpicker/css/colorpicker.min.css">
11+
<link rel="stylesheet" type="text/css" href="css/bootstrap.min.css" media="screen">
12+
<link rel="stylesheet" type="text/css" href="css/font-awesome.min.css">
13+
<link rel="stylesheet" type="text/css" href="css/hint.min.css">
14+
<link rel="stylesheet" type="text/css" href="css/colorpicker.min.css">
1515
<link rel="stylesheet" type="text/css" href="css/kb.css">
16-
<script type="text/javascript" src="bower_components/jquery/jquery.min.js"></script>
17-
<script type="text/javascript" src="bower_components/angular/angular.min.js"></script>
18-
<script type="text/javascript" src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
19-
<script type="text/javascript" src="bower_components/angular-ui-utils/components/angular-ui-docs/build/ui-utils.min.js"></script>
20-
<script type="text/javascript" src="bower_components/angular-ui-bootstrap/dist/ui-bootstrap-tpls-0.12.0.min.js"></script>
21-
<script type="text/javascript" src="bower_components/crypto-js/crypto-js.js"></script>
22-
<script type="text/javascript" src="bower_components/marked/marked.min.js"></script>
23-
<script type="text/javascript" src="bower_components/FileSaver/FileSaver.min.js"></script>
24-
<script type="text/javascript" src="bower_components/ng-file-upload/ng-file-upload.min.js"></script>
25-
<script type="text/javascript" src="bower_components/angular-native-dragdrop/draganddrop.js"></script>
26-
<script type="text/javascript" src="bower_components/angular-bootstrap-colorpicker/js/bootstrap-colorpicker-module.min.js"></script>
27-
<script type="text/javascript" src="bower_components/doT/doT.min.js"></script>
28-
<script type="text/javascript" src="bower_components/URLON/src/urlon.js"></script>
16+
<script type="text/javascript" src="js/jquery.min.js"></script>
17+
<script type="text/javascript" src="js/angular.min.js"></script>
18+
<script type="text/javascript" src="js/angular-sanitize.min.js"></script>
19+
<script type="text/javascript" src="js/ui-utils.min.js"></script>
20+
<script type="text/javascript" src="js/ui-bootstrap-tpls-0.12.0.min.js"></script>
21+
<script type="text/javascript" src="js/crypto-js.js"></script>
22+
<script type="text/javascript" src="js/marked.min.js"></script>
23+
<script type="text/javascript" src="js/FileSaver.min.js"></script>
24+
<script type="text/javascript" src="js/ng-file-upload.min.js"></script>
25+
<script type="text/javascript" src="js/draganddrop.js"></script>
26+
<script type="text/javascript" src="js/bootstrap-colorpicker-module.min.js"></script>
27+
<script type="text/javascript" src="js/doT.min.js"></script>
28+
<script type="text/javascript" src="js/urlon.js"></script>
2929
<script type="text/javascript" src="js/color.js"></script>
3030
<script type="text/javascript" src="js/jsonl.min.js"></script>
3131
<script type="text/javascript" src="extensions.js"></script>

0 commit comments

Comments
 (0)