Merge pull request #1853 from AllenInstitute/bugfix/1853-check-all-xo…

…ps-in-check-installation

CHI_CheckInstallation: Add checks for forgotten XOPs

Packages/MIES/MIES_CheckInstallation.ipf

@@ -244,12 +244,16 @@ Function CHI_CheckInstallation()
 	endif
 
 	CHI_CheckXOP(listOfXOPs, "itcxop2-64.xop", "ITC XOP", state)
-	CHI_CheckXOP(listOfXOPs, "JSON-64.xop", "JSON XOP", state)
 	CHI_CheckXOP(listOfXOPs, "VDT2-64.xop", "VDT2 XOP", state)
 	CHI_CheckXOP(listOfXOPs, "AxonTelegraph64.xop", "Axon Telegraph XOP", state)
 	CHI_CheckXOP(listOfXOPs, "MultiClamp700xCommander64.xop", "Multi Clamp Commander XOP", state)
+
+	// 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)
+	CHI_CheckXOP(listOfXOPs, "MiesUtils-64.xop", "MiesUtils XOP", state)
+	CHI_CheckXOP(listOfXOPs, "mies-nwb2-compound-XOP-64.xop", "NWBv2 compound XOP", state)
 
 	CHI_CheckJSONXOPVersion(state)
 	CHI_CheckITCXOPVersion(state)

Packages/tests/Basic/UTF_Basic.ipf

@@ -30,6 +30,7 @@
 #include "UTF_WaveBuilder"
 #include "UTF_WaveBuilderRegression"
 #include "UTF_WaveVersioning"
+#include "UTF_XOPsCompilation"
 #include "UTF_ZeroMQPublishing"
 
 // include examples here so that these are compile tested as well

Packages/tests/Basic/UTF_XOPsCompilation.ipf

@@ -0,0 +1,22 @@
+#pragma TextEncoding = "UTF-8"
+#pragma rtGlobals=3 // Use modern global access method and strict wave access.
+#pragma rtFunctionErrors=1
+#pragma ModuleName=XOPsCompilationTests
+
+static Function CheckCompilation_IGNORE()
+
+	// JSON
+	JSONXOP_Version
+
+	// ZeroMQ
+	print zeromq_test_serializeWave($"")
+
+	// TUF
+	TUFXOP_Version
+
+	// MiesUtils
+	print MU_RunningInMainThread()
+
+	// NWBv2 compound
+	IPNWB_WriteCompound ""
+End

tools/installer/installer.nsi

@@ -36,6 +36,7 @@
 !define IGORJSONXOPSOURCETEMPL "JSON-64.xop"
 !define IGORZEROMQXOPSOURCETEMPL "ZeroMQ-64.xop"
 !define IGORTUFXOPSOURCETEMPL "TUF-64.xop"
+!define IGORNWBXOPSOURCETEMPL "mies-nwb2-compound-XOP-64.xop"
 
 # Default paths for Igor Installation where the installer looks automatically
 !define IGOR9DEFPATH "$PROGRAMFILES64\WaveMetrics\Igor Pro 9 Folder"
@@ -83,6 +84,7 @@ Var IGORUTILSOURCETEMPL
 Var IGORJSONSOURCETEMPL
 Var IGORZEROMQSOURCETEMPL
 Var IGORTUFSOURCETEMPL
+Var IGORNWBSOURCETEMPL
 Var IGOREXTENSIONPATH
 
 #FindProc return value definitions
@@ -608,6 +610,11 @@ NoXOPInst__${CREALNKSID}:
       CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORTUFSOURCETEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL\$IGORTUFSOURCETEMPL"
       FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORTUFSOURCETEMPL.lnk$\n"
     ${EndIf}
+    StrLen $0 $IGORNWBSOURCETEMPL
+    ${If} $0 != 0
+      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORNWBSOURCETEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL\$IGORNWBSOURCETEMPL"
+      FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORNWBSOURCETEMPL.lnk$\n"
+    ${EndIf}
 
 ProcInst_${CREALNKSID}:
     CreateShortCut "$IGORBASEPATH\Igor Procedures\MIES_Include.lnk" "$INSTDIR\Packages\MIES_Include.ipf"
@@ -678,6 +685,7 @@ AdminCheckDone:
       StrCpy $IGORJSONSOURCETEMPL "${IGORJSONXOPSOURCETEMPL}"
       StrCpy $IGORZEROMQSOURCETEMPL "${IGORZEROMQXOPSOURCETEMPL}"
       StrCpy $IGORTUFSOURCETEMPL "${IGORTUFXOPSOURCETEMPL}"
+      StrCpy $IGORNWBSOURCETEMPL "${IGORNWBXOPSOURCETEMPL}"
       StrCpy $IGOREXTENSIONPATH "${IGOR64EXTENSIONPATH}"
       StrCpy $IGORBASEPATH "$DOCUMENTS\WaveMetrics\Igor Pro 9 User Files"
       CreateDirectory "$DOCUMENTS\WaveMetrics\Igor Pro 9 User Files"
@@ -690,6 +698,7 @@ InstallEnd964:
       StrCpy $IGORJSONSOURCETEMPL "${IGORJSONXOPSOURCETEMPL}"
       StrCpy $IGORZEROMQSOURCETEMPL "${IGORZEROMQXOPSOURCETEMPL}"
       StrCpy $IGORTUFSOURCETEMPL "${IGORTUFXOPSOURCETEMPL}"
+      StrCpy $IGORNWBSOURCETEMPL "${IGORNWBXOPSOURCETEMPL}"
       StrCpy $IGOREXTENSIONPATH "${IGOR64EXTENSIONPATH}"
       StrCpy $IGORBASEPATH "$DOCUMENTS\WaveMetrics\Igor Pro 10 User Files"
       CreateDirectory "$DOCUMENTS\WaveMetrics\Igor Pro 10 User Files"
@@ -705,6 +714,7 @@ InstallAllUser:
     StrCpy $IGORJSONSOURCETEMPL "${IGORJSONXOPSOURCETEMPL}"
     StrCpy $IGORZEROMQSOURCETEMPL "${IGORZEROMQXOPSOURCETEMPL}"
     StrCpy $IGORTUFSOURCETEMPL "${IGORTUFXOPSOURCETEMPL}"
+    StrCpy $IGORNWBSOURCETEMPL "${IGORNWBXOPSOURCETEMPL}"
     StrCpy $IGOREXTENSIONPATH "${IGOR64EXTENSIONPATH}"
     StrCpy $IGORBASEPATH $INSTALL_I9PATH
     !insertmacro CreateLinks
@@ -716,6 +726,7 @@ InstallAEnd964:
     StrCpy $IGORJSONSOURCETEMPL "${IGORJSONXOPSOURCETEMPL}"
     StrCpy $IGORZEROMQSOURCETEMPL "${IGORZEROMQXOPSOURCETEMPL}"
     StrCpy $IGORTUFSOURCETEMPL "${IGORTUFXOPSOURCETEMPL}"
+    StrCpy $IGORNWBSOURCETEMPL "${IGORNWBXOPSOURCETEMPL}"
     StrCpy $IGOREXTENSIONPATH "${IGOR64EXTENSIONPATH}"
     StrCpy $IGORBASEPATH $INSTALL_I10PATH
     !insertmacro CreateLinks