Skip to content

Commit 3e723dc

Browse files
sjoelundsjoelund
committed
Avoid using the susan_codegen directory since it does not use the configured OMC
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20263 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent b93d35e commit 3e723dc

File tree

5 files changed

+6
-67
lines changed

5 files changed

+6
-67
lines changed

‎Compiler/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ OpenModelicaBootstrappingHeader.h:
9494
@echo OpenModelica has not been compiled yet. Using previously generated $@.
9595
else
9696
simcode: OpenModelicaBootstrappingHeader.h
97-
$(MAKE) -C susan_codegen/
9897
$(MAKE) -C Template/
9998
OpenModelicaBootstrappingHeader.h: FrontEnd/Absyn.mo Script/Interactive.mo FrontEnd/Values.mo Util/Error.mo Util/Util.mo Util/FMI.mo GenerateOMCHeader.mos Template/Unparsing.mo
10099
@OMC@ +g=MetaModelica GenerateOMCHeader.mos > $@.log || (cat $@.log && false)

‎Compiler/Template/Makefile.common‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY : all
22

3-
all : AbsynDumpTpl.mo CodegenUtil.mo CodegenC.mo CodegenFMU.mo CodegenCSharp.mo CodegenQSS.mo CodegenCpp.mo CodegenCppHpcom.mo CodegenFMUCpp.mo CodegenModelica.mo DAEDumpTpl.mo ExpressionDumpTpl.mo GraphvizDump.mo GraphMLDumpTpl.mo NFInstDumpTpl.mo SimCodeDump.mo Unparsing.mo SCodeDumpTpl.mo CodegenAdevs.mo CodegenXML.mo CodegenJava.mo CodegenJS.mo
3+
all : AbsynDumpTpl.mo CodegenUtil.mo CodegenC.mo CodegenFMU.mo CodegenCSharp.mo CodegenQSS.mo CodegenCpp.mo CodegenCppHpcom.mo CodegenFMUCpp.mo CodegenModelica.mo DAEDumpTpl.mo ExpressionDumpTpl.mo GraphvizDump.mo GraphMLDumpTpl.mo NFInstDumpTpl.mo SimCodeDump.mo Unparsing.mo SCodeDumpTpl.mo CodegenAdevs.mo CodegenXML.mo CodegenJava.mo CodegenJS.mo TplCodegen.mo
44

55
AbsynDumpTpl.mo : AbsynDumpTpl.tpl AbsynDumpTV.mo
66
@echo " ** AbsynDumpTpl template compilation ** "
@@ -111,3 +111,8 @@ CodegenJS.mo : CodegenJS.tpl SimCodeTV.mo
111111
@echo " ** CodegenJS template compilation ** "
112112
$(OMC) $< > $@.log || (cat $@.log && false)
113113
@echo " "
114+
115+
TplCodegen.mo : ../susan_codegen/TplCodegen.tpl ../susan_codegen/TplCodegenTV.mo
116+
@echo " ** TplCodegen generation ** "
117+
(cd ../susan_codegen && $(OMC) +d=failtrace TplCodegen.tpl) > $@.log || (cat $@.log && false)
118+
cp -a ../susan_codegen/TplCodegen.mo $@

‎Compiler/Template/TplCodegen.mo‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,3 @@
1-
/*
2-
* This file is part of OpenModelica.
3-
*
4-
* Copyright (c) 1998-2014, Open Source Modelica Consortium (OSMC),
5-
* c/o Linköpings universitet, Department of Computer and Information Science,
6-
* SE-58183 Linköping, Sweden.
7-
*
8-
* All rights reserved.
9-
*
10-
* THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR
11-
* THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2.
12-
* ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES
13-
* RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3,
14-
* ACCORDING TO RECIPIENTS CHOICE.
15-
*
16-
* The OpenModelica software and the Open Source Modelica
17-
* Consortium (OSMC) Public License (OSMC-PL) are obtained
18-
* from OSMC, either from the above address,
19-
* from the URLs: http://www.ida.liu.se/projects/OpenModelica or
20-
* http://www.openmodelica.org, and in the OpenModelica distribution.
21-
* GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html.
22-
*
23-
* This program is distributed WITHOUT ANY WARRANTY; without
24-
* even the implied warranty of MERCHANTABILITY or FITNESS
25-
* FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH
26-
* IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL.
27-
*
28-
* See the full OSMC Public License conditions for more details.
29-
*
30-
*/
311
encapsulated package TplCodegen
322
"
333
file: TplCodegen.mo

‎Compiler/susan_codegen/Makefile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
OMC = ../../build/bin/omc
44

55
all : TplCodegen.mo
6-
TplCodegen.mo : TplCodegen.tpl
7-
@echo " ** TplCodegen generation ** "
8-
$(OMC) +d=failtrace TplCodegen.tpl
9-
cp -pf TplCodegen.mo ../Template/
10-
@echo " "
116

127
test :
138
@echo " ** Susan Test ** "

‎Compiler/susan_codegen/TplCodegen.mo‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,3 @@
1-
/*
2-
* This file is part of OpenModelica.
3-
*
4-
* Copyright (c) 1998-2014, Open Source Modelica Consortium (OSMC),
5-
* c/o Linköpings universitet, Department of Computer and Information Science,
6-
* SE-58183 Linköping, Sweden.
7-
*
8-
* All rights reserved.
9-
*
10-
* THIS PROGRAM IS PROVIDED UNDER THE TERMS OF GPL VERSION 3 LICENSE OR
11-
* THIS OSMC PUBLIC LICENSE (OSMC-PL) VERSION 1.2.
12-
* ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS PROGRAM CONSTITUTES
13-
* RECIPIENT'S ACCEPTANCE OF THE OSMC PUBLIC LICENSE OR THE GPL VERSION 3,
14-
* ACCORDING TO RECIPIENTS CHOICE.
15-
*
16-
* The OpenModelica software and the Open Source Modelica
17-
* Consortium (OSMC) Public License (OSMC-PL) are obtained
18-
* from OSMC, either from the above address,
19-
* from the URLs: http://www.ida.liu.se/projects/OpenModelica or
20-
* http://www.openmodelica.org, and in the OpenModelica distribution.
21-
* GNU version 3 is obtained from: http://www.gnu.org/copyleft/gpl.html.
22-
*
23-
* This program is distributed WITHOUT ANY WARRANTY; without
24-
* even the implied warranty of MERCHANTABILITY or FITNESS
25-
* FOR A PARTICULAR PURPOSE, EXCEPT AS EXPRESSLY SET FORTH
26-
* IN THE BY RECIPIENT SELECTED SUBSIDIARY LICENSE CONDITIONS OF OSMC-PL.
27-
*
28-
* See the full OSMC Public License conditions for more details.
29-
*
30-
*/
311
encapsulated package TplCodegen
322
"
333
file: TplCodegen.mo

0 commit comments

Comments
 (0)