Changeset 1006


Ignore:
Timestamp:
Jul 29, 2016 4:07:16 PM (6 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:
3 added
2 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/NCNR_Install.ipf

    r927 r1006  
    1818//InstallNCNRMacros() // run this function when experiment is loaded 
    1919//InstallerPanel() // run this function when experiment is loaded 
     20 
     21// JULY 2016 -- updated for Igor 7 
     22// specifically the 64- bit version Extensions folder in the user folder is something new 
     23// 
     24// 
     25// 
     26 
    2027 
    2128// 
     
    9097                isMac=1 
    9198        endif 
    92          
     99 
     100        //check the 32-bit or 64-bit 
     101        String igorKindStr = StringByKey("IGORKIND", IgorInfo(0) ) 
     102        Variable is64Bit = 0 
     103        if(strsearch(igorKindStr, "64", 0 ) != -1) 
     104                is64Bit = 1 
     105        endif 
    93106 
    94107        String igorPathStr,homePathStr,userPathStr 
     
    110123////////////////////////////////////////////////////////////////////// 
    111124         
     125         
    112126////// clean up the Igor Extensions (first the old path -- in the App folder) 
    113         NewPath /Q/O ExPath, igorPathStr+"Igor Extensions:" 
     127        String extFolderStr,NCNRExtFolder 
     128        if(is64Bit) 
     129                extFolderStr = "Igor Extensions (64-bit):" 
     130                NCNRExtFolder = "NCNR_Extensions_64bit" 
     131        else 
     132                extFolderStr = "Igor Extensions:" 
     133                NCNRExtFolder = "NCNR_Extensions" 
     134        endif 
     135         
     136        NewPath /Q/O ExPath, igorPathStr+extFolderStr 
    114137        PathInfo ExPath 
    115138        String extPathStr = S_Path  
     
    123146                if(isThere) 
    124147                        MoveFile/O/P=ExPath tmpStr as homePathStr+"NCNR_Moved_Files:"+tmpStr+timeStamp 
    125                         Print "Move file "+ tmpStr + " from Igor Extensions: "+IsMoveOK(V_flag) 
     148                        Print "Move file "+ tmpStr + " from "+extFolderStr+IsMoveOK(V_flag) 
    126149                endif 
    127150        endfor 
     
    136159                if(isThere) 
    137160                        MoveFolder extPathStr+tmpStr as homePathStr+"NCNR_Moved_Files:NCNR_Moved_Folders:"+tmpStr+timeStamp 
    138                         Print "Move folder "+ tmpStr + " from Igor Extensions: "+IsMoveOK(V_flag) 
     161                        Print "Move folder "+ tmpStr + " from "+extFolderStr+IsMoveOK(V_flag) 
    139162                endif 
    140163        endfor 
    141164 
    142165////// then clean up the Igor Extensions (now look in the User Path, by changing the definition of ExPath) 
    143         NewPath /Q/O ExPath, userPathStr+"Igor Extensions:" 
     166        NewPath /Q/O ExPath, userPathStr+extFolderStr 
    144167        PathInfo ExPath 
    145168        extPathStr = S_Path  
     
    151174                if(isThere) 
    152175                        MoveFile/O/P=ExPath tmpStr as homePathStr+"NCNR_Moved_Files:"+tmpStr+timeStamp 
    153                         Print "Move file "+ tmpStr + " from Igor Extensions: "+IsMoveOK(V_flag) 
     176                        Print "Move file "+ tmpStr + " from "+extFolderStr+IsMoveOK(V_flag) 
    154177                endif 
    155178        endfor 
     
    162185                if(isThere) 
    163186                        MoveFolder extPathStr+tmpStr as homePathStr+"NCNR_Moved_Files:NCNR_Moved_Folders:"+tmpStr+timeStamp 
    164                         Print "Move folder "+ tmpStr + " from Igor Extensions: "+IsMoveOK(V_flag) 
     187                        Print "Move folder "+ tmpStr + " from "+extFolderStr+IsMoveOK(V_flag) 
    165188                endif 
    166189        endfor 
     
    383406// Igor Extensions, platform-specific 
    384407        if(isMac) 
    385                 CopyFolder/Z=1 homePathStr+"NCNR_Extensions:Mac_XOP" as extPathStr+"NCNR_Extensions" 
     408                CopyFolder/Z=1 homePathStr+NCNRExtFolder+":Mac_XOP" as extPathStr+NCNRExtFolder 
    386409        else 
    387                 CopyFolder/Z=1 homePathStr+"NCNR_Extensions:Win_XOP" as extPathStr+"NCNR_Extensions" 
    388         endif 
    389         Print "*******Copy folder NCNR_Extensions:xxx_XOP into User Special Folder, NO overwrite: "+IsMoveOK(V_flag) 
     410                CopyFolder/Z=1 homePathStr+NCNRExtFolder+":Win_XOP" as extPathStr+NCNRExtFolder 
     411        endif 
     412        Print "*******Copy folder "+NCNRExtFolder+":xxx_XOP into User Special Folder, NO overwrite: "+IsMoveOK(V_flag) 
    390413//       
    391414 
Note: See TracChangeset for help on using the changeset viewer.