Serve fonts for local PolyGerrit development
Packs fonts the same way bower_components are packed, with a 'fonts'
folder inside fonts.zip.
Also removes deprecated OpenSans fonts from build files.
Bug: Issue 4893
Change-Id: I7fc11d6e689c7d5b1d68d09e94ee7aaba91ded9b
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java
index c35738b..e4d3339 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ResourceServlet.java
@@ -87,6 +87,8 @@
.put("tif", "image/tiff")
.put("tiff", "image/tiff")
.put("txt", "text/plain")
+ .put("woff", "font/woff")
+ .put("woff2", "font/woff2")
.build();
protected static String contentType(String name) {
diff --git a/lib/fonts/BUCK b/lib/fonts/BUCK
index c5b78eb..7b64cf2 100644
--- a/lib/fonts/BUCK
+++ b/lib/fonts/BUCK
@@ -11,20 +11,3 @@
license = 'OFL1.1',
visibility = ['PUBLIC'],
)
-
-# Open Sans at Revision 53a5266 and converted using a Google woff file
-# converter (same one that Google Fonts uses).
-# https://github.com/google/fonts/tree/master/apache/opensans
-genrule(
- name = 'opensans',
- cmd = 'zip -rq $OUT .',
- srcs = [
- 'OpenSans-Bold.woff',
- 'OpenSans-Bold.woff2',
- 'OpenSans-Regular.woff',
- 'OpenSans-Regular.woff2'
- ],
- out = 'opensans.zip',
- license = 'Apache2.0',
- visibility = ['PUBLIC'],
-)
diff --git a/lib/fonts/BUILD b/lib/fonts/BUILD
index 88db107..a764524 100644
--- a/lib/fonts/BUILD
+++ b/lib/fonts/BUILD
@@ -11,21 +11,3 @@
data = [ "//lib:LICENSE-OFL1.1" ],
visibility = ['//visibility:public'],
)
-
-# Open Sans at Revision 53a5266 and converted using a Google woff file
-# converter (same one that Google Fonts uses).
-# https://github.com/google/fonts/tree/master/apache/opensans
-genrule2(
- name = 'opensans',
- cmd = 'zip -rq $@ $(SRCS)',
- srcs = [
- 'OpenSans-Bold.woff',
- 'OpenSans-Bold.woff2',
- 'OpenSans-Regular.woff',
- 'OpenSans-Regular.woff2'
- ],
- outs = [ 'opensans.zip' ],
-# TODO(hanwen): license.
-# license = 'Apache2.0',
- visibility = ['//visibility:public'],
-)
diff --git a/lib/fonts/OpenSans-Bold.woff b/lib/fonts/OpenSans-Bold.woff
deleted file mode 100644
index 74c4086..0000000
--- a/lib/fonts/OpenSans-Bold.woff
+++ /dev/null
Binary files differ
diff --git a/lib/fonts/OpenSans-Bold.woff2 b/lib/fonts/OpenSans-Bold.woff2
deleted file mode 100644
index 44d6c26..0000000
--- a/lib/fonts/OpenSans-Bold.woff2
+++ /dev/null
Binary files differ
diff --git a/lib/fonts/OpenSans-Regular.woff b/lib/fonts/OpenSans-Regular.woff
deleted file mode 100644
index 882f7c9..0000000
--- a/lib/fonts/OpenSans-Regular.woff
+++ /dev/null
Binary files differ
diff --git a/lib/fonts/OpenSans-Regular.woff2 b/lib/fonts/OpenSans-Regular.woff2
deleted file mode 100644
index 52217ee..0000000
--- a/lib/fonts/OpenSans-Regular.woff2
+++ /dev/null
Binary files differ
diff --git a/polygerrit-ui/BUCK b/polygerrit-ui/BUCK
index 80f9f29..206065d 100644
--- a/polygerrit-ui/BUCK
+++ b/polygerrit-ui/BUCK
@@ -22,8 +22,9 @@
name = 'fonts',
cmd = ' && '.join([
'cd $TMP',
- 'for file in $SRCS; do unzip -q $file; done',
- 'zip -q $OUT *',
+ 'mkdir fonts',
+ 'for file in $SRCS; do echo `pwd` > /tmp/log.log; unzip -qd fonts/ $file; done',
+ 'zip -qr $OUT fonts',
]),
srcs = [
'//lib/fonts:sourcecodepro',
diff --git a/polygerrit-ui/app/BUCK b/polygerrit-ui/app/BUCK
index 6a2b299..5d4f06d 100644
--- a/polygerrit-ui/app/BUCK
+++ b/polygerrit-ui/app/BUCK
@@ -43,7 +43,7 @@
'cd $TMP/polygerrit_ui',
'mkdir -p {fonts,elements}',
' && '.join(JS_LIBS_MKDIR_CMDS),
- 'unzip -qd fonts $(location //polygerrit-ui:fonts)',
+ 'unzip -qd . $(location //polygerrit-ui:fonts)',
'unzip -qd elements $(location :gr-app)',
'cp -rp $SRCDIR/* .',
' && '.join(JS_LIBS_UNZIP_CMDS),
