diff options
-rw-r--r-- | Makefile | 9 | ||||
-rwxr-xr-x | scripts/dn-build | 20 |
2 files changed, 16 insertions, 13 deletions
@@ -28,13 +28,8 @@ x11-utils: scripts/list-outputs scripts/find-free-display check-system: $(TYPESCRIPT) $(SCRIPTS)/check-system $(LOGFILE) -build-glucose: check-system - $(LOG) "$(DNBUILD) build glucose" $(LOGFILE) - -build-activities: - $(LOG) "$(DNBUILD) build activities" $(LOGFILE) - -build: build-glucose build-activities +build: check-system + $(LOG) "$(DNBUILD) build" $(LOGFILE) run: x11-utils $(SCRIPTS)/shell/start-sugar diff --git a/scripts/dn-build b/scripts/dn-build index b242a0e..e30f01d 100755 --- a/scripts/dn-build +++ b/scripts/dn-build @@ -11,6 +11,10 @@ import subprocess import sysinfo system_version = sysinfo.get_system_version() +module_files = ["system-%s.json" % system_version, + "sugar.json", + "activities.json"] + scripts_dir = os.path.abspath(os.path.dirname(__file__)) base_dir = os.path.dirname(scripts_dir) install_dir = os.path.join(base_dir, "install") @@ -31,10 +35,6 @@ else: lib_dir = os.path.join(install_dir, "lib") system_lib_dir = "/usr/lib" -module_files = { "activities": ["activities.json"], - "glucose": ["system-%s.json" % system_version, - "sugar.json"] } - state = { "built_modules": {} } def load_state(): @@ -143,13 +143,20 @@ def build(module): state["built_modules"][module["name"]] = get_module_commit_id(module) save_state() +def clear_built_modules(modules, index): + if index < len(modules) - 1: + for module in modules[index + 1:]: + name = module["name"] + if name in state["built_modules"]: + del state["built_modules"][name] + def cmd_build(): modules = [] - for module_file in module_files[sys.argv[2]]: + for module_file in module_files: path = os.path.join(modules_dir, module_file) modules.extend(json.load(open(path))) - for module in modules: + for i, module in enumerate(modules): print "\n=== Building %s ===\n" % module["name"] try: @@ -159,6 +166,7 @@ def cmd_build(): new_commit_id = get_module_commit_id(module) if old_commit_id is None or old_commit_id != new_commit_id: + clear_built_modules(modules, i) build(module) else: print "\n* Already built, skipping *" |