Changeset 4670 for branches


Ignore:
Timestamp:
Nov 9, 2014 12:05:23 AM (9 years ago)
Author:
ldelgass
Message:

merge r4668:4669 from trunk

Location:
branches/1.3
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/1.3

  • branches/1.3/configure

    r4522 r4670  
    672672OCTAVE_VERSION_MAJOR
    673673OCTAVE_VERSION
     674SVN_URL
    674675SVN_VERSION
    675676MKOCTFILE3
    … …  
    72977298
    72987299SVN_VERSION=`svnversion $srcdir | sed 's/Unversioned directory/unknown/'`
     7300SVN_URL=`svn info $srcdir | sed -ne 's/^URL: //p'`
    72997301
    73007302make_command=""
    … …  
    1013510137
    1013610138MAKE=${make_command}
     10139
    1013710140
    1013810141

  • branches/1.3/configure.in

    r4522 r4670  
    108108
    109109SVN_VERSION=`svnversion $srcdir | sed 's/Unversioned directory/unknown/'`
     110SVN_URL=`svn info $srcdir | sed -ne 's/^URL: //p'`
    110111
    111112make_command=""
    … …  
    401402AC_SUBST(MKOCTFILE3)
    402403AC_SUBST(SVN_VERSION)
     404AC_SUBST(SVN_URL)
    403405AC_SUBST(OCTAVE_VERSION)
    404406AC_SUBST(OCTAVE_VERSION_MAJOR)

  • branches/1.3/gui/scripts/flowvisviewer.tcl

    r4557 r4670  
    884884                set session $env(SESSION)
    885885            }
     886            lappend info "version" "$Rappture::version"
     887            lappend info "build" "$Rappture::build"
     888            lappend info "svnurl" "$Rappture::svnurl"
     889            lappend info "installdir" "$Rappture::installdir"
    886890            lappend info "hub" [exec hostname]
    887891            lappend info "client" "flowvisviewer"

  • branches/1.3/gui/scripts/molvisviewer.tcl

    r4439 r4670  
    691691                set session $env(SESSION)
    692692            }
     693            lappend info "version" "$Rappture::version"
     694            lappend info "build" "$Rappture::build"
     695            lappend info "svnurl" "$Rappture::svnurl"
     696            lappend info "installdir" "$Rappture::installdir"
    693697            lappend info "hub" [exec hostname]
    694698            lappend info "client" "molvisviewer"

  • branches/1.3/gui/scripts/nanovisviewer.tcl

    r4664 r4670  
    676676                set session $env(SESSION)
    677677            }
     678            lappend info "version" "$Rappture::version"
     679            lappend info "build" "$Rappture::build"
     680            lappend info "svnurl" "$Rappture::svnurl"
     681            lappend info "installdir" "$Rappture::installdir"
    678682            lappend info "hub" [exec hostname]
    679683            lappend info "client" "nanovisviewer"

  • branches/1.3/gui/scripts/vtkglyphviewer.tcl

    r4481 r4670  
    775775                set session $env(SESSION)
    776776            }
     777            lappend info "version" "$Rappture::version"
     778            lappend info "build" "$Rappture::build"
     779            lappend info "svnurl" "$Rappture::svnurl"
     780            lappend info "installdir" "$Rappture::installdir"
    777781            lappend info "hub" [exec hostname]
    778782            lappend info "client" "vtkglyphviewer"

  • branches/1.3/gui/scripts/vtkheightmapviewer.tcl

    r4533 r4670  
    767767                set session $env(SESSION)
    768768            }
     769            lappend info "version" "$Rappture::version"
     770            lappend info "build" "$Rappture::build"
     771            lappend info "svnurl" "$Rappture::svnurl"
     772            lappend info "installdir" "$Rappture::installdir"
    769773            lappend info "hub" [exec hostname]
    770774            lappend info "client" "vtkheightmapviewer"

  • branches/1.3/gui/scripts/vtkimageviewer.tcl

    r4512 r4670  
    755755                set session $env(SESSION)
    756756            }
     757            lappend info "version" "$Rappture::version"
     758            lappend info "build" "$Rappture::build"
     759            lappend info "svnurl" "$Rappture::svnurl"
     760            lappend info "installdir" "$Rappture::installdir"
    757761            lappend info "hub" [exec hostname]
    758762            lappend info "client" "vtkimageviewer"

  • branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

    r4652 r4670  
    823823                set session $env(SESSION)
    824824            }
     825            lappend info "version" "$Rappture::version"
     826            lappend info "build" "$Rappture::build"
     827            lappend info "svnurl" "$Rappture::svnurl"
     828            lappend info "installdir" "$Rappture::installdir"
    825829            lappend info "hub" [exec hostname]
    826830            lappend info "client" "vtkisosurfaceviewer"

  • branches/1.3/gui/scripts/vtkmeshviewer.tcl

    r4534 r4670  
    678678                set session $env(SESSION)
    679679            }
     680            lappend info "version" "$Rappture::version"
     681            lappend info "build" "$Rappture::build"
     682            lappend info "svnurl" "$Rappture::svnurl"
     683            lappend info "installdir" "$Rappture::installdir"
    680684            lappend info "hub" [exec hostname]
    681685            lappend info "client" "vtkmeshviewer"

  • branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl

    r4460 r4670  
    799799                set session $env(SESSION)
    800800            }
     801            lappend info "version" "$Rappture::version"
     802            lappend info "build" "$Rappture::build"
     803            lappend info "svnurl" "$Rappture::svnurl"
     804            lappend info "installdir" "$Rappture::installdir"
    801805            lappend info "hub" [exec hostname]
    802806            lappend info "client" "vtkstreamlinesviewer"

  • branches/1.3/gui/scripts/vtksurfaceviewer.tcl

    r4538 r4670  
    732732                set session $env(SESSION)
    733733            }
     734            lappend info "version" "$Rappture::version"
     735            lappend info "build" "$Rappture::build"
     736            lappend info "svnurl" "$Rappture::svnurl"
     737            lappend info "installdir" "$Rappture::installdir"
    734738            lappend info "hub" [exec hostname]
    735739            lappend info "client" "vtksurfaceviewer"

  • branches/1.3/gui/scripts/vtkviewer.tcl

    r4528 r4670  
    874874                set session $env(SESSION)
    875875            }
     876            lappend info "version" "$Rappture::version"
     877            lappend info "build" "$Rappture::build"
     878            lappend info "svnurl" "$Rappture::svnurl"
     879            lappend info "installdir" "$Rappture::installdir"
    876880            lappend info "hub" [exec hostname]
    877881            lappend info "client" "vtkviewer"

  • branches/1.3/gui/scripts/vtkvolumeviewer.tcl

    r4568 r4670  
    751751                set session $env(SESSION)
    752752            }
     753            lappend info "version" "$Rappture::version"
     754            lappend info "build" "$Rappture::build"
     755            lappend info "svnurl" "$Rappture::svnurl"
     756            lappend info "installdir" "$Rappture::installdir"
    753757            lappend info "hub" [exec hostname]
    754758            lappend info "client" "vtkvolumeviewer"

  • branches/1.3/lang/tcl/pkgIndex.tcl.in

    r3739 r4670  
    66        variable version $version
    77        variable build "@SVN_VERSION@"
     8        variable svnurl "@SVN_URL@"
    89        variable installdir [file normalize $dir]
    910    }
Note: See TracChangeset for help on using the changeset viewer.