Firefox OS Simulator のビルドしたときの修正メモ

r2d2b2g.diff

diff --git a/Makefile b/Makefile
index 0ac9c92..d0ca28b 100644
--- a/Makefile
+++ b/Makefile
@@ -35,9 +35,9 @@ ifndef B2G_PLATFORM
   endif
 endif
 
-B2G_VERSION=1.3
-GECKO_VERSION=28
-ADDON_NAME=fxos_1_3_simulator
+B2G_VERSION=1.5
+GECKO_VERSION=31
+ADDON_NAME=fxos_2_0_simulator
 # compute addon version out of package.json
 # matches xx.yy[pre,a,b]zz version patterns
 ADDON_VERSION=$(shell grep version addon/package.json | perl -p -e 's/.*([0-9]+\.[0-9]+(pre|a|b)?[0-9]*(dev)?(\.[0-9]{8})).*/\1/')
@@ -60,7 +60,8 @@ B2G_TYPE ?= specific
 # B2G_ID
 
 # Use the current last known revision that sucessfully builds on Windows.
-B2G_URL_BASE = https://ftp.mozilla.org/pub/mozilla.org/b2g/nightly/2014/03/2014-03-31-16-40-05-mozilla-b2g28_v1_3/
+#B2G_URL_BASE = https://ftp.mozilla.org/pub/mozilla.org/b2g/nightly/latest-mozilla-b2g28_v1_3/
+B2G_URL_BASE = https://ftp.mozilla.org/pub/mozilla.org/b2g/nightly/latest-mozilla-central/
 
 # Currently, all B2G builds are custom so we can optimize for code size and fix
 # bugs in B2G or its nightly build environments (like 844047 and 815805).
@@ -72,7 +73,8 @@ ifeq (win32, $(B2G_PLATFORM))
   B2G_BIN_DIR = b2g
 else
 ifeq (mac64, $(B2G_PLATFORM))
-  B2G_URL ?= $(B2G_URL_BASE)b2g-$(GECKO_VERSION).0.multi.mac64.dmg
+#  B2G_URL ?= $(B2G_URL_BASE)b2g-$(GECKO_VERSION).0.multi.mac64.dmg
+  B2G_URL ?= $(B2G_URL_BASE)b2g-$(GECKO_VERSION).0a1.multi.mac64.dmg
   DOWNLOAD_CMD = /usr/bin/curl -O
   B2G_BIN_DIR = B2G.app/Contents/MacOS
 else
diff --git a/addon/package.json b/addon/package.json
index fff21c2..52f7250 100644
--- a/addon/package.json
+++ b/addon/package.json
@@ -1,11 +1,11 @@
 {
-  "id": "fxos_1_3_simulator@mozilla.org",
-  "name": "fxos_1_3_simulator",
-  "version": "7.0pre9.20140401",
-  "fullName": "Firefox OS 1.3 Simulator",
-  "label": "Firefox OS 1.3",
-  "description": "a Firefox OS 1.3 simulator",
-  "author": "Myk Melez (https://github.com/mykmelez)",
+  "id": "fxos_2_0_simulator@mozilla.org",
+  "name": "fxos_2_0_simulator",
+  "version": "7.0pre9.20140421",
+  "fullName": "Firefox OS 2.0 Simulator",
+  "label": "Firefox OS 2.0",
+  "description": "a Firefox OS 2.0 simulator",
+  "author": "Myk Melez (https://github.com/mykmelez), build by dynamis",
   "contributors": [
     "Alexandre Poirot (https://github.com/ochameau)",
     "Anant Narayanan (https://github.com/anantn)",
diff --git a/build/languages.json b/build/languages.json
index 6eb9d47..7e7013d 100644
--- a/build/languages.json
+++ b/build/languages.json
@@ -7,7 +7,9 @@
   "he"        : "עברית",
   "hr"        : "Hrvatski",
   "hu"        : "Magyar",
+  "ja"        : "日本語",
   "pl"        : "Polski",
   "pt-BR"     : "Português (do Brasil)",
+  "vi"        : "Tiếng Việt",
   "zh-TW"     : "正體中文 (繁體)"
 }
diff --git a/gaia b/gaia
index 24f562f..b6d1c7f 160000
--- a/gaia
+++ b/gaia
@@ -1 +1 @@
-Subproject commit 24f562fce468fc948ac9e6185e002c23350cb9ee
+Subproject commit b6d1c7fae27ec22ee06e3da7898fe2565fc0a8c0-dirty