Changeset 731 for branches

Show
Ignore:
Timestamp:
01/08/11 10:38:33 (17 months ago)
Author:
mgalloy
Message:

Merging changes from trunk into IDLDOC_3_3 branch. Also making tag for IDLDOC_3_3_1 release.

Location:
branches/IDLDOC_3_3
Files:
2 removed
12 modified
3 copied

Legend:

Unmodified
Added
Removed

  • branches/IDLDOC_3_3

    • Property svn:ignore

      •  

        old new  
        33.hg 
        44.hgignore 
         5idldoc-*.zip 
    • Property svn:mergeinfo set to /trunk:717-730

  • branches/IDLDOC_3_3/Makefile

    r716 r731  
    1 VERSION=3.3 
     1VERSION=3.3.1 
    22REVISION=-r`svn info | sed -n 's/Revision: \(.*\)/\1/p'` 
    33IDL=idl64 
    44 
    5 .PHONY: clean doc book regression tests version srcdist dist updates 
     5.PHONY: all clean doc book regression tests version srcdist dist updates 
     6 
     7 
     8all: 
     9        cd src; make all IDL=$(IDL) 
    610         
    711clean: 
     12        cd src; make clean 
    813        rm -f *.zip 
    914        rm -rf updates.idldev.com 
    … …  
    1217        rm -rf regression_test/*-docs 
    1318        rm -rf unit_tests/*-docs 
    14          
     19 
    1520doc: 
    1621        $(IDL) < idldoc_build_docs.pro 
    … …  
    2025        cd api-book; pdflatex -halt-on-error index.tex 
    2126        cd api-book; pdflatex -halt-on-error index.tex   
    22          
     27 
    2328regression: 
    2429        $(IDL) -e "mgunit, 'docrtalltests_uts'" 
    25          
     30 
    2631tests: 
    2732        $(IDL) -e "mgunit, 'docutalltests_uts'" 
    28          
     33 
    2934version: 
    3035        sed "s/version = '.*'/version = '$(VERSION)'/" < src/idldoc_version.pro | sed "s/revision = '.*'/revision = '$(REVISION)'/" > idldoc_version.pro 
    3136        mv idldoc_version.pro src/ 
    32          
     37 
    3338srcdist: 
    3439        make version 
    35   
     40 
    3641        rm -rf idldoc-$(VERSION)-src/ 
    3742        svn export . idldoc-$(VERSION)-src/ 
    … …  
    4348        zip -r idldoc-$(VERSION)-src.zip idldoc-$(VERSION)-src/* 
    4449        rm -rf idldoc-$(VERSION)-src 
    45          
     50 
    4651dist: 
    4752        make version 
    48          
     53 
    4954        rm -rf idldoc-$(VERSION)         
    5055        mkdir idldoc-$(VERSION) 
    51          
     56 
    5257        $(IDL) -IDL_STARTUP "" < idldoc_build.pro 
    5358        mv idldoc.sav idldoc-$(VERSION)/ 
    54          
     59 
    5560        cp COPYING idldoc-$(VERSION)/ 
    5661        cp CREDITS idldoc-$(VERSION)/ 
    5762        cp ISSUES idldoc-$(VERSION)/ 
    5863        cp RELEASE idldoc-$(VERSION)/ 
     64        cp INSTALL idldoc-$(VERSION)/ 
    5965 
    6066        cd docs; make 
    … …  
    6268        cp docs/idldoc-reference.pdf idldoc-$(VERSION)/docs/ 
    6369        cp docs/idldoc-tutorial.pdf idldoc-$(VERSION)/docs/ 
    64          
     70 
    6571        svn export src/templates idldoc-$(VERSION)/templates/ 
    6672        svn export src/resources idldoc-$(VERSION)/resources/ 
    67          
     73 
    6874        zip -r idldoc-$(VERSION).zip idldoc-$(VERSION)/* 
    6975        rm -rf idldoc-$(VERSION) 

  • branches/IDLDOC_3_3/project/steps-to-release.txt

    r619 r731  
    77#. Check off on each TODO in the code. 
    88 
    9 #. Set debug variable in IDLDOC routine to 0. 
    10  
    119#. Make sure all unit and regression tests pass.  
    1210 
    13 #. Update docs/RELEASE file. 
     11#. Update RELEASE file. Add release date under version number. 
    1412 
    1513#. Update version in Makefile. 
    … …  
    1715#. Do a "make dist". 
    1816 
     17#. Do a "make srcdist". 
     18 
    1919#. Commit changes to version. 
    2020 
    21 #. Copy trunk to tags in repository. Use tag of the format: IDLDOC_3_0. 
     21#. Copy trunk to tags in repository. Use tag of the format: IDLDOC_3_0. If it's a major version, start a new branch as well. Make sure to branch/tag externals as well and set svn:externals to point at the branch/tag of the externals. 
    2222 
    23 #. Upload .zip file to michaelgalloy.com and ittvis.com, announce release. 
     23#. Update version in Makefile to a "dev" version number. 
     24 
     25#. Upload .zip file to michaelgalloy.com. Announce release on michaelgalloy.com, idldoc.idldev.com, and the comp.idl-pvwave newsgroup. 

  • branches/IDLDOC_3_3/RELEASE

    r716 r731  
    11Release notes 
    22============= 
     3 
     4IDLdoc 3.3.1 
     5------------ 
     6*Released January 8, 2011* 
     7 
     8* Fixed memory leaks involved with computing complexity statistics and making 
     9  shortened comments for overview files. 
     10 
     11* Fix for bug where private/hidden items show up on categories page. 
     12 
    313 
    414IDLdoc 3.3 

  • branches/IDLDOC_3_3/src/doc_system__define.pro

    r670 r731  
    933933;       name to register the entry under 
    934934;    value : in, required, type=object 
    935 ;       tree object (i.e. directory, file, param) 
     935;       tree object, i.e., directory, file, param, etc. 
    936936;- 
    937937pro doc_system::createIndexEntry, name, value 
    … …  
    949949 
    950950  entries = self.index->get(/all, count=nEntries) 
    951      
     951 
     952  ; filter index for visible entries     
    952953  isVisibleEntries = bytarr(nEntries) 
    953954   
    … …  
    955956    isVisibleEntries[i] = entries[i].item->isVisible() 
    956957  endfor 
    957    
     958 
    958959  ind = where(isVisibleEntries, nVisibleEntries) 
    959960  self.index->remove, /all 
    960   if (nVisibleEntries gt 0) then begin 
    961     self.index->add, entries[ind] 
    962   endif 
     961  if (nVisibleEntries gt 0) then self.index->add, entries[ind] 
    963962end 
    964963 
    … …  
    967966; Return the items which begin with the given letter. 
    968967; 
    969 ; :Returns: objarr 
     968; :Returns:  
     969;    `objarr` 
     970; 
    970971; :Params: 
    971972;    letter : in, required, type=string 
    … …  
    996997pro doc_system::createCategoryEntry, name, item 
    997998  compile_opt strictarr, hidden 
     999   
     1000  if (~item->isVisible()) then return 
    9981001   
    9991002  lname = strlowcase(name) 

  • branches/IDLDOC_3_3/src/idldoc_version.pro

    r716 r731  
    1515  compile_opt strictarr, hidden 
    1616   
    17   version = '3.3' 
    18   revision = '-r713' 
     17  version = '3.3.1' 
     18  revision = '-r729' 
    1919   
    2020  return, version + (keyword_set(full) ? (' ' + revision) : '') 

  • branches/IDLDOC_3_3/src/tree/doctreeargument__define.pro

    r670 r731  
    119119        endif 
    120120         
    121         return, self.system->processComments(firstline)  
     121        return, self.system->processComments(self.firstline)  
    122122      end     
    123123     

  • branches/IDLDOC_3_3/src/tree/doctreedirectory__define.pro

    r671 r731  
    148148         
    149149        firstline = mg_tm_firstline(comments) 
    150          
    151         return, self.system->processComments(firstline)  
     150        text_firstline = self.system->processComments(firstline) 
     151        obj_destroy, firstline 
     152         
     153        return, text_firstline 
    152154      end  
    153155    'n_pro_files' : return, self.proFiles->count() 

  • branches/IDLDOC_3_3/src/tree/doctreefield__define.pro

    r670 r731  
    4848    'comments_first_line': begin 
    4949        if (~obj_valid(self.comments)) then return, '' 
     50         
    5051        firstline = mg_tm_firstline(self.comments) 
    51         return, self.system->processComments(firstline)  
     52        text_firstline = self.system->processComments(firstline) 
     53        obj_destroy, firstline 
     54         
     55        return, text_firstline 
    5256      end  
    5357               

  • branches/IDLDOC_3_3/src/tree/doctreeprofile__define.pro

    r682 r731  
    318318        endif 
    319319         
    320         self.firstline = mg_tm_firstline(self.comments) 
    321         return, self.system->processComments(self.firstline)         
     320        if (~obj_valid(self.firstline)) then begin 
     321          self.firstline = mg_tm_firstline(self.comments) 
     322        endif 
     323         
     324        return, self.system->processComments(self.firstline)       
    322325      end 
    323326    'plain_comments': return, self.system->processPlainComments(self.comments) 

  • branches/IDLDOC_3_3/src/tree/doctreeproperty__define.pro

    r670 r731  
    105105    'comments_first_line': begin 
    106106        if (~obj_valid(self.comments)) then return, '' 
     107         
    107108        firstline = mg_tm_firstline(self.comments) 
    108         return, self.system->processComments(firstline)  
     109        text_firstline = self.system->processComments(firstline) 
     110        obj_destroy, firstline 
     111         
     112        return, text_firstline 
    109113      end  
    110114     

  • branches/IDLDOC_3_3/src/util/doc_complexity.pro

    r617 r731  
    4848  endwhile 
    4949   
     50  obj_destroy, tokenizer 
    5051  return, complexity > 1 
    5152end