Changeset 1006 for sans/Dev

Timestamp:

Jul 29, 2016 4:07:16 PM (7 years ago)

Author:

srkline

Message:

changes to the installer to function properly with Igor 7 and the additional User extensions folder for 64 bit extensions.

Note that the 64 bit extension have not yet been compiled for Windows, although test versions have worked for the 64 bit Mac XOP.

Location:

sans/Dev/trunk

Files:

• NCNR_Extensions_64bit (added)
• NCNR_Extensions_64bit/Mac_XOP (added)
• NCNR_Extensions_64bit/Win_XOP (added)
• NCNR_Install_or_Update.pxp (modified) (previous)
• NCNR_User_Procedures/Common/Installer/NCNR_Install.ipf (modified) (8 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/NCNR_Install.ipf

@@ -18 +18 @@
 //InstallNCNRMacros() // run this function when experiment is loaded
 //InstallerPanel() // run this function when experiment is loaded
+
+// JULY 2016 -- updated for Igor 7
+// specifically the 64- bit version Extensions folder in the user folder is something new
+//
+//
+//
+
 
 //
@@ -90 +97 @@
                 isMac=1
         endif
-        
+
+        //check the 32-bit or 64-bit
+        String igorKindStr = StringByKey("IGORKIND", IgorInfo(0) )
+        Variable is64Bit = 0
+        if(strsearch(igorKindStr, "64", 0 ) != -1)
+                is64Bit = 1
+        endif
 
         String igorPathStr,homePathStr,userPathStr
@@ -110 +123 @@
 //////////////////////////////////////////////////////////////////////
         
+        
 ////// clean up the Igor Extensions (first the old path -- in the App folder)
-        NewPath /Q/O ExPath, igorPathStr+"Igor Extensions:"
+        String extFolderStr,NCNRExtFolder
+        if(is64Bit)
+                extFolderStr = "Igor Extensions (64-bit):"
+                NCNRExtFolder = "NCNR_Extensions_64bit"
+        else
+                extFolderStr = "Igor Extensions:"
+                NCNRExtFolder = "NCNR_Extensions"
+        endif
+        
+        NewPath /Q/O ExPath, igorPathStr+extFolderStr
         PathInfo ExPath
         String extPathStr = S_Path 
@@ -123 +146 @@
                 if(isThere)
                         MoveFile/O/P=ExPath tmpStr as homePathStr+"NCNR_Moved_Files:"+tmpStr+timeStamp
-                        Print "Move file "+ tmpStr + " from Igor Extensions: "+IsMoveOK(V_flag)
+                        Print "Move file "+ tmpStr + " from "+extFolderStr+IsMoveOK(V_flag)
                 endif
         endfor
@@ -136 +159 @@
                 if(isThere)
                         MoveFolder extPathStr+tmpStr as homePathStr+"NCNR_Moved_Files:NCNR_Moved_Folders:"+tmpStr+timeStamp
-                        Print "Move folder "+ tmpStr + " from Igor Extensions: "+IsMoveOK(V_flag)
+                        Print "Move folder "+ tmpStr + " from "+extFolderStr+IsMoveOK(V_flag)
                 endif
         endfor
 
 ////// then clean up the Igor Extensions (now look in the User Path, by changing the definition of ExPath)
-        NewPath /Q/O ExPath, userPathStr+"Igor Extensions:"
+        NewPath /Q/O ExPath, userPathStr+extFolderStr
         PathInfo ExPath
         extPathStr = S_Path 
@@ -151 +174 @@
                 if(isThere)
                         MoveFile/O/P=ExPath tmpStr as homePathStr+"NCNR_Moved_Files:"+tmpStr+timeStamp
-                        Print "Move file "+ tmpStr + " from Igor Extensions: "+IsMoveOK(V_flag)
+                        Print "Move file "+ tmpStr + " from "+extFolderStr+IsMoveOK(V_flag)
                 endif
         endfor
@@ -162 +185 @@
                 if(isThere)
                         MoveFolder extPathStr+tmpStr as homePathStr+"NCNR_Moved_Files:NCNR_Moved_Folders:"+tmpStr+timeStamp
-                        Print "Move folder "+ tmpStr + " from Igor Extensions: "+IsMoveOK(V_flag)
+                        Print "Move folder "+ tmpStr + " from "+extFolderStr+IsMoveOK(V_flag)
                 endif
         endfor
@@ -383 +406 @@
 // Igor Extensions, platform-specific
         if(isMac)
-                CopyFolder/Z=1 homePathStr+"NCNR_Extensions:Mac_XOP" as extPathStr+"NCNR_Extensions"
+                CopyFolder/Z=1 homePathStr+NCNRExtFolder+":Mac_XOP" as extPathStr+NCNRExtFolder
         else
-                CopyFolder/Z=1 homePathStr+"NCNR_Extensions:Win_XOP" as extPathStr+"NCNR_Extensions"
-        endif
-        Print "*******Copy folder NCNR_Extensions:xxx_XOP into User Special Folder, NO overwrite: "+IsMoveOK(V_flag)
+                CopyFolder/Z=1 homePathStr+NCNRExtFolder+":Win_XOP" as extPathStr+NCNRExtFolder
+        endif
+        Print "*******Copy folder "+NCNRExtFolder+":xxx_XOP into User Special Folder, NO overwrite: "+IsMoveOK(V_flag)
 //