forum: port to new build system

MESAHub · Aug 26, 2024 · c3d879d · c3d879d
1 parent e804bc8
commit c3d879d
Show file tree

Hide file tree

Showing 20 changed files with 57 additions and 87 deletions.
diff --git a/forum/Makefile b/forum/Makefile
@@ -0,0 +1,56 @@
+include ../make/defaults-module.mk
+
+# Build
+
+MODULE_NAME := forum
+SRCS :=
+SRCS_CHECK :=
+INTERNAL_DEPENDS_ON :=
+EXTERNAL_DEPENDS_ON := hdf5_fortran
+BINTYPE := static-lib
+INCLUDE_DIRS :=
+
+# Testing
+
+CHECK_RESULTS_GOLDEN := test/test_output
+
+# Install
+
+MODULES := forum_m.mod
+INSTALL_INCLUDES :=
+
+include $(MAKE_DIR)/Makefile
+
+ifeq ($(PROFILE),debug)
+  FORUM_DEBUG = yes
+else
+  FORUM_DEBUG = false
+endif
+
+ifeq ($(MESASDK_ROOT),)
+  FPP=./fypp_deps
+else
+  FPP= PYTHONPATH=$(MESASDK_ROOT)/lib/python ./fypp_deps
+endif
+
+BUILD_DIR_FORUM_BUILD := $(BUILD_DIR_MODULE)/src
+INSTALL_INCLUDES_BUILD += $(BUILD_DIR_MODULE)/include/forum.inc
+
+$(BUILD_DIR_FORUM_BUILD): forum-1.0.3.tar.gz | $(BUILD_DIR_FORUM_BUILD)/ $(BUILD_DIR_MODULE)/include/
+	tar --strip-components=1 -xf $< -C $(BUILD_DIR_FORUM_BUILD)
+	cp $(BUILD_DIR_FORUM_BUILD)/src/include/forum.inc $(BUILD_DIR_MODULE)/include/forum.inc
+
+wrap-forum: $(BUILD_DIR_FORUM_BUILD)
+	$(MAKE) -C $(BUILD_DIR_FORUM_BUILD) SHARED=no DEBUG=$(FORUM_DEBUG) OMP=$(WITH_OPENMP) FPE=yes VERSION_CHECK=passed FPP="$(FPP)" LDFLAGS="$(LIB_DEP_ARGS)" FFLAGS="$(FLAGS_DEPS)"
+
+$(OBJ_OUT): wrap-forum | $(BUILD_DIR_MODULE)/lib/
+	cp $(BUILD_DIR_FORUM_BUILD)/build/$(notdir $@) $@
+
+$(BUILD_DIR_MODULE)/modules/forum_m.mod: wrap-forum | $(BUILD_DIR_MODULE)/modules/
+	cp $(BUILD_DIR_FORUM_BUILD)/build/$(notdir $@) $@
+
+check:
+	pushd test > /dev/null ; ../$(BUILD_DIR_FORUM_BUILD)/build/test_order > ../$(CHECK_RESULTS); popd > /dev/null
+	diff -b $(CHECK_RESULTS) $(CHECK_RESULTS_GOLDEN)
+
+.PHONY: wrap-forum
diff --git a/forum/build_and_test b/forum/build_and_test
diff --git a/forum/build_and_test_parallel b/forum/build_and_test_parallel
diff --git a/forum/clean b/forum/clean
diff --git a/forum/export b/forum/export
diff --git a/forum/i1 b/forum/i1
diff --git a/forum/i1p b/forum/i1p
diff --git a/forum/install b/forum/install
diff --git a/forum/make/makefile b/forum/make/makefile
diff --git a/forum/make/makefile_base b/forum/make/makefile_base
diff --git a/forum/mk b/forum/mk
diff --git a/forum/test/ck b/forum/test/ck
diff --git a/forum/test/clean b/forum/test/clean
diff --git a/forum/test/cleanup b/forum/test/cleanup
diff --git a/forum/test/export b/forum/test/export
diff --git a/forum/test/mk b/forum/test/mk
diff --git a/forum/test/rn b/forum/test/rn
diff --git a/install b/install
@@ -306,8 +306,6 @@ function enum_procs {
 make -Oline -j$(enum_procs)
 check_okay
 
-do_one_parallel forum
-
 if [ ! -r data ]
 then
 	echo

diff --git a/make/subdirs.mk b/make/subdirs.mk
@@ -1 +1 @@
-SUBDIRS := const utils math mtx auto_diff num interp_1d interp_2d chem eos
+SUBDIRS := const utils math mtx auto_diff num interp_1d interp_2d chem eos forum
diff --git a/touch b/touch
@@ -25,7 +25,6 @@ do_one atm
 do_one binary
 do_one colors
 do_one gyre
-do_one forum
 do_one ionization
 do_one kap
 do_one net
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SUBDIRS := const utils math mtx auto_diff num interp_1d interp_2d chem eos
		SUBDIRS := const utils math mtx auto_diff num interp_1d interp_2d chem eos forum