[tor-commits] [meek/webextension] Make a separate webextension/browser directory.

[dcf at torproject.org]

commit cf1e51dfe922c2c7965494e21bcc18bf9771f367
Author: David Fifield <david at bamsoftware.com>
Date:   Thu Mar 7 14:30:41 2019 -0700

    Make a separate webextension/browser directory.
---
 webextension/README                             | 14 +++++++-------
 webextension/{ => browser}/Makefile             |  0
 webextension/{ => browser}/background.js        |  0
 webextension/{ => browser}/manifest.json        |  0
 webextension/{ => native}/meek.http.helper.json |  0
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/webextension/README b/webextension/README
index a728842..5b958cb 100644
--- a/webextension/README
+++ b/webextension/README
@@ -12,18 +12,18 @@ These instructions require Firefox 65.
 1. Compile the native application.
        cd native && go build
 
-2. Edit meek.http.helper.json and set the "path" field to the path to
-   the native application.
+2. Edit native/meek.http.helper.json and set the "path" field to the
+   path to the native application.
        "path": "/where/you/installed/native",
 
-3. Copy the edited meek.http.helper.json file to the OS-appropriate
-   location.
+3. Copy the edited native/meek.http.helper.json file to the
+   OS-appropriate location.
        # macOS
        mkdir -p ~/"Library/Application Support/Mozilla/NativeMessagingHosts/"
-       cp meek.http.helper.json ~/"Library/Application Support/Mozilla/NativeMessagingHosts/"
+       cp native/meek.http.helper.json ~/"Library/Application Support/Mozilla/NativeMessagingHosts/"
        # other Unix
        mkdir -p ~/.mozilla/native-messaging-hosts/
-       cp meek.http.helper.json ~/.mozilla/native-messaging-hosts/
+       cp native/meek.http.helper.json ~/.mozilla/native-messaging-hosts/
    The meek.http.helper.json file is called the "host manifest" or "app
    manifest" and it tells the browser where to find the native part of
    the WebExtension. More information:
@@ -35,7 +35,7 @@ These instructions require Firefox 65.
    This enables the extension to write to stdout.
 
 5. In Firefox, go to about:debugging and click "Load Temporary
-   Add-on...". Find manifest.json and click Open.
+   Add-on...". Find browser/manifest.json and click Open.
    More information:
        https://developer.mozilla.org/en-US/docs/Tools/about:debugging#Loading_a_temporary_add-on
    In the terminal, you should see a line like this, with a random port
diff --git a/webextension/Makefile b/webextension/browser/Makefile
similarity index 100%
rename from webextension/Makefile
rename to webextension/browser/Makefile
diff --git a/webextension/background.js b/webextension/browser/background.js
similarity index 100%
rename from webextension/background.js
rename to webextension/browser/background.js
diff --git a/webextension/manifest.json b/webextension/browser/manifest.json
similarity index 100%
rename from webextension/manifest.json
rename to webextension/browser/manifest.json
diff --git a/webextension/meek.http.helper.json b/webextension/native/meek.http.helper.json
similarity index 100%
rename from webextension/meek.http.helper.json
rename to webextension/native/meek.http.helper.json