diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..7b9f6c0 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,21 @@ +name: build + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: install + run: sudo apt-get install libmotif-dev libxpm-dev gfortran xutils-dev libglx-dev libgl-dev libxmu-dev libglu1-mesa-dev libxi-dev + - name: build + run: cd sera1 && ./fullbuild + - name: make_all + run: cd sera1 && make all diff --git a/sera1/Imakefile b/sera1/Imakefile index 9d3f848..033c257 100644 --- a/sera1/Imakefile +++ b/sera1/Imakefile @@ -9,5 +9,5 @@ Shared Sera3d SeraCalc SeraDose SeraImage \ SeraMC SeraMenu SeraModel SeraPlan SeraPlot \ Util -MakeSubdirs($(SUBDIRS)) +MakeSubdirsOrExit($(SUBDIRS)) DependSubdirs($(SUBDIRS)) diff --git a/sera1/config/Imake.rules b/sera1/config/Imake.rules index d982745..4295433 100644 --- a/sera1/config/Imake.rules +++ b/sera1/config/Imake.rules @@ -1836,6 +1836,21 @@ name:: @@\ done #endif +/* + * MakeSubdirsOrExit - recursively make a series of steps and exit if one + * fails. + */ +#ifndef MakeSubdirsOrExit +#define MakeSubdirsOrExit(dirs) @@\ +all:: @@\ + @MakeFlagsToShellFlags(ik,set +e); \ @@\ + for i in dirs ;\ @@\ + do \ @@\ + echo "making all in $(CURRENT_DIR)/$$i..."; \ @@\ + (cd $$i && $(MAKE) $(MFLAGS) PassCDebugFlags all) || exit -1; \ @@\ + done +#endif + /* * NamedMakeSubdirs - generate rules to do makes in the given subdirectories. diff --git a/sera1/config/linux.cf b/sera1/config/linux.cf index 58d52e0..f83836c 100644 --- a/sera1/config/linux.cf +++ b/sera1/config/linux.cf @@ -417,7 +417,7 @@ EXTRA_X_LIBS = -lXmu -lXt -lSM -lICE -lXext -lXintl -lXi -lX11 #else #define StandardIncludes -I/usr/X11R6/include -I$(TOP)/Shared/include #define ExtraLibraries -L/usr/X11R6/lib -L$(TOP)/Shared/lib -EXTRA_X_LIBS = -lXmu -lXt -lSM -lICE -lXext -lXp -lXi -lX11 +EXTRA_X_LIBS = -lXmu -lXt -lSM -lICE -lXext -lXi -lX11 #endif XCOMM Location for libraries built withing the project. diff --git a/sera1/fullbuild b/sera1/fullbuild index 49f564f..42a1845 100755 --- a/sera1/fullbuild +++ b/sera1/fullbuild @@ -1,5 +1,8 @@ #!/bin/sh - +SERA_HOME=`dirname $0` +cd $SERA_HOME +export SERA_HOME=`pwd` +echo SERA_HOME=$SERA_HOME touch $SERA_HOME/config/Local.def imake -I./config make Makefile