Skip to content
This repository has been archived by the owner on Jul 3, 2019. It is now read-only.

Commit

Permalink
Address review comments.
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias Schneider committed Jul 31, 2015
1 parent 69b6499 commit b5a95ae
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 94 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Expand Up @@ -1041,7 +1041,7 @@ module.exports = function(grunt) {

grunt.file.copy('build/version/version.txt', outputDir + '/version.txt');
grunt.file.copy('LICENSE', outputDir + '/LICENSE');
grunt.file.copy('LICENSE-OFL', outputDir + '/LICENSE-OFL');
grunt.file.copy('LICENSE-OFL.txt', outputDir + '/LICENSE-OFL.txt');
grunt.file.copy('README-LICENSE.txt', outputDir + '/README-LICENSE.txt');
});

Expand Down
86 changes: 0 additions & 86 deletions LICENSE-OFL

This file was deleted.

4 changes: 2 additions & 2 deletions README-LICENSE.txt
@@ -1,5 +1,5 @@
The Shumway source code and resources are licensed under the Apache License,
Version 2.0.
Version 2.0. See LICENSE for details.

The Adobe Blank 2 font as used by Shumway is licensed under the SIL Open Font
License, Version 1.1.
License, Version 1.1. See LICENSE-OFL.txt for details.
2 changes: 1 addition & 1 deletion extension/firefox/Makefile
Expand Up @@ -26,7 +26,7 @@ VERSION = `head -n 1 ../../build/version/version.txt`
build: ensureoutputdir
# Copying extension files
echo "Creating extension version: $(VERSION)"
cp -R ../../LICENSE ../../LICENSE-OFL ../../README-LICENSE.txt content chrome bootstrap.js chrome.manifest icon.png icon64.png $(BUILD_DIR)/
cp -R ../../LICENSE ../../LICENSE-OFL.txt ../../README-LICENSE.txt content chrome bootstrap.js chrome.manifest icon.png icon64.png $(BUILD_DIR)/
sed s/\(SHUMWAY_VERSION\)/$(VERSION)/ install.rdf > $(BUILD_DIR)/install.rdf
sed s/\(SHUMWAY_VERSION\)/$(VERSION)/ update.rdf > $(BUILD_DIR)/update.rdf
cp ../../examples/inspector/debug/pingpong.js $(BUILD_DIR)/chrome/
Expand Down
5 changes: 2 additions & 3 deletions extension/firefox/install.rdf
@@ -1,13 +1,12 @@
<?xml version="1.0"?>

<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:em="http://www.mozilla.org/2004/em-rdf#"
xmlns:html="http://www.w3.org/1999/xhtml">
xmlns:em="http://www.mozilla.org/2004/em-rdf#">

<Description about="urn:mozilla:install-manifest">
<em:id>shumway@research.mozilla.org</em:id>
<em:name>Shumway</em:name>
<em:version>0.11.348</em:version>
<em:version>(SHUMWAY_VERSION)</em:version>

<!-- Firefox -->
<em:targetApplication>
Expand Down
2 changes: 1 addition & 1 deletion src/gfx/renderables/renderables.ts
Expand Up @@ -1492,7 +1492,7 @@ module Shumway.GFX {
if (bold) {
boldItalic += 'bold ';
}
var font = boldItalic + size + 'px ' + fontName + ',AdobeBlank';
var font = boldItalic + size + 'px ' + fontName + ', AdobeBlank';

var color = textRunData.readInt();
var fillStyle = ColorUtilities.rgbToHex(color);
Expand Down

0 comments on commit b5a95ae

Please sign in to comment.