diff --git a/Jenkinsfile b/Jenkinsfile index 26534a4286..b1dce6866b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,7 @@ def runWinTests(String prefix = "") { SET \"PATH=C:\\PROGRA~1\\Microsoft^ MPI\\Bin;%PATH%\" SET \"MPI_HOME=C:\\PROGRA~1\\Microsoft^ MPI\\Bin\" SET \"PATH=C:\\Users\\jenkins\\Anaconda3;%PATH%\" - mingw32-make -j${env.PARALLEL} build + make -j${env.PARALLEL} build python ${prefix}runCmdStanTests.py -j${env.PARALLEL} src/test/interface """ } diff --git a/make/program b/make/program index e9814a588c..6ba68d4ea5 100644 --- a/make/program +++ b/make/program @@ -69,7 +69,7 @@ ifeq ($(OS),Windows_NT) ifeq (,$(findstring tbb.dll, $(notdir $(shell where tbb.dll)))) @echo 'Intel TBB is not in PATH.' @echo 'Consider calling ' - @echo '$(HELP_MAKE) install-tbb' + @echo '$(MAKE) install-tbb' @echo 'to avoid copying Intel TBB library files.' @if ! [[ -f "$(@D)/tbb.dll" ]]; then \ cp -v $(TBB_TARGETS) $(@D); \ diff --git a/makefile b/makefile index 8b8db577bb..9b504844e7 100644 --- a/makefile +++ b/makefile @@ -151,20 +151,13 @@ include make/command CMDSTAN_VERSION := 2.34.1 -ifeq ($(OS),Windows_NT) -HELP_MAKE=mingw32-make -else -HELP_MAKE=make -endif - - .PHONY: help help: @echo '--------------------------------------------------------------------------------' @echo 'CmdStan v$(CMDSTAN_VERSION) help' @echo '' @echo ' Build CmdStan utilities:' - @echo ' > $(HELP_MAKE) build' + @echo ' > $(MAKE) build' @echo '' @echo ' This target will:' @echo ' 1. Install the Stan compiler bin/stanc$(EXE) from stanc3 binaries.' @@ -175,13 +168,13 @@ help: @echo '' @echo ' Note: to build using multiple cores, use the -j option to make, e.g., ' @echo ' for 4 cores:' - @echo ' > $(HELP_MAKE) build -j4' + @echo ' > $(MAKE) build -j4' @echo '' ifeq ($(OS),Windows_NT) @echo ' On Windows it is recommended to include with the PATH environment' @echo ' variable the directory of the Intel TBB library.' @echo ' This can be setup permanently for the user with' - @echo ' > mingw32-make install-tbb' + @echo ' > make install-tbb' endif @echo '' @echo ' Build a Stan program:' @@ -212,7 +205,7 @@ endif @echo ' Example - bernoulli model: examples/bernoulli/bernoulli.stan' @echo '' @echo ' 1. Build the model:' - @echo ' > $(HELP_MAKE) examples/bernoulli/bernoulli$(EXE)' + @echo ' > $(MAKE) examples/bernoulli/bernoulli$(EXE)' @echo ' 2. Run the model:' @echo ' > examples/bernoulli/bernoulli$(EXE) sample data file=examples/bernoulli/bernoulli.data.R' @echo ' 3. Look at the samples:' @@ -269,7 +262,7 @@ ifeq ($(OS),Windows_NT) @echo 'NOTE: Please add $(TBB_BIN_ABSOLUTE_PATH) to your PATH variable.' @echo 'You may call' @echo '' - @echo '$(HELP_MAKE) install-tbb' + @echo '$(MAKE) install-tbb' @echo '' @echo 'to automatically update your user configuration.' endif diff --git a/runCmdStanTests.py b/runCmdStanTests.py index ef18645f28..4c7415bf5f 100755 --- a/runCmdStanTests.py +++ b/runCmdStanTests.py @@ -54,8 +54,6 @@ def mungeName(name): def doCommand(command): print('------------------------------------------------------------') - if isWin() and command.startswith('make '): - command = command.replace('make ', 'mingw32-make ') print('%s' % command) p1 = subprocess.Popen(command,shell=True) p1.wait()