Move the C includes to build/include/omc/c. Probably fixed bootstrapping

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19158 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/Makefile.in

@@ -56,7 +56,7 @@ $(PROG): omc_release
 
 install_scripts:
 	cd scripts; cp $(SCRIPT_FILES) ../$(builddir_scripts)
-	cp OpenModelicaBootstrappingHeader.h $(top_builddir)/build/include/omc/
+	cp OpenModelicaBootstrappingHeader.h $(top_builddir)/build/include/omc/c/
 
 install: install_scripts $(PROG)
 

Compiler/Template/CodegenC.tpl

@@ -4144,7 +4144,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   # /I - Include Directories
   # /DNOMINMAX - Define NOMINMAX (does what it says)
   # /TP - Use C++ Compiler
-  CFLAGS=/Od /ZI /EHa /fp:except /I"<%makefileParams.omhome%>/include/omc" /I"<%makefileParams.omhome%>/include/omc/msvc/" /I. /DNOMINMAX /TP /DNO_INTERACTIVE_DEPENDENCY /DOPENMODELICA_XML_FROM_FILE_AT_RUNTIME <%if (Flags.isSet(Flags.HPCOM)) then '/openmp'%>
+  CFLAGS=/Od /ZI /EHa /fp:except /I"<%makefileParams.omhome%>/include/omc/c" /I"<%makefileParams.omhome%>/include/omc/msvc/" /I. /DNOMINMAX /TP /DNO_INTERACTIVE_DEPENDENCY /DOPENMODELICA_XML_FROM_FILE_AT_RUNTIME <%if (Flags.isSet(Flags.HPCOM)) then '/openmp'%>
 
   # /ZI enable Edit and Continue debug info
   CDFLAGS = /ZI
@@ -4205,7 +4205,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   DLLEXT=<%makefileParams.dllext%>
   CFLAGS_BASED_ON_INIT_FILE=<%extraCflags%>
   CFLAGS=$(CFLAGS_BASED_ON_INIT_FILE) <%makefileParams.cflags%> <%match sopt case SOME(s as SIMULATION_SETTINGS(__)) then '<%s.cflags%> ' /* From the simulate() command */%>
-  CPPFLAGS=-I"<%makefileParams.omhome%>/include/omc" -I. <%makefileParams.includes ; separator=" "%> -DOPENMODELICA_XML_FROM_FILE_AT_RUNTIME
+  CPPFLAGS=-I"<%makefileParams.omhome%>/include/omc/c" -I. <%makefileParams.includes ; separator=" "%> -DOPENMODELICA_XML_FROM_FILE_AT_RUNTIME
   LDFLAGS=<%dirExtra%> <%
   if stringEq(Config.simCodeTarget(),"JavaScript") then <<-L'<%makefileParams.omhome%>/lib/omc/emcc' -lblas -llapack -lexpat -lSimulationRuntimeC -lf2c --llvm-lto 2 -s TOTAL_MEMORY=268435456 -s MAX_SETJMPS=2000 -s OUTLINING_LIMIT=20000 --pre-js <%makefileParams.omhome%>/lib/omc/emcc/pre.js>>
   else <<-L"<%makefileParams.omhome%>/lib/omc" -L"<%makefileParams.omhome%>/lib" -Wl,<% if stringEq(makefileParams.platform, "win32") then "--stack,0x2000000,"%>-rpath,"<%makefileParams.omhome%>/lib/omc" -Wl,-rpath,"<%makefileParams.omhome%>/lib" <%ParModelicaLibs%> <%makefileParams.ldflags%> <%makefileParams.runtimelibs%>>>
@@ -4444,7 +4444,7 @@ case FUNCTIONCODE(makefileParams=MAKEFILE_PARAMS(__)) then
   LINK=<%makefileParams.linker%>
   EXEEXT=<%makefileParams.exeext%>
   DLLEXT=<%makefileParams.dllext%>
-  CFLAGS= -I"<%makefileParams.omhome%>/include/omc" <%makefileParams.includes ; separator=" "%> <%makefileParams.cflags%>
+  CFLAGS= -I"<%makefileParams.omhome%>/include/omc/c" <%makefileParams.includes ; separator=" "%> <%makefileParams.cflags%>
   LDFLAGS= -L"<%makefileParams.omhome%>/lib/omc" -Wl,-rpath,'<%makefileParams.omhome%>/lib/omc' <%ParModelicaLibs%> <%makefileParams.ldflags%> <%makefileParams.runtimelibs%>
   PERL=perl
   MAINFILE=<%name%>.c

Compiler/Template/CodegenFMU.tpl

@@ -1082,7 +1082,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   # /I - Include Directories
   # /DNOMINMAX - Define NOMINMAX (does what it says)
   # /TP - Use C++ Compiler
-  CFLAGS=/Od /ZI /EHa /fp:except /I"<%makefileParams.omhome%>/include/omc" /I. /DNOMINMAX /TP /DNO_INTERACTIVE_DEPENDENCY
+  CFLAGS=/Od /ZI /EHa /fp:except /I"<%makefileParams.omhome%>/include/omc/c" /I. /DNOMINMAX /TP /DNO_INTERACTIVE_DEPENDENCY
 
   # /ZI enable Edit and Continue debug info
   CDFLAGS = /ZI
@@ -1158,8 +1158,8 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   CFLAGS_BASED_ON_INIT_FILE=<%extraCflags%>
   PLATFORM = <%platformstr%>
   PLAT34 = <%makefileParams.platform%>
-  CFLAGS=$(CFLAGS_BASED_ON_INIT_FILE) -I"<%makefileParams.omhome%>/include/omc" <%makefileParams.cflags%> <%match sopt case SOME(s as SIMULATION_SETTINGS(__)) then s.cflags /* From the simulate() command */%>
-  CPPFLAGS=-I"<%makefileParams.omhome%>/include/omc" -I. <%makefileParams.includes ; separator=" "%>
+  CFLAGS=$(CFLAGS_BASED_ON_INIT_FILE) -I"<%makefileParams.omhome%>/include/omc/c" <%makefileParams.cflags%> <%match sopt case SOME(s as SIMULATION_SETTINGS(__)) then s.cflags /* From the simulate() command */%>
+  CPPFLAGS=-I"<%makefileParams.omhome%>/include/omc/c" -I. <%makefileParams.includes ; separator=" "%>
   LDFLAGS=-L"<%makefileParams.omhome%>/lib/omc" -Wl,-rpath,'<%makefileParams.omhome%>/lib/omc' -lSimulationRuntimeC -linteractive <%makefileParams.ldflags%> <%makefileParams.runtimelibs%> <%dirExtra%> 
   PERL=perl
   MAINFILE=<%fileNamePrefix%>_FMU.c

Makefile.common

@@ -32,16 +32,16 @@ mkbuilddirs:
 	mkdir -p $(builddir_lib)/omc/emcc
 	mkdir -p $(builddir_lib)/python
 	mkdir -p $(builddir_lib)/python/omniORB
-	mkdir -p $(builddir_inc)
-	mkdir -p $(builddir_inc)/linearization
-	mkdir -p $(builddir_inc)/optimization
-	mkdir -p $(builddir_inc)/simulation
-	mkdir -p $(builddir_inc)/simulation/results
-	mkdir -p $(builddir_inc)/simulation/solver
-	mkdir -p $(builddir_inc)/simulation/solver/initialization
-	mkdir -p $(builddir_inc)/meta
-	mkdir -p $(builddir_inc)/meta/gc
-	mkdir -p $(builddir_inc)/util
+	mkdir -p $(builddir_inc)/c/
+	mkdir -p $(builddir_inc)/c/linearization/
+	mkdir -p $(builddir_inc)/c/optimization/
+	mkdir -p $(builddir_inc)/c/simulation/
+	mkdir -p $(builddir_inc)/c/simulation/results/
+	mkdir -p $(builddir_inc)/c/simulation/solver/
+	mkdir -p $(builddir_inc)/c/simulation/solver/initialization/
+	mkdir -p $(builddir_inc)/c/meta/
+	mkdir -p $(builddir_inc)/c/meta/gc/
+	mkdir -p $(builddir_inc)/c/util/
 	mkdir -p $(builddir_java)
 	mkdir -p $(builddir_share)/omc/scripts/PythonInterface/OMPython/OMParser
 	mkdir -p $(builddir_share)/omc/scripts/PythonInterface/PySimulator
@@ -96,18 +96,18 @@ libgc-dev: /usr/include/gc/leak_detector.h
 libgc-dev: /usr/include/gc/new_gc_alloc.h
 libgc-dev: /usr/include/gc/weakpointer.h
 
-boehm-gc: mkbuilddirs boehm-gc-lib build/include/omc/gc.h build/include/omc/gc_config_macros.h build/include/omc/gc_version.h build/include/omc/gc_pthread_redirects.h
+boehm-gc: mkbuilddirs boehm-gc-lib build/include/omc/c/gc.h build/include/omc/c/gc_config_macros.h build/include/omc/c/gc_version.h build/include/omc/c/gc_pthread_redirects.h
 build/lib/omc/libgc.a: 3rdParty/gc-7.2/.libs/libgc.a mkbuilddirs
 	cp -p $< $@
 3rdParty/gc-7.2/.libs/libgc.a: 3rdParty/gc-7.2/Makefile
 	$(MAKE) -C 3rdParty/gc-7.2/
-build/include/omc/gc.h: 3rdParty/gc-7.2/include/gc.h mkbuilddirs
+build/include/omc/c/gc.h: 3rdParty/gc-7.2/include/gc.h mkbuilddirs
 	cp -pPR $< $@
-build/include/omc/gc_config_macros.h: 3rdParty/gc-7.2/include/gc_config_macros.h mkbuilddirs
+build/include/omc/c/gc_config_macros.h: 3rdParty/gc-7.2/include/gc_config_macros.h mkbuilddirs
 	cp -pPR $< $@
-build/include/omc/gc_version.h: 3rdParty/gc-7.2/include/gc_version.h mkbuilddirs
+build/include/omc/c/gc_version.h: 3rdParty/gc-7.2/include/gc_version.h mkbuilddirs
 	cp -pPR $< $@
-build/include/omc/gc_pthread_redirects.h: 3rdParty/gc-7.2/include/gc_pthread_redirects.h mkbuilddirs
+build/include/omc/c/gc_pthread_redirects.h: 3rdParty/gc-7.2/include/gc_pthread_redirects.h mkbuilddirs
 	cp -pPR $< $@
 3rdParty/gc-7.2/Makefile: 3rdParty/gc-7.2/Makefile.in 3rdParty/gc-7.2/configure
 	(cd 3rdParty/gc-7.2 && ./configure "--host=$(host)" $(LIBGC_EXTRA_CONFIGURATION) --disable-gcj-support --disable-java-finalization --enable-large-config CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS) -DLARGE_CONFIG -DTHREAD_LOCAL_ALLOC")
@@ -121,7 +121,6 @@ build/lib/omc/libipopt.la: 3rdParty/Ipopt-3.11.6/Makefile
 	test ! `uname` = Darwin || install_name_tool -id @rpath/libipopt.1.9.6.dylib 3rdParty/Ipopt-3.11.6/lib/libipopt.1.9.6.dylib
 	test ! `uname` = Darwin || install_name_tool -id @rpath/libcoinmumps.1.4.11.dylib 3rdParty/Ipopt-3.11.6/lib/libcoinmumps.1.4.11.dylib
 	cp -pPR 3rdParty/Ipopt-3.11.6/lib/*.* build/lib/omc
-	cp -pPR 3rdParty/Ipopt-3.11.6/include/coin build/include/omc
 
 ipopt: build/lib/omc/libipopt.la
 
@@ -132,7 +131,7 @@ openblas: build/lib/omc/libopenblas_openmodelica.a
 
 fmi: interactive
 	$(MAKE) -C SimulationRuntime/fmi/import -f $(defaultMakefileTarget)
-	(cp -pPR SimulationRuntime/fmi/import/fmuWrapper.h SimulationRuntime/fmi/import/xmlparser.h $(builddir_inc))
+	(cp -pPR SimulationRuntime/fmi/import/fmuWrapper.h SimulationRuntime/fmi/import/xmlparser.h $(builddir_inc)/c/)
 
 fmiclean: 
 	$(MAKE) -C SimulationRuntime/fmi/import/ -f $(defaultMakefileTarget) clean

SimulationRuntime/ParModelica/OpenCLRuntime/Makefile.common

@@ -1,6 +1,6 @@
 TOP_BUILDDIR = ../../../build/
 
-OPENMODELICA_INC=$(TOP_BUILDDIR)/include/omc/
+OPENMODELICA_INC=$(TOP_BUILDDIR)/include/omc/c/
 OPENMODELICA_LIB=$(TOP_BUILDDIR)/lib/omc/
 OPENMODELICA_BIN=$(TOP_BUILDDIR)/bin/
 

SimulationRuntime/ParModelica/OpenCLRuntime/Makefile.in

@@ -16,7 +16,7 @@ transfer: libOMOCLRuntime.a
 	$(COPY) omc_ocl_memory_ops.h $(OPENMODELICA_INC)
 	$(COPY) libOMOCLRuntime.a $(OPENMODELICA_LIB)
 	$(COPY) ParModelicaBuiltin.mo $(OPENMODELICA_LIB)
-	$(COPY) OCLRuntimeUtil_new.cl $(TOP_BUILDDIR)/include/omc/
+	$(COPY) OCLRuntimeUtil_new.cl $(OPENMODELICA_INC)
 
 Makefile: Makefile.in
 	(cd ../../../ && ./config.status)

SimulationRuntime/c/Makefile.common

@@ -197,21 +197,21 @@ install: $(LIBSIMULATION) $(LIBRUNTIME) $(LIBFMIRUNTIME) simulation/libf2c/libf2
 	# copy interactive sample client
 	cp $(INTERACTIVECLIENT) $(builddir_bin)
 	# copy header files
-	cp -p $(RUNTIME_HEADERS) $(builddir_inc)
-	cp -p $(RUNTIMELINEAR_HEADERS) $(builddir_inc)/linearization
-	cp -p $(RUNTIMEOPTIMZ_HEADERS) $(builddir_inc)/optimization
-	cp -p $(RUNTIMESIMULATION_HEADERS) $(builddir_inc)/simulation
-	cp -p $(RUNTIMESIMRESULTS_HEADERS) $(builddir_inc)/simulation/results
-	cp -p $(RUNTIMESIMSOLVER_HEADERS) $(builddir_inc)/simulation/solver
-	cp -p $(RUNTIMEINITIALIZATION_HEADERS) $(builddir_inc)/simulation/solver/initialization
-	cp -p $(RUNTIMEMETA_HEADERS) $(builddir_inc)/meta
-	cp -p $(RUNTIMEMETAGC_HEADERS) $(builddir_inc)/meta/gc
-	cp -p $(RUNTIMEUTIL_HEADERS) $(builddir_inc)/util
+	cp -p $(RUNTIME_HEADERS) $(builddir_inc)/c/
+	cp -p $(RUNTIMELINEAR_HEADERS) $(builddir_inc)/c/linearization/
+	cp -p $(RUNTIMEOPTIMZ_HEADERS) $(builddir_inc)/c/optimization/
+	cp -p $(RUNTIMESIMULATION_HEADERS) $(builddir_inc)/c/simulation/
+	cp -p $(RUNTIMESIMRESULTS_HEADERS) $(builddir_inc)/c/simulation/results/
+	cp -p $(RUNTIMESIMSOLVER_HEADERS) $(builddir_inc)/c/simulation/solver/
+	cp -p $(RUNTIMEINITIALIZATION_HEADERS) $(builddir_inc)/c/simulation/solver/initialization/
+	cp -p $(RUNTIMEMETA_HEADERS) $(builddir_inc)/c/meta/
+	cp -p $(RUNTIMEMETAGC_HEADERS) $(builddir_inc)/c/meta/gc/
+	cp -p $(RUNTIMEUTIL_HEADERS) $(builddir_inc)/c/util/
 	# copy fmi stuff
 	cp -p $(RUNTIME_HEADERS_FMU) ../fmi/export/*.h \
 	   ../fmi/export/fmu_model_interface.c \
 	   ../fmi/import/fmuWrapper.h \
-	   ../fmi/import/xmlparser.h $(builddir_inc)
+	   ../fmi/import/xmlparser.h $(builddir_inc)/c
 	# copy java interface stuff
 	@$(MAKE) -C util/java_interface -f $(LIBMAKEFILE) && \
 	$(MAKE) -C util/java_interface -f $(LIBMAKEFILE) install || \

SimulationRuntime/fmi/import/Makefile.in

@@ -12,7 +12,7 @@ BIN  = ../../../build/bin/fmigenerator
 LIB  = ../../../build/lib/omc/libfmuWrapper.a
 CXXFLAGS = $(CXXINCS)
 CFLAGS = @CFLAGS@ -Wall -pedantic -std=c99
-CPPFLAGS = -I"../../../build/include/omc" @CPPFLAGS@
+CPPFLAGS = -I"../../../build/include/omc/c" @CPPFLAGS@
 LDFLAGS = @LDFLAGS@ -lexpat
 RM = rm -f