Skip to content

Commit 6c148e7

Browse files
committed
OMBUILDDIR absolute path and git HEAD
- Set absolute path for OMBUILDDIR otherwise ModelicaExternalC configure doesn't work - Get the git SHA instead of svn revision. - Set Modelica.g EOL to LF. - Set OMBUILDIR in Parser makefile to properly copy the parser lib.
1 parent a608558 commit 6c148e7

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ opencl_rt_clean:
150150

151151
breakprocess:
152152
(cd tools/debugging/ && time g++ BreakProcess.cpp -o BreakProcess -static-libgcc)
153-
(cd tools/debugging/ && cp BreakProcess.exe ../../$(builddir_bin)/)
153+
(cd tools/debugging/ && cp BreakProcess.exe $(builddir_bin))
154154

155155
all-runtimeCPPinstall:
156156
$(MAKE) mkbuilddirs

Makefile.omdev.mingw

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ all : .testvariables settings release
33

44
autoconfGeneratedFiles =
55

6-
OMBUILDDIR=./build
6+
OMBUILDDIR=$(CURDIR)/build
77
prefix = ./build
88
exec_prefix = ${prefix}
99
bindir = ${exec_prefix}/bin
@@ -57,7 +57,7 @@ FMILIB_SHARED = OFF
5757
# For Windows build static CMinpack lib!
5858
CMINPACKLIB_SHARED = OFF
5959

60-
CONFIG_REVISION = $(shell svn info | grep "Revision: " | cut -d ' ' -f 2)
60+
CONFIG_REVISION = $(shell git rev-parse HEAD)
6161

6262
revision:
6363
@echo Current revision: $(CONFIG_REVISION)
@@ -179,7 +179,7 @@ copycppheader:
179179
omc: mkbuilddirs interactive fmil omdev_extra_dlls breakprocess opencl_rt CMinpack metis Cdaskr $(IPOPT_TARGET) graphstream
180180
(time $(MAKE) -f $(defaultMakefileTarget) CFLAGS="$(CFLAGS)" omc-bootstrapped)
181181

182-
boehm-gc-lib: build/lib/omc/libomcgc.a
182+
boehm-gc-lib: $(OMBUILDDIR)/lib/omc/libomcgc.a
183183

184184
fmil_msvc:
185185
rm -f build/lib/omc/msvc/fmil*

Parser/Makefile.omdev.mingw

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ CXX=g++
33
CFLAGS=-O3 -Wall
44
CPPFLAGS=-I$(COMPILERHOME) $(RMLINC) -I. -I$(ANTLR) -I$(ANTLR)/include $(BUILDINC) -I../3rdParty/gc/include
55

6+
OMBUILDDIR=../build
67
OMC=../build/bin/omc.exe
78
LIB_OMC=lib/omc
89
ANTLR_LIB=libomantlr3.a

0 commit comments

Comments
 (0)