Skip to content

Commit

Permalink
CHI_CheckInstallation: Add preliminary support for MacOSX
Browse files Browse the repository at this point in the history
This avoids to check for XOPs which never exist. Some checks still fail as
XOPs are folders on MacOSX but files on Windows.

Also the versions of the XOPs are not correct.
  • Loading branch information
t-b committed Aug 25, 2023
1 parent 7f772b2 commit 7165a4d
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions Packages/MIES/MIES_CheckInstallation.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -243,30 +243,39 @@ Function CHI_CheckInstallation()
printf "Mies version info: Valid \"%s...\" (Nice!)\r", StringFromList(0, miesVersion, "\r")
endif

#ifdef WINDOWS
CHI_CheckXOP(listOfXOPs, "itcxop2-64.xop", "ITC XOP", state)
CHI_CheckXOP(listOfXOPs, "AxonTelegraph64.xop", "Axon Telegraph XOP", state)
CHI_CheckXOP(listOfXOPs, "MultiClamp700xCommander64.xop", "Multi Clamp Commander XOP", state)
#endif

// one operation/function of each non-hardware XOP needs to be called in CheckCompilation_IGNORE()
CHI_CheckXOP(listOfXOPs, "JSON-64.xop", "JSON XOP", state)
CHI_CheckXOP(listOfXOPs, "ZeroMQ-64.xop", "ZeroMQ XOP", state)
CHI_CheckXOP(listOfXOPs, "TUF-64.xop", "TUF XOP", state)

#ifdef WINDOWS
CHI_CheckXOP(listOfXOPs, "MiesUtils-64.xop", "MiesUtils XOP", state)
CHI_CheckXOP(listOfXOPs, "mies-nwb2-compound-XOP-64.xop", "NWBv2 compound XOP", state)
#endif

CHI_CheckJSONXOPVersion(state)
#ifdef WINDOWS
CHI_CheckITCXOPVersion(state)
#endif
CHI_CheckTUFXOPVersion(state)

printf "Results: %d checks, %d number of errors\r", state.numTries, state.numErrors

#ifdef WINDOWS
STRUCT CHI_InstallationState stateExtended
CHI_InitInstallationState(stateExtended)
printf "\rChecking extended installation:\r"

CHI_CheckXOP(listOfXOPs, "NIDAQmx64.xop", "NI-DAQ MX XOP", stateExtended, expectedHash = CHI_NIDAQ_XOP_64_HASH)

printf "Results: %d checks, %d number of errors\r", stateExtended.numTries, stateExtended.numErrors
#endif
ControlWindowToFront()

return state.numErrors
Expand Down

0 comments on commit 7165a4d

Please sign in to comment.