From ca7a56eee7a738cfc54d889c97608fac84284860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Sj=C3=B6lund?= Date: Thu, 5 Feb 2015 12:30:11 +0000 Subject: [PATCH] Force updating the scripting API to the latest version when bootstrapping git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24437 f25d12d1-65f4-0310-ae8a-bbce733d8d8e --- Compiler/Script/Makefile.common | 3 +++ Compiler/boot/Makefile.common | 1 + 2 files changed, 4 insertions(+) diff --git a/Compiler/Script/Makefile.common b/Compiler/Script/Makefile.common index 6906f9079e6..8755d4fda3d 100644 --- a/Compiler/Script/Makefile.common +++ b/Compiler/Script/Makefile.common @@ -2,3 +2,6 @@ all: OpenModelicaScriptingAPI.mo OpenModelicaScriptingAPIQt.cpp OpenModelicaScri OpenModelicaScriptingAPIQt.cpp OpenModelicaScriptingAPIQt.h OpenModelicaScriptingAPI.mo: OpenModelicaScriptingAPI.mos ../FrontEnd/ModelicaBuiltin.mo - $(OMC) $< + +clean: + rm -f OpenModelicaScriptingAPIQt.cpp OpenModelicaScriptingAPIQt.h OpenModelicaScriptingAPI.mo diff --git a/Compiler/boot/Makefile.common b/Compiler/boot/Makefile.common index 3172b24aee3..4fccdfbd986 100644 --- a/Compiler/boot/Makefile.common +++ b/Compiler/boot/Makefile.common @@ -28,6 +28,7 @@ bootstrap-from-tarball: $(MAKE) -f $(defaultMakefileTarget) install INCLUDESOURCES=1 OMC=$(BOOTSTRAP_OMC) @echo "Bootstrapping phase 2/3 completed" $(MAKE) -f $(defaultMakefileTarget) clean OMC=$(BOOTSTRAP_OMC) + $(MAKE) $(defaultMakefileTarget) --no-print-directory -C $(TOP_DIR)/Compiler/Script OMC=$(BOOTSTRAP_OMC) clean $(MAKE) -f $(defaultMakefileTarget) generate-files-in-steps OMC=$(BOOTSTRAP_OMC) $(MAKE) -f $(defaultMakefileTarget) install INCLUDESOURCES=1 OMC=$(BOOTSTRAP_OMC) @echo "Bootstrapping phase 3/3 completed"