Merge remote-tracking branch 'origin/develop-create-runtime-folder' i…

…nto develop
arras-energy · Mar 8, 2022 · c06d016 · c06d016
2 parents 5a7e701 + 896f845
commit c06d016
Show file tree

Hide file tree

Showing 54 changed files with 50 additions and 49 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -56,6 +56,7 @@ docs_targets =
 # required modules
 include $(top_srcdir)/third_party/Makefile.mk
 include $(top_srcdir)/gldcore/Makefile.mk
+include $(top_srcdir)/runtime/Makefile.mk
 include $(top_srcdir)/python_extras/Makefile.mk
 include $(top_srcdir)/converters/Makefile.mk
 include $(top_srcdir)/tools/Makefile.mk

diff --git a/gldcore/Makefile.mk b/gldcore/Makefile.mk
@@ -1,12 +1,7 @@
 include gldcore/link/engine/Makefile.mk
 include gldcore/link/matlab/Makefile.mk
-include gldcore/rt/Makefile.mk
 include gldcore/solvers/Makefile.mk
 
-dist_pkgdata_DATA += gldcore/tzinfo.txt
-dist_pkgdata_DATA += gldcore/unitfile.txt
-dist_pkgdata_DATA += gldcore/gridlabd.cnf
-
 gridlabd_bin_SOURCES = 
 gridlabd_bin_SOURCES += gldcore/aggregate.cpp gldcore/aggregate.h
 gridlabd_bin_SOURCES += gldcore/class.cpp gldcore/class.h

diff --git a/gldcore/rt/Makefile.mk b/gldcore/rt/Makefile.mk
diff --git a/runtime/Makefile.mk b/runtime/Makefile.mk
@@ -0,0 +1,49 @@
+dist_pkgdata_DATA += runtime/about.htm
+dist_pkgdata_DATA += runtime/capacitor_b.png
+dist_pkgdata_DATA += runtime/capacitor_g.png
+dist_pkgdata_DATA += runtime/capacitor_k.png
+dist_pkgdata_DATA += runtime/capacitor_r.png
+dist_pkgdata_DATA += runtime/debugger.conf
+dist_pkgdata_DATA += runtime/eula.htm
+dist_pkgdata_DATA += runtime/favicon.ico
+dist_pkgdata_DATA += runtime/feeder.py
+dist_pkgdata_DATA += runtime/gnuplot.conf
+dist_pkgdata_DATA += runtime/gridlabd.cnf
+dist_pkgdata_DATA += runtime/gridlabd.conf
+dist_pkgdata_DATA += runtime/gridlabd.css
+dist_pkgdata_DATA += runtime/gridlabd.h
+dist_pkgdata_DATA += runtime/gridlabd.htm
+dist_pkgdata_DATA += runtime/gridlabd.jpg
+dist_pkgdata_DATA += runtime/gridlabd.js
+dist_pkgdata_DATA += runtime/gridlabd.rc
+dist_pkgdata_DATA += runtime/gridlabd.syn
+dist_pkgdata_DATA += runtime/load_b.png
+dist_pkgdata_DATA += runtime/load_g.png
+dist_pkgdata_DATA += runtime/load_k.png
+dist_pkgdata_DATA += runtime/load_r.png
+dist_pkgdata_DATA += runtime/meter_g.png
+dist_pkgdata_DATA += runtime/mingw.conf
+dist_pkgdata_DATA += runtime/node_b.png
+dist_pkgdata_DATA += runtime/node_g.png
+dist_pkgdata_DATA += runtime/node_k.png
+dist_pkgdata_DATA += runtime/node_r.png
+dist_pkgdata_DATA += runtime/regulator_b.png
+dist_pkgdata_DATA += runtime/regulator_g.png
+dist_pkgdata_DATA += runtime/regulator_k.png
+dist_pkgdata_DATA += runtime/regulator_r.png
+dist_pkgdata_DATA += runtime/switch_b.png
+dist_pkgdata_DATA += runtime/switch_g.png
+dist_pkgdata_DATA += runtime/switch_k.png
+dist_pkgdata_DATA += runtime/switch_r.png
+dist_pkgdata_DATA += runtime/transformer_b.png
+dist_pkgdata_DATA += runtime/transformer_g.png
+dist_pkgdata_DATA += runtime/transformer_k.png
+dist_pkgdata_DATA += runtime/transformer_r.png
+dist_pkgdata_DATA += runtime/triplex_meter_b.png
+dist_pkgdata_DATA += runtime/triplex_meter_g.png
+dist_pkgdata_DATA += runtime/triplex_meter_k.png
+dist_pkgdata_DATA += runtime/triplex_meter_r.png
+dist_pkgdata_DATA += runtime/tzinfo.txt
+dist_pkgdata_DATA += runtime/unitfile.txt
+
+
diff --git a/gldcore/rt/about.htm → runtime/about.htm b/gldcore/rt/about.htm → runtime/about.htm
diff --git a/gldcore/rt/capacitor_b.png → runtime/capacitor_b.png b/gldcore/rt/capacitor_b.png → runtime/capacitor_b.png
diff --git a/gldcore/rt/capacitor_g.png → runtime/capacitor_g.png b/gldcore/rt/capacitor_g.png → runtime/capacitor_g.png
diff --git a/gldcore/rt/capacitor_k.png → runtime/capacitor_k.png b/gldcore/rt/capacitor_k.png → runtime/capacitor_k.png
diff --git a/gldcore/rt/capacitor_r.png → runtime/capacitor_r.png b/gldcore/rt/capacitor_r.png → runtime/capacitor_r.png
diff --git a/gldcore/rt/debugger.conf → runtime/debugger.conf b/gldcore/rt/debugger.conf → runtime/debugger.conf
diff --git a/gldcore/rt/eula.htm → runtime/eula.htm b/gldcore/rt/eula.htm → runtime/eula.htm
diff --git a/gldcore/rt/favicon.ico → runtime/favicon.ico b/gldcore/rt/favicon.ico → runtime/favicon.ico
diff --git a/gldcore/rt/feeder.py → runtime/feeder.py b/gldcore/rt/feeder.py → runtime/feeder.py
diff --git a/gldcore/rt/file_dialog.htm → runtime/file_dialog.htm b/gldcore/rt/file_dialog.htm → runtime/file_dialog.htm
diff --git a/gldcore/rt/gnuplot.conf → runtime/gnuplot.conf b/gldcore/rt/gnuplot.conf → runtime/gnuplot.conf
diff --git a/gldcore/gridlabd.cnf → runtime/gridlabd.cnf b/gldcore/gridlabd.cnf → runtime/gridlabd.cnf
diff --git a/gldcore/rt/gridlabd.conf → runtime/gridlabd.conf b/gldcore/rt/gridlabd.conf → runtime/gridlabd.conf
diff --git a/gldcore/rt/gridlabd.css → runtime/gridlabd.css b/gldcore/rt/gridlabd.css → runtime/gridlabd.css
diff --git a/gldcore/rt/gridlabd.h → runtime/gridlabd.h b/gldcore/rt/gridlabd.h → runtime/gridlabd.h
diff --git a/gldcore/rt/gridlabd.htm → runtime/gridlabd.htm b/gldcore/rt/gridlabd.htm → runtime/gridlabd.htm
diff --git a/gldcore/rt/gridlabd.jpg → runtime/gridlabd.jpg b/gldcore/rt/gridlabd.jpg → runtime/gridlabd.jpg
diff --git a/gldcore/rt/gridlabd.js → runtime/gridlabd.js b/gldcore/rt/gridlabd.js → runtime/gridlabd.js
diff --git a/gldcore/rt/gridlabd.rc → runtime/gridlabd.rc b/gldcore/rt/gridlabd.rc → runtime/gridlabd.rc
diff --git a/gldcore/rt/gridlabd.syn → runtime/gridlabd.syn b/gldcore/rt/gridlabd.syn → runtime/gridlabd.syn
diff --git a/gldcore/rt/kml_icons.pptx → runtime/kml_icons.pptx b/gldcore/rt/kml_icons.pptx → runtime/kml_icons.pptx
diff --git a/gldcore/rt/load_b.png → runtime/load_b.png b/gldcore/rt/load_b.png → runtime/load_b.png
diff --git a/gldcore/rt/load_g.png → runtime/load_g.png b/gldcore/rt/load_g.png → runtime/load_g.png
diff --git a/gldcore/rt/load_k.png → runtime/load_k.png b/gldcore/rt/load_k.png → runtime/load_k.png
diff --git a/gldcore/rt/load_r.png → runtime/load_r.png b/gldcore/rt/load_r.png → runtime/load_r.png
diff --git a/gldcore/rt/main.htm → runtime/main.htm b/gldcore/rt/main.htm → runtime/main.htm
diff --git a/gldcore/rt/meter_g.png → runtime/meter_g.png b/gldcore/rt/meter_g.png → runtime/meter_g.png
diff --git a/gldcore/rt/mingw.conf → runtime/mingw.conf b/gldcore/rt/mingw.conf → runtime/mingw.conf
diff --git a/gldcore/rt/node_b.png → runtime/node_b.png b/gldcore/rt/node_b.png → runtime/node_b.png
diff --git a/gldcore/rt/node_g.png → runtime/node_g.png b/gldcore/rt/node_g.png → runtime/node_g.png
diff --git a/gldcore/rt/node_k.png → runtime/node_k.png b/gldcore/rt/node_k.png → runtime/node_k.png
diff --git a/gldcore/rt/node_r.png → runtime/node_r.png b/gldcore/rt/node_r.png → runtime/node_r.png
diff --git a/gldcore/rt/regulator_b.png → runtime/regulator_b.png b/gldcore/rt/regulator_b.png → runtime/regulator_b.png
diff --git a/gldcore/rt/regulator_g.png → runtime/regulator_g.png b/gldcore/rt/regulator_g.png → runtime/regulator_g.png
diff --git a/gldcore/rt/regulator_k.png → runtime/regulator_k.png b/gldcore/rt/regulator_k.png → runtime/regulator_k.png
diff --git a/gldcore/rt/regulator_r.png → runtime/regulator_r.png b/gldcore/rt/regulator_r.png → runtime/regulator_r.png
diff --git a/gldcore/rt/switch_b.png → runtime/switch_b.png b/gldcore/rt/switch_b.png → runtime/switch_b.png
diff --git a/gldcore/rt/switch_g.png → runtime/switch_g.png b/gldcore/rt/switch_g.png → runtime/switch_g.png
diff --git a/gldcore/rt/switch_k.png → runtime/switch_k.png b/gldcore/rt/switch_k.png → runtime/switch_k.png
diff --git a/gldcore/rt/switch_r.png → runtime/switch_r.png b/gldcore/rt/switch_r.png → runtime/switch_r.png
diff --git a/gldcore/rt/transformer_b.png → runtime/transformer_b.png b/gldcore/rt/transformer_b.png → runtime/transformer_b.png
diff --git a/gldcore/rt/transformer_g.png → runtime/transformer_g.png b/gldcore/rt/transformer_g.png → runtime/transformer_g.png
diff --git a/gldcore/rt/transformer_k.png → runtime/transformer_k.png b/gldcore/rt/transformer_k.png → runtime/transformer_k.png
diff --git a/gldcore/rt/transformer_r.png → runtime/transformer_r.png b/gldcore/rt/transformer_r.png → runtime/transformer_r.png
diff --git a/gldcore/rt/triplex_meter_b.png → runtime/triplex_meter_b.png b/gldcore/rt/triplex_meter_b.png → runtime/triplex_meter_b.png
diff --git a/gldcore/rt/triplex_meter_g.png → runtime/triplex_meter_g.png b/gldcore/rt/triplex_meter_g.png → runtime/triplex_meter_g.png
diff --git a/gldcore/rt/triplex_meter_k.png → runtime/triplex_meter_k.png b/gldcore/rt/triplex_meter_k.png → runtime/triplex_meter_k.png
diff --git a/gldcore/rt/triplex_meter_r.png → runtime/triplex_meter_r.png b/gldcore/rt/triplex_meter_r.png → runtime/triplex_meter_r.png
diff --git a/gldcore/tzinfo.txt → runtime/tzinfo.txt b/gldcore/tzinfo.txt → runtime/tzinfo.txt
diff --git a/gldcore/unitfile.txt → runtime/unitfile.txt b/gldcore/unitfile.txt → runtime/unitfile.txt