Changeset 659 for sans/Dev


Ignore:
Timestamp:
Apr 5, 2010 9:32:38 AM (13 years ago)
Author:
srkline
Message:

Moved the NCNR_Package_Loader to a new NCNR_Igor_Procedures folder in the install packge. Changed the installer to put this file in the Igor Procedures, to be always available. Updated the FilesToRemove?.itx waves to include the new folder ad possible contents.

Location:
sans/Dev/trunk
Files:
2 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/FilesToRemove++.itx

    r631 r659  
    8282END 
    8383X SetScale/P x 0,1,"", UPFiles; SetScale y 0,0,"", UPFiles 
     84 
     85WAVES/T IgProcFolders 
     86BEGIN 
     87        "NCNR_Igor_Procedures" 
     88END 
     89X SetScale/P x 0,1,"", IgProcFolders; SetScale y 0,0,"", IgProcFolders 
     90 
     91WAVES/T IgProcFiles 
     92BEGIN 
     93        "NCNR_Package_Loader" 
     94END 
     95X SetScale/P x 0,1,"", IgProcFiles; SetScale y 0,0,"", IgProcFiles 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/NCNR_Install.ipf

    r644 r659  
    3333// -- now I need to search both locations to move old stuff out 
    3434// -- then install clean into the new user path (userPathStr) 
     35// 
     36// ** The NCNR_Package_Loader is now installed in the Igor Procedures folder so that the package can be loaded at any time 
     37//    improving compatibility with Jan Ilavsky's package 
    3538// 
    3639 
     
    289292        endfor 
    290293 
    291  
     294/////////////////// 
     295////// clean up the Igor Procedures (first the old path -- in the App folder, likely empty) 
     296        NewPath /Q/O IgProcPath, igorPathStr+"Igor Procedures:" 
     297        PathInfo IgProcPath 
     298        String IgProcPathStr = S_Path  
     299        strFileList = IndexedFile(IgProcPath, -1, "????" ) 
     300         
     301        //files first 
     302        Wave/T IgProcFiles=root:IgProcFiles 
     303        for (i=0; i<itemsInList(strFileList); i+=1) 
     304                tmpStr = StringFromList(i,strFileList) 
     305                isThere = CheckForMatch(tmpStr,IgProcFiles) 
     306                if(isThere) 
     307                        MoveFile/O/P=IgProcPath tmpStr as homePathStr+"NCNR_Moved_Files:"+tmpStr 
     308                        Print "Move file "+ tmpStr + " from Igor Procedures: "+IsMoveOK(V_flag) 
     309                endif 
     310        endfor 
     311         
     312        //then anything that shows up as a folder (don't bother with this) 
     313        Wave/T IgProcFolders=root:IgProcFolders 
     314         
     315        strFileList = IndexedDir(IgProcPath, -1, 0 ) 
     316        for (i=0; i<itemsInList(strFileList); i+=1) 
     317                tmpStr = StringFromList(i,strFileList) 
     318                isThere = CheckForMatch(tmpStr,IgProcFolders) 
     319                if(isThere) 
     320                        MoveFolder IgProcPathStr+tmpStr as homePathStr+"NCNR_Moved_Files:NCNR_Moved_Folders:"+tmpStr 
     321                        Print "Move folder "+ tmpStr + " from Igor Extensions: "+IsMoveOK(V_flag) 
     322                endif 
     323        endfor 
     324 
     325////// then clean up the Igor Procedures (now look in the User Path, by changing the definition of IgProcPath) 
     326        NewPath /Q/O IgProcPath, userPathStr+"Igor Procedures:" 
     327        PathInfo IgProcPath 
     328        IgProcPathStr = S_Path  
     329        strFileList = IndexedFile(IgProcPath, -1, "????" ) 
     330                 
     331        for (i=0; i<itemsInList(strFileList); i+=1) 
     332                tmpStr = StringFromList(i,strFileList) 
     333                isThere = CheckForMatch(tmpStr,IgProcFiles) 
     334                if(isThere) 
     335                        MoveFile/O/P=IgProcPath tmpStr as homePathStr+"NCNR_Moved_Files:"+tmpStr 
     336                        Print "Move file "+ tmpStr + " from Igor Procedures: "+IsMoveOK(V_flag) 
     337                endif 
     338        endfor 
     339 
     340        //then anything that shows up as a folder 
     341        strFileList = IndexedDir(IgProcPath, -1, 0 ) 
     342        for (i=0; i<itemsInList(strFileList); i+=1) 
     343                tmpStr = StringFromList(i,strFileList) 
     344                isThere = CheckForMatch(tmpStr,IgProcFolders) 
     345                if(isThere) 
     346                        MoveFolder IgProcPathStr+tmpStr as homePathStr+"NCNR_Moved_Files:NCNR_Moved_Folders:"+tmpStr 
     347                        Print "Move folder "+ tmpStr + " from Igor Extensions: "+IsMoveOK(V_flag) 
     348                endif 
     349        endfor 
     350 
     351////////////////////////////////////////////////////////////////////// 
     352         
    292353 
    293354// at this point all of the old stuff is cleaned up as best as I can 
     
    316377//      CreateAliasShortcut/O/P=SpecialPath "NCNR_Help_Files" as igorPathStr+"Igor Help Files:NCNR_Help_Files" 
    317378//      Print "Creating shortcut from NCNR_Help_Files into Igor Help Files: "+IsMoveOK(V_flag) 
    318          
     379 
     380// the Igor Procedures 
     381        MoveFolder/Z=1 homePathStr+"NCNR_Igor_Procedures" as IgProcPathStr+"NCNR_Igor_Procedures" 
     382        Print "*******Move folder NCNR_Igor_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag) 
    319383 
    320384// the User Procedures   
     
    696760end 
    697761 
    698 // this will "force" an install, even if there are R/W errors 
    699 Macro ForceInstall() 
    700  
    701         Execute "InstallNCNRMacros(1)" 
    702 end 
     762//// this will "force" an install, even if there are R/W errors 
     763//Macro ForceInstall() 
     764// 
     765//      Execute "InstallNCNRMacros(1)" 
     766//end 
Note: See TracChangeset for help on using the changeset viewer.