diff --git a/configure.py b/configure.py index 6b969d4..6532756 100755 --- a/configure.py +++ b/configure.py @@ -18,6 +18,7 @@ parser.add_option("--platform", action="store", type="string", dest="platform", parser.add_option("--config", action="store", type="string", dest="config", default="", help="provides ability to specify additional parameters for qmake") parser.add_option("--qt-dir", action="store", type="string", dest="qt-dir", default="", help="defines qmake directory path. qmake can be found in qt-dir/compiler/bin directory") parser.add_option("--qt-dir-xp", action="store", type="string", dest="qt-dir-xp", default="", help="defines qmake directory path for Windows XP. qmake can be found in 'qt-dir/compiler/bin directory") +parser.add_option("--external-folder", action="store", type="string", dest="external-folder", default="", help="defines a directory with external folder") parser.add_option("--sql-type", action="store", type="string", dest="sql-type", default="", help="defines the sql type wich will be used") parser.add_option("--db-port", action="store", type="string", dest="db-port", default="", help="defines the sql db-port wich will be used") parser.add_option("--db-user", action="store", type="string", dest="db-user", default="", help="defines the sql db-user wich will be used") diff --git a/scripts/build_js.py b/scripts/build_js.py index eeeab46..59aaec6 100644 --- a/scripts/build_js.py +++ b/scripts/build_js.py @@ -106,10 +106,14 @@ def build_sdk_native(directory): def build_js_develop(root_dir): #_run_npm_cli(root_dir + "/sdkjs/build") - _run_npm(root_dir + "/sdkjs/build") - _run_grunt(root_dir + "/sdkjs/build", get_build_param(False) + base.sdkjs_addons_param()) - _run_grunt(root_dir + "/sdkjs/build", ["develop"] + base.sdkjs_addons_param()) - _run_npm(root_dir + "/web-apps/build") - _run_npm(root_dir + "/web-apps/build/sprites") - _run_grunt(root_dir + "/web-apps/build/sprites", []) + external_folder = config.option("--external-folder") + if (external_folder != ""): + external_folder = "/" + external_folder + + _run_npm(root_dir + external_folder + "/sdkjs/build") + _run_grunt(root_dir + external_folder + "/sdkjs/build", get_build_param(False) + base.sdkjs_addons_param()) + _run_grunt(root_dir + external_folder + "/sdkjs/build", ["develop"] + base.sdkjs_addons_param()) + _run_npm(root_dir + external_folder + "/web-apps/build") + _run_npm(root_dir + external_folder + "/web-apps/build/sprites") + _run_grunt(root_dir + external_folder + "/web-apps/build/sprites", []) return diff --git a/scripts/develop/config_server.py b/scripts/develop/config_server.py index 6ba5867..fbe3cb7 100644 --- a/scripts/develop/config_server.py +++ b/scripts/develop/config_server.py @@ -112,6 +112,11 @@ def make(): for addon in web_apps_addons: static_content["/" + addon] = {"path": addon_base_path + addon} + if (config.option("external-folder") != ""): + external_folder = config.option("external-folder") + static_content["/sdkjs"] = {"path": addon_base_path + external_folder + "/sdkjs"} + static_content["/web-apps"] = {"path": addon_base_path + external_folder + "/web-apps"} + if (config.option("sql-type") != ""): sql["type"] = config.option("sql-type") if (config.option("db-port") != ""):