Add support for building the JS wrappers to the Makefile

Now that we have C and C++, we need to split the compile and link steps
(because we need different flags for the C and C++ files), so this is
easier with a Makefile.

2 files changed, 1 insertions, 75 deletions

diff --git a/javascript/build.py b/javascript/build.py
deleted file mode 100755
index f253acb..0000000
--- a/javascript/build.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /usr/bin/env python
-# Copyright 2015 OpenMarket Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import subprocess
-import glob
-import os
-import sys
-import re
-import json
-
-
-os.chdir(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
-source_files = glob.glob("src/*.cpp")
-pre_js, = glob.glob("javascript/*pre.js")
-post_js, = glob.glob("javascript/*post.js")
-
-functions = set()
-RE_FUNCTION=re.compile("(olm_[^( ]*)\\(")
-with open("include/olm/olm.hh") as header:
-    for line in header:
-        match = RE_FUNCTION.search(line)
-        if match:
-            functions.add(match.groups()[0])
-
-
-exported_functions = os.path.abspath("javascript/exported_functions.json")
-with open(exported_functions, "w") as json_file:
-    json.dump(["_" + function for function in functions], json_file)
-
-
-emcc = os.environ.get("EMCC", "emcc")
-optimize_opts = os.environ.get("OPTIMIZE_FLAGS", "-O3")
-
-compile_args = [emcc]
-compile_args += optimize_opts.split()
-compile_args += ["-Wall"]
-compile_args += """
-    -Iinclude
-    -Ilib
-    -std=c++11
-    --closure 1
-    --memory-init-file 0
-    -s NO_FILESYSTEM=1
-    -s INVOKE_RUN=0
-""".split()
-# NO_BROWSER is kept for compatibility with emscripten 1.35.24, but is no
-# longer needed.
-compile_args += ("-s","NO_BROWSER=1")
-compile_args += source_files
-compile_args += ("--pre-js", pre_js)
-compile_args += ("--post-js", post_js)
-compile_args += ("-s", "EXPORTED_FUNCTIONS=@" + exported_functions)
-compile_args += sys.argv[1:]
-
-library = "javascript/olm.js"
-
-def run(args):
-    print args
-    print " ".join(args)
-    subprocess.check_call(args)
-
-run(compile_args + ["-o", library])
diff --git a/javascript/package.json b/javascript/package.json
index dc16e45..710d46d 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -8,7 +8,7 @@
     "README.md"
   ],
   "scripts": {
-    "build": "./build.py",
+    "build": "make -C .. js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {