Changeset 1163


Ignore:
Timestamp:
Nov 10, 2021 2:55:59 PM (11 months ago)
Author:
ilavsky
Message:

New Installer, fix bioSAXS tools saving _sub data when NOT using liberal names.

Location:
trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Installers/GitHub/GHInstaller_main.ipf

    r1117 r1163  
    11#pragma TextEncoding = "UTF-8"          // For details execute DisplayHelpTopic "The TextEncoding Pragma"
    22#pragma rtGlobals=3             // Use modern global access method and strict wave access.
    3 #pragma version = 1.12
     3#pragma version = 1.13
    44#pragma IgorVersion = 8.03
    55
     
    88Strconstant ksNameOfPackages ="Irena, Nika, and Indra"
    99Strconstant ksWebAddressForConfFile ="https://raw.githubusercontent.com/jilavsky/SAXS_IgorCode/master/"
     10//archise are (2021-11-09):         https://github.com/jilavsky/SAXS_IgorCode/archive/refs/tags/October2021.zip
     11StrConstant ksWebAddressForMaster="https://github.com/jilavsky/SAXS_IgorCode/archive/refs/heads/master.zip"// - not used for now, may be if needed line 1357 in Support
    1012Strconstant ksNameOfConfFile ="IgorInstallerConfig.xml"
    1113strconstant strConstRecordwwwAddress="https://usaxs.xray.aps.anl.gov/staff/jan-ilavsky/IrenaNikaRecords/installrecord.php?"
    1214Strconstant NameOfInstallMessageFile ="InstallMessage.ifn"
    1315
    14 //1.12 fix GH links issue which was failing to loacate proper name for new folder.
     16//1.13 fix issue with Github renaming folders...
     17//1.12 fix issue with Giithub chanign location of zip files.            string InternalDataName = "SAXS_IgorCode"
    1518//1.11 critical upgrade, fix for bug in code which relies on bug in Igor behavior which will be fixed in Igor 8.05 and 9
    1619//1.10 adds ability to delete folders on desktop
     
    119122        Button SignUpNika,pos={390,290},size={200,18},proc=GHW_ButtonProc,title="Sign up for Nika mailing list"
    120123//
    121         DrawText 5,320,"Version 1.11 of Github Installer, JIL."
     124        DrawText 5,320,"Version 1.13 of Github Installer, JIL."
    122125        DrawText 5,335,"Please, check the web site for latest version before using."
    123126end
  • trunk/Installers/GitHub/GHInstaller_support.ipf

    r1117 r1163  
    44
    55
    6 //1.12 fix GH links issue which was failing to loacate proper name for new folder.
     6//1.12 fix issue with Giithub chanign location of zip files.            string InternalDataName = "SAXS_IgorCode"
    77//1.11 critical upgrade, fix for bug in code which relies on bug in Igor behavior which will be fixed in Igor 8.05 and 9
    88//1.08 added better messaging to user for failed installations
     
    217217        DrawText 94,101,"This may take a while"
    218218        SetDrawEnv fsize= 16,textrgb= (65535,0,0)
    219         DrawText 40,133,"This window will disapper when done"
     219        DrawText 40,133,"This window will disappear when done"
    220220        SetVariable UserMessage,pos={26.00,49.00},size={290.00,17.00},title="Info: "
    221221        SetVariable UserMessage,fSize=11,fStyle=1,valueColor=(65535,0,0)
     
    13561356                        WhichReleaseUserWants = 0                               //let's get any one of the addresses and remove the name of the zip file
    13571357                endif                                                                                           //then append repoName-master.zip and that is current version (SAXS_IgorCode-master.zip)
     1358                //or use ksWebAddressForMaster???
    13581359                LookHere = ListOfReleases[WhichReleaseUserWants][2]
    13591360                string URLtoGet=StringByKey("SourceFileAddress", LookHere  , "=",";")
    13601361                //need to build name of data inside the zip file...
    13611362                variable ItemsInPath=ItemsInList(URLtoGet,"/")
    1362                 //string InternalDataName = StringFromList(ItemsInPath-3, URLtoGet, "/")        //thsi fails now on GH changing zip file links
     1363                //string InternalDataName = StringFromList(ItemsInPath-3, URLtoGet, "/") - this breaks on GH chanign location of zip file
    13631364                string InternalDataName = "SAXS_IgorCode"
    13641365                if(stringmatch(SelectedReleaseName,"master"))
    13651366                        URLtoGet = RemoveListItem(ItemsInPath-1, URLtoGet, "/")+"master.zip"
     1367                        URLtoGet = ReplaceString("tags", URLtoGet, "heads")
    13661368                        InternalDataName =InternalDataName+"-master"
    13671369                else
  • trunk/User Procedures/Irena/IRB1_bioSAXS.ipf

    r1118 r1163  
    11#pragma TextEncoding = "UTF-8"
    22#pragma rtGlobals=3             // Use modern global access method and strict wave access.
    3 #pragma version=1.01
     3#pragma version=1.02
    44#pragma IgorVersion = 8.03
    55
     
    1717//
    1818//version summary
     19//1.02 fix bug in saving _sub data when names are not liberal names.
    1920//1.01 add handling of USAXS M_... waves
    2021//1.0 September2020 release
     
    13861387                                OutFldrNm = IN2G_removeExtraQuote(OutFldrNm,1,1) +"_sub'"
    13871388                else
    1388                                 OutFldrNm = OutFldrNm+"_sub'"
     1389                                OutFldrNm = OutFldrNm+"_sub"
    13891390                endif   
    13901391        endif
Note: See TracChangeset for help on using the changeset viewer.