Various installer bugfixes

.editorconfig

@@ -14,7 +14,7 @@ charset = utf-8
 indent_style = tab
 indent_size = 4
 
-[*.{bat,vcproj,vcxproj,sln,vbs,rc}]
+[*.{bat,vcproj,vcxproj,sln,vbs,rc,nsi}]
 end_of_line = crlf
 
 [LICENSE]

.gitattributes

@@ -37,7 +37,7 @@ CODEOWNERS              export-ignore
 ctags.cnf               export-ignore
 .editorconfig           export-ignore
 Packages/Artwork        export-ignore
-XOPs-MacOSX-IP9-64bit   export-ignore
+XOPs-MacOSX-64bit       export-ignore
 
 *.dot !diff
 
@@ -65,3 +65,5 @@ Packages/doc/** linguist-documentation
 tools/installer/nsis/** linguist-vendored
 tools/installer/Shelllink/** linguist-vendored
 tools/installer/AccessControl/** linguist-vendored
+
+PkgInfo -diff

.github/workflows/test-igor-rebase-exec-workflow.yml

@@ -4,7 +4,7 @@ env:
   # if this environment variable is set it will use the igor version from
   # C:\Program Files\WaveMetrics\Igor Pro ${VERSION} Folder\IgorBinaries_x64_${CI_IGOR${VERSION}_REVISION}
   CI_IGOR9_REVISION: "r56565"
-  CI_IGOR10_REVISION: "r29756"
+  CI_IGOR10_REVISION: "r29764"
 on:
   workflow_call:
     inputs:

.github/workflows/test-igor-workflow.yml

@@ -4,7 +4,7 @@ env:
   # if this environment variable is set it will use the igor version from
   # C:\Program Files\WaveMetrics\Igor Pro ${VERSION} Folder\IgorBinaries_x64_${CI_IGOR${VERSION}_REVISION}
   CI_IGOR9_REVISION: "r56565"
-  CI_IGOR10_REVISION: "r29756"
+  CI_IGOR10_REVISION: "r29764"
 on:
   workflow_call:
     inputs:

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ exclude: |
            .*patch$|
            .*svg$|
            # don't touch MacOSX XOPs
-           ^XOPs-MacOSX-IP9-64bit|
+           ^XOPs-MacOSX-64bit|
            ^Packages/ITCXOP2/tools/Disable-ASLR-for-Igor64.ps1
          ) # end alternations
 repos:

Packages/MIES_Include.ipf

@@ -20,15 +20,15 @@
 // They are defined here so that we can parse them from within IP.
 //
 // .. |IgorPro9WindowsNightly| replace:: `Igor Pro 9 (Windows) <https://www.byte-physics.de/Downloads/WinIgor9_01Dec2023.zip>`__
-// .. |IgorPro10WindowsNightly| replace:: `Igor Pro 10 (Windows) <https://www.wavemetrics.net/Downloads/latest10/>`__
+// .. |IgorPro10WindowsNightly| replace:: `Igor Pro 10 (Windows) <https://www.byte-physics.de/Downloads/setupIgor10-r29764.exe>`__
 // .. |IgorPro9MacOSXNightly| replace:: `Igor Pro 9 (MacOSX) <https://www.byte-physics.de/Downloads/MacIgor9_01Dec2023.dmg>`__
 
 #pragma IgorVersion = 9.00
 
 ///@cond HIDDEN_SYMBOL
 #if IgorVersion() < 10 && (NumberByKey("BUILD", IgorInfo(0)) < 56565)
 #define TOO_OLD_IGOR
-#elif IgorVersion() == 10 && (NumberByKey("BUILD", IgorInfo(0)) < 29756)
+#elif IgorVersion() == 10 && (NumberByKey("BUILD", IgorInfo(0)) < 29764)
 #define TOO_OLD_IGOR
 #endif
 
@@ -76,10 +76,6 @@ static Function/S GetDownloadLink()
 	FATAL_ERROR("Unsupported OS")
 #endif
 
-	if(cmpstr(igorMajorVersion, "9"))
-		Abort "Download for Igor Pro 10 is not yet supported.\r Please manually download the nightly build from the documentation link."
-	endif
-
 	text         = ProcedureText("", 0, "MIES_Include.ipf")
 	lineWithLink = GrepList(text, "\\Q|IgorPro" + igorMajorVersion + os + "Nightly|\\E", 0, "\r")
 	SplitString/E=".*<(.*)>.*" lineWithLink, url

Packages/doc/installation.rst

@@ -29,18 +29,15 @@ and a dialog appears with a button which opens this documentation.
 
 In that case please perform the following steps:
 
-- Download the package for |IgorPro9WindowsNightly| or |IgorPro9MacOSXNightly|.
+- Download the package for |IgorPro9WindowsNightly|, |IgorPro10WindowsNightly| or |IgorPro9MacOSXNightly|.
   Either from within Igor Pro or from a web browser.
 - Close Igor Pro
-- Windows: Replace the folders ``IgorBinaries_x64`` and ``IgorBinaries_Win32``
-           in ``C:\Program Files\WaveMetrics\Igor Pro 9`` with the ones from the
-           downloaded zip package. This requires admin access.
+- Windows:
+  - Igor Pro 9: Replace the folders ``IgorBinaries_x64`` and ``IgorBinaries_Win32`` in ``C:\Program Files\WaveMetrics\Igor Pro 9`` with the ones from the downloaded zip package. This requires admin access.
+  - Igor Pro 10: Install as usual
 - MacOSX: Install from image as usual
 - Restart Igor Pro
 
-For Igor Pro 10, download the installer for |IgorPro10WindowsNightly|. This requires access to the beta
-program of WaveMetrics.
-
 Installation using the installer (preferred)
 --------------------------------------------
 
@@ -195,16 +192,24 @@ Windows (with hardware support)
    <https://github.com/AllenInstitute/MIES/blob/main/tools/installer/vc_redist.x64.exe>`__
 -  Quit Igor Pro. If you have never opened it, open it once and then close it.
 -  Get the MIES source code and initialize the repo, see :ref:`getting MIES`
--  Create the following shortcuts in ``C:\Users\$username\Documents\WaveMetrics\Igor Pro 9 User Files``
+-  Create the following shortcuts in ``C:\Users\$username\Documents\WaveMetrics\Igor Pro XXX User Files``
+   where ``XXX`` is either ``9`` or ``10``:
 
    -  In ``User Procedures`` a shortcut pointing to
 
       -  ``Packages\IPNWB``
       -  ``Packages\MIES``
 
    -  In ``Igor Procedures`` a shortcut pointing to ``Packages\MIES_Include.ipf``
-   -  In ``Igor Extensions (64-bit)`` a shortcut pointing to ``XOPs-IP9-64bit``
-   -  In ``Igor Help Files`` a shortcut pointing to ``HelpFiles-IP9``
+   -  In ``Igor Extensions (64-bit)`` a shortcut pointing to
+
+      - ``XOPs-IPXXX-64bit``
+      - ``XOPs-64bit``
+
+   -  In ``Igor Help Files`` a shortcut pointing to
+
+      - ``HelpFiles-IPXXX``
+      - ``HelpFiles``
 
 -  ITC hardware:
 
@@ -239,8 +244,8 @@ require, you can also install MIES without any hardware related XOPs present.
 -  Install the `Visual C++ Redistributable package <https://github.com/AllenInstitute/MIES/blob/main/tools/installer/vc_redist.x64.exe>`__
 -  Quit Igor Pro
 -  Get the MIES source code, see :ref:`getting MIES`
--  Create the following shortcuts in
-   ``C:\Users\$username\Documents\WaveMetrics\Igor Pro 9 User Files``
+-  Create the following shortcuts in ``C:\Users\$username\Documents\WaveMetrics\Igor Pro XXX User Files``
+   where ``XXX`` is either ``9`` or ``10``:
 
    -  In ``User Procedures`` a shortcut pointing to
 
@@ -251,13 +256,13 @@ require, you can also install MIES without any hardware related XOPs present.
 
    -  In ``Igor Extensions (64-bit)`` a shortcut pointing to
 
-      -  ``XOPs-IP9-64bit\JSON-64.xop``
-      -  ``XOPs-IP9-64bit\MIESUtils-64.xop``
-      -  ``XOPs-IP9-64bit\ZeroMQ-64.xop``
-      -  ``XOPs-IP9-64bit\TUFXOP-64.xop``
-      -  ``XOPs-IP9-64bit\mies-nwb2-compound-XOP-64.xop``
+      -  ``XOPs-64bit\JSON-64.xop``
+      -  ``XOPs-64bit\MIESUtils-64.xop``
+      -  ``XOPs-64bit\ZeroMQ-64.xop``
+      -  ``XOPs-64bit\TUFXOP-64.xop``
+      -  ``XOPs-64bit\mies-nwb2-compound-XOP-64.xop``
 
-   -  In ``Igor Help Files`` a shortcut pointing to HelpFiles-IP9
+   -  In ``Igor Help Files`` a shortcut pointing to ``HelpFiles``
 
 -  Start Igor Pro
 
@@ -280,9 +285,9 @@ Analysis support only. Data acquisition and NWBv2 export are not supported on Ma
 
    -  In ``Igor Extensions (64-bit)`` a symlink pointing to
 
-      -  ``XOPs-MacOSX-IP9-64bit``
+      -  ``XOPs-MacOSX-64bit``
 
-   -  In ``Igor Help Files`` a shortcut pointing to HelpFiles-IP9
+   -  In ``Igor Help Files`` a shortcut pointing to ``HelpFiles``
 
 -  Start Igor Pro
 

tools/installer/installer.nsi

@@ -26,10 +26,11 @@
 !define IGOR64EXTENSIONPATH "Igor Extensions (64-bit)"
 # Endings for Helpfiles
 !define IGOR9DIRTEMPL "IP9"
-!define IGOR10DIRTEMPL "IP9"
+!define IGOR10DIRTEMPL "IP10"
 # source folder name for installation with XOPs
+!define IGORCOMMONXOPSOURCETEMPL "XOPs-64bit"
 !define IGOR964XOPSOURCETEMPL "XOPs-IP9-64bit"
-!define IGOR1064XOPSOURCETEMPL "XOPs-IP9-64bit"
+!define IGOR1064XOPSOURCETEMPL "XOPs-IP10-64bit"
 
 # source file names for XOPs for installation without Hardware XOPs
 !define IGORUTILXOPSOURCETEMPL "MIESUtils-64.xop"
@@ -100,6 +101,7 @@ Var ISADMIN
 
 Var IGORDIRTEMPL
 Var IGORBITDIRTEMPL
+Var IGORBITCOMMONDIRTEMPL
 Var IGORUTILSOURCETEMPL
 Var IGORJSONSOURCETEMPL
 Var IGORZEROMQSOURCETEMPL
@@ -643,7 +645,13 @@ CLTDone_${CLTID}:
 !define CREALNKSID ${__LINE__}
   !insertmacro CreateIgorDirs
   IntCmp $XOPINST 0 NoXOPInst__${CREALNKSID}
-# All MIES XOPs linked by complete folder
+    # All MIES XOPs linked by complete folder
+
+    # common XOPs
+    CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORBITCOMMONDIRTEMPL.lnk" "$INSTDIR\$IGORBITCOMMONDIRTEMPL"
+    FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORBITCOMMONDIRTEMPL.lnk$\n"
+
+    # version specific XOPs
     CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORBITDIRTEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL"
     FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORBITDIRTEMPL.lnk$\n"
 
@@ -652,27 +660,27 @@ NoXOPInst__${CREALNKSID}:
 # Link XOP files directly that are not Hardware XOPs
     StrLen $0 $IGORUTILSOURCETEMPL
     ${If} $0 != 0
-      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORUTILSOURCETEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL\$IGORUTILSOURCETEMPL"
+      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORUTILSOURCETEMPL.lnk" "$INSTDIR\$IGORBITCOMMONDIRTEMPL\$IGORUTILSOURCETEMPL"
       FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORUTILSOURCETEMPL.lnk$\n"
     ${EndIf}
     StrLen $0 $IGORJSONSOURCETEMPL
     ${If} $0 != 0
-      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORJSONSOURCETEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL\$IGORJSONSOURCETEMPL"
+      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORJSONSOURCETEMPL.lnk" "$INSTDIR\$IGORBITCOMMONDIRTEMPL\$IGORJSONSOURCETEMPL"
       FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORJSONSOURCETEMPL.lnk$\n"
     ${EndIf}
     StrLen $0 $IGORZEROMQSOURCETEMPL
     ${If} $0 != 0
-      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORZEROMQSOURCETEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL\$IGORZEROMQSOURCETEMPL"
+      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORZEROMQSOURCETEMPL.lnk" "$INSTDIR\$IGORBITCOMMONDIRTEMPL\$IGORZEROMQSOURCETEMPL"
       FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORZEROMQSOURCETEMPL.lnk$\n"
     ${EndIf}
     StrLen $0 $IGORTUFSOURCETEMPL
     ${If} $0 != 0
-      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORTUFSOURCETEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL\$IGORTUFSOURCETEMPL"
+      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORTUFSOURCETEMPL.lnk" "$INSTDIR\$IGORBITCOMMONDIRTEMPL\$IGORTUFSOURCETEMPL"
       FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORTUFSOURCETEMPL.lnk$\n"
     ${EndIf}
     StrLen $0 $IGORNWBSOURCETEMPL
     ${If} $0 != 0
-      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORNWBSOURCETEMPL.lnk" "$INSTDIR\$IGORBITDIRTEMPL\$IGORNWBSOURCETEMPL"
+      CreateShortCut "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORNWBSOURCETEMPL.lnk" "$INSTDIR\$IGORBITCOMMONDIRTEMPL\$IGORNWBSOURCETEMPL"
       FileWrite $FILEHANDLE "$IGORBASEPATH\$IGOREXTENSIONPATH\$IGORNWBSOURCETEMPL.lnk$\n"
     ${EndIf}
 
@@ -688,6 +696,9 @@ ProcInst_${CREALNKSID}:
     CreateShortCut "$IGORBASEPATH\Igor Help Files\HelpFiles-$IGORDIRTEMPL.lnk" "$INSTDIR\HelpFiles-$IGORDIRTEMPL"
     FileWrite $FILEHANDLE "$IGORBASEPATH\Igor Help Files\HelpFiles-$IGORDIRTEMPL.lnk$\n"
 
+    CreateShortCut "$IGORBASEPATH\Igor Help Files\HelpFiles.lnk" "$INSTDIR\HelpFiles"
+    FileWrite $FILEHANDLE "$IGORBASEPATH\Igor Help Files\HelpFiles.lnk$\n"
+
 !undef CREALNKSID
 !macroend
 
@@ -740,6 +751,7 @@ AdminCheckDone:
     IntCmp $INSTALL_I964 0 InstallEnd964
       StrCpy $IGORDIRTEMPL "${IGOR9DIRTEMPL}"
       StrCpy $IGORBITDIRTEMPL "${IGOR964XOPSOURCETEMPL}"
+      StrCpy $IGORBITCOMMONDIRTEMPL "${IGORCOMMONXOPSOURCETEMPL}"
       StrCpy $IGORUTILSOURCETEMPL "${IGORUTILXOPSOURCETEMPL}"
       StrCpy $IGORJSONSOURCETEMPL "${IGORJSONXOPSOURCETEMPL}"
       StrCpy $IGORZEROMQSOURCETEMPL "${IGORZEROMQXOPSOURCETEMPL}"
@@ -753,6 +765,7 @@ InstallEnd964:
     IntCmp $INSTALL_I1064 0 InstallEnd1064
       StrCpy $IGORDIRTEMPL "${IGOR10DIRTEMPL}"
       StrCpy $IGORBITDIRTEMPL "${IGOR1064XOPSOURCETEMPL}"
+      StrCpy $IGORBITCOMMONDIRTEMPL "${IGORCOMMONXOPSOURCETEMPL}"
       StrCpy $IGORUTILSOURCETEMPL "${IGORUTILXOPSOURCETEMPL}"
       StrCpy $IGORJSONSOURCETEMPL "${IGORJSONXOPSOURCETEMPL}"
       StrCpy $IGORZEROMQSOURCETEMPL "${IGORZEROMQXOPSOURCETEMPL}"
@@ -769,6 +782,7 @@ InstallAllUser:
   IntCmp $INSTALL_I964 0 InstallAEnd964
     StrCpy $IGORDIRTEMPL "${IGOR9DIRTEMPL}"
     StrCpy $IGORBITDIRTEMPL "${IGOR964XOPSOURCETEMPL}"
+    StrCpy $IGORBITCOMMONDIRTEMPL "${IGORCOMMONXOPSOURCETEMPL}"
     StrCpy $IGORUTILSOURCETEMPL "${IGORUTILXOPSOURCETEMPL}"
     StrCpy $IGORJSONSOURCETEMPL "${IGORJSONXOPSOURCETEMPL}"
     StrCpy $IGORZEROMQSOURCETEMPL "${IGORZEROMQXOPSOURCETEMPL}"
@@ -781,6 +795,7 @@ InstallAEnd964:
   IntCmp $INSTALL_I1064 0 InstallAEnd1064
     StrCpy $IGORDIRTEMPL "${IGOR10DIRTEMPL}"
     StrCpy $IGORBITDIRTEMPL "${IGOR1064XOPSOURCETEMPL}"
+    StrCpy $IGORBITCOMMONDIRTEMPL "${IGORCOMMONXOPSOURCETEMPL}"
     StrCpy $IGORUTILSOURCETEMPL "${IGORUTILXOPSOURCETEMPL}"
     StrCpy $IGORJSONSOURCETEMPL "${IGORJSONXOPSOURCETEMPL}"
     StrCpy $IGORZEROMQSOURCETEMPL "${IGORZEROMQXOPSOURCETEMPL}"

tools/installer/nsis/COPYING

@@ -1,7 +1,7 @@
 COPYRIGHT
 ---------
 
-Copyright (C) 1999-2023 Contributors
+Copyright (C) 1999-2025 Contributors
 
 More detailed copyright information can be found in the individual source code files.
 

tools/installer/nsis/Contrib/Language files/Belarusian.nlf

@@ -147,15 +147,15 @@ Nullsoft Install System %s
 # ^DeleteOnReboot
 "Выдаленне пасля перазапуску камп'ютара: "
 # ^ErrorCreatingShortcut
-"Памылка стварэння ярлыка: " 
+"Памылка стварэння ярлыка: "
 # ^ErrorCreating
 "Памылка стварэння: "
 # ^ErrorDecompressing
 Немагчыма выцягнуць дадзеныя. Магчыма пашкоджаны дыстрыбутыў.
 # ^ErrorRegistering
 Немагчыма зарэгістраваць бібліятэку (DLL)
 # ^ExecShell
-"Выкананне каманды абалонкі: " 
+"Выкананне каманды абалонкі: "
 # ^Exec
 "Выкананне: "
 # ^Extract
@@ -165,7 +165,7 @@ Nullsoft Install System %s
 # ^InvalidOpcode
 дыстрыбутыў пашкоджаны: код памылкi
 # ^NoOLE
-"Няма OLE для: " 
+"Няма OLE для: "
 # ^OutputFolder
 "Папка усталявання: "
 # ^RemoveFolder