Skip to content

Commit 2ddfb15

Browse files
committed
Install qt scripting API files into build
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24193 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 871d00a commit 2ddfb15

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

Compiler/Script/Makefile.common

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1+
all: OpenModelicaScriptingAPI.mo OpenModelicaScriptingAPIQt.cpp OpenModelicaScriptingAPIQt.h
2+
13
OpenModelicaScriptingAPI.mo: OpenModelicaScriptingAPI.mos ../FrontEnd/ModelicaBuiltin.mo
24
- $(OMC) $<
5+
OpenModelicaScriptingAPIQt.cpp: OpenModelicaScriptingAPI.mo
6+
OpenModelicaScriptingAPIQt.h: OpenModelicaScriptingAPI.mo

Compiler/Script/OpenModelicaScriptingAPI.mos

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ if bool then
77
if bool then
88
bool := 0 == system("mv OpenModelicaScriptingAPI.tmp.mo OpenModelicaScriptingAPI.mo");
99
end if;
10+
writeFile("OpenModelicaScriptingAPIQt.cpp", b);
11+
writeFile("OpenModelicaScriptingAPIQt.h", c);
1012
end if;
1113
if not bool then
1214
print("Failed to generate OpenModelicaScriptingAPI; falling back to old generated one until new tarball exists: " + getErrorString());

Compiler/boot/Makefile.common

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ ifeq ($(STATIC),)
116116
#shared
117117
$(GEN_DIR)omc$(EXE_EXT): $(OMHOME)/lib/omc/libOpenModelicaCompiler$(SHREXT) $(GEN_DIR)_main_omc.o $(GEN_DIR)_main.o
118118
$(CC) $(GEN_DIR)_main.o $(RPATH) $(CFLAGS) $(CPPFLAGS) -o $@ $(LDFLAGS) -lOpenModelicaCompiler
119-
install: $(GEN_DIR)omc$(EXE_EXT)
119+
install: $(GEN_DIR)omc$(EXE_EXT) install-interface
120120
cp -a $< $(OMHOME)/bin/
121121
cp -a $(OMHOME)/lib/omc/libOpenModelicaCompiler$(SHREXT) $(OMHOME)/bin/
122122

@@ -125,7 +125,10 @@ else
125125
$(GEN_DIR)omc$(EXE_EXT): $(ALL_OBJECTS) $(GEN_DIR)_main.o $(GEN_DIR)_main_omc.o $(OMHOME)/lib/omc/libomcruntime.a $(OMHOME)/lib/omc/libomparse.a
126126
@test ! -z "`echo $(ALL_OBJECTS)`" || (echo Empty dependencies for $@ ; false)
127127
$(CC) $(GEN_DIR)_main.o $(RPATH) $(CFLAGS) $(CPPFLAGS) -o $@ $(GEN_DIR)_main_omc.o $(ALL_OBJECTS) $(LDFLAGS)
128-
install: $(GEN_DIR)omc$(EXE_EXT)
128+
install: $(GEN_DIR)omc$(EXE_EXT) install-interface
129129
cp -a $(GEN_DIR)omc$(EXE_EXT) $(OMHOME)/bin/
130130

131131
endif
132+
133+
install-interface:
134+
cp -a $(GEN_DIR)OpenModelicaScriptingAPI.h ../Script/OpenModelicaScriptingAPIQt.cpp ../Script/OpenModelicaScriptingAPIQt.h $(OMHOME)/include/omc/scripting-API

Makefile.common

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ mkbuilddirs:
4242
mkdir -p $(builddir_inc)/c/util/
4343
mkdir -p $(builddir_inc)/c/fmi1/
4444
mkdir -p $(builddir_inc)/c/fmi2/
45+
mkdir -p $(builddir_inc)/scripting-API
4546
mkdir -p $(builddir_java)
4647
mkdir -p $(builddir_share)/omc/scripts/OpenTurns/
4748
mkdir -p $(builddir_doc)/omc/testmodels

0 commit comments

Comments
 (0)