diff --git a/make.py b/make.py index fdc59b9..61b7075 100755 --- a/make.py +++ b/make.py @@ -42,12 +42,12 @@ base.configure_common_apps() # developing... if ("develop" == config.option("module")): - build.build_js_develop(base_dir + "/..") + build_js.build_js_develop(base_dir + "/..") deploy.make() exit(0) # check only js builds -if ("1" == base.get_env("OO_ONLY_BUILD_JS")) +if ("1" == base.get_env("OO_ONLY_BUILD_JS")): build_js.build() exit(0) diff --git a/scripts/base.py b/scripts/base.py index bc444a6..c500431 100644 --- a/scripts/base.py +++ b/scripts/base.py @@ -205,10 +205,10 @@ def cmd_exe(prog, args): return ret def cmd_in_dir(directory, prog, args=[], is_no_errors=False): - dir = base.get_path(directory) + dir = get_path(directory) cur_dir = os.getcwd() os.chdir(dir) - ret = base.cmd(prog, args, is_no_errors) + ret = cmd(prog, args, is_no_errors) os.chdir(cur_dir) return ret diff --git a/scripts/build_js.py b/scripts/build_js.py index cfed771..d890a56 100644 --- a/scripts/build_js.py +++ b/scripts/build_js.py @@ -5,7 +5,7 @@ import base # make build.pro def make(): - if ("1" == base.get_env("OO_NO_BUILD_JS")) + if ("1" == base.get_env("OO_NO_BUILD_JS")): return base_dir = base.get_script_dir() + "/.." diff --git a/scripts/deploy_develop.py b/scripts/deploy_develop.py index bf7cf95..ec3b7c5 100644 --- a/scripts/deploy_develop.py +++ b/scripts/deploy_develop.py @@ -90,12 +90,13 @@ def make(): # add directories to open directories data_local_devel = "{\n" data_local_devel += "\"services\": {\n" - data_local_devel += "\"CoAuthoring\": {" + data_local_devel += "\"CoAuthoring\": {\n" data_local_devel += "\"server\": {\n" data_local_devel += "\"static_content\": {\n" for addon in config.sdkjs_addons: - data_local_devel + "\"/" + config.sdkjs_addons[addon] + "\" : { \"path\": \"../../../" + config.sdkjs_addons[addon] + "\" }," - data_local_devel = data_local_devel[:-1] + data_local_devel += ("\"/" + config.sdkjs_addons[addon] + "\" : { \"path\": \"../../../" + config.sdkjs_addons[addon] + "\" },\n") + data_local_devel = data_local_devel[:-2] + data_local_devel += "\n" data_local_devel += "}\n" data_local_devel += "}\n" data_local_devel += "}\n"