Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Jul 22, 2014
  1. @jcfr

    CTKAppLauncher 0.1.14

    jcfr authored
  2. @jcfr

    Merge branch '56-fix-support-for-additional-env-pathvariables'

    jcfr authored
    * 56-fix-support-for-additional-env-pathvariables:
      Ensure 'additionalPathVariables' is not overridden. Fixes #56
      Add "path env. variable" case to TestLauncherAdditionalSettings tests
      Reorganize "Settings-TestEnvironment" test to avoid duplication of data
  3. @jcfr

    Ensure 'additionalPathVariables' is not overridden. Fixes #56

    jcfr authored
    Commit 714981 generalized how environment variables dealing with paths
    were managed. This commit fixes a regression where environment variables
    set in the main settings file where not considered is additional settings
    where found.
  4. @jcfr
  5. @jcfr
Commits on Jul 19, 2014
  1. @jcfr

    Begin post-0.1.13 development

    jcfr authored
  2. @jcfr

    CTKAppLauncher 0.1.13

    jcfr authored
  3. @jcfr

    Merge branch '55-tweak-ctkVersionSource'

    jcfr authored
    * 55-tweak-ctkVersionSource:
      Warn if git executable can not be found and default version to 'unknown'
      Update driver script to ensure GIT_EXECUTABLE is propagated.
  4. @jcfr

    Warn if git executable can not be found and default version to 'unknown'

    jcfr authored
    This will avoid confusion by generating package that look like the release
    one.
    
    Before:
    
      -- CTKAppLauncher version: 0.1.12
    
    After:
    
      CMake Warning at CMake/ctkVersionSource.cmake:34 (message):
      GIT_EXECUTABLE not found.  CTKAppLauncher_VERSION_SOURCE default to
      'unknown'.
    Call Stack (most recent call first):
      CMakeLists.txt:58 (include)
    
      -- CTKAppLauncher version: 0.1.12-unknown
    
    See #55
  5. @jcfr
  6. @jcfr

    Merge branch '55-tweak-ctkVersionSource'

    jcfr authored
    * 55-tweak-ctkVersionSource:
      Warn if git executable can not be found and default version to 'unknown'
  7. @jcfr

    Warn if git executable can not be found and default version to 'unknown'

    jcfr authored
    This will avoid confusion by generating package that look like the release
    one.
    
    Before:
    
      -- CTKAppLauncher version: 0.1.12
    
    After:
    
      CMake Warning at CMake/ctkVersionSource.cmake:34 (message):
      GIT_EXECUTABLE not found.  CTKAppLauncher_VERSION_SOURCE default to
      'unknown'.
    Call Stack (most recent call first):
      CMakeLists.txt:58 (include)
    
    
      -- CTKAppLauncher version: 0.1.12-unknown
    
    Fixes #55
  8. @jcfr

    Merge branch '45-fix-default-for-userAdditionalSettingsFileBaseName'

    jcfr authored
    * 45-fix-default-for-userAdditionalSettingsFileBaseName:
      Fix default value for AdditionalLauncherSettings settings
  9. @jcfr

    Fix default value for AdditionalLauncherSettings settings

    jcfr authored
    This commit updates the default value for AdditionalLauncherSettings
    to be an empty string. The default value is now consistent with
    Slicer expectation where the settings file is suppose to have the name
    ApplicationName-Rev.ini if no user setting basename is specified.
    
    Fixes #45
    Fixes Slicer issue 3730 - See http://na-mic.org/Mantis/view.php?id=3730
  10. @jcfr

    Merge branch 'simplify-build-system'

    jcfr authored
    * simplify-build-system:
      Remove CTK_BASE_ variables and explicitly specify target and include dirs
  11. @jcfr

    Remove CTK_BASE_ variables and explicitly specify target and include …

    jcfr authored
    …dirs
    
    The ctkMacroBuildLib macro has also been simplified to set the variable
    cache property ${PROJECT_NAME}_INCLUDE_DIRS that can now easily be re-used.
Commits on Apr 1, 2014
  1. @jcfr

    Begin post-0.1.12 development

    jcfr authored
  2. @jcfr

    CTKAppLauncher 0.1.12

    jcfr authored
  3. @jcfr

    Better name for Midas packages credential file

    jcfr authored
    Instead of naming the file after the project, name it based on the server
    name so that it can easily be re-used by other project.
  4. @jcfr
  5. @jcfr
  6. @jcfr
  7. @jcfr
Commits on Mar 31, 2014
  1. @jcfr

    Merge pull request #50 from mwoehlke-kitware/actually-fix-environment…

    jcfr authored
    …-test-on-windows
    
    Correctly fix tests on Windows
  2. @mwoehlke-kitware

    BUG: Correctly fix tests on Windows

    mwoehlke-kitware authored
    Quote strings where needed to prevent expected/actual output comparison
    from incorrectly removing ';'s. It turns out this was the actual problem
    with these tests, and not line endings as previously believed (see
    8011e58). The old work-around (now removed) happened to "fix" the
    problem by also stripping ';'s from the expected string, which allowed
    the compare to succeed and the test to pass.
Commits on Mar 27, 2014
  1. @jcfr

    Merge pull request #48 from mwoehlke-kitware/test-config-fixes

    jcfr authored
    Test config fixes
  2. @jcfr

    Merge pull request #49 from mwoehlke-kitware/fix-verbose-test

    jcfr authored
    Fix TestLauncherVerbose test
    
    Tested on Ubuntu 13.10 on Debug build
    ```
    100% tests passed, 0 tests failed out of 53
    ```
  3. @mwoehlke-kitware

    BUG: Fix TestLauncherVerbose test

    mwoehlke-kitware authored
    Fix regex used in TestLauncherVerbose looking for "LD_LIBRARY_PATH",
    which is not present on OS/X or Windows, to look for the appropriate
    variable. (We're a little lax; we'll take either "LD_LIBRARY_PATH" or
    "DYLD_LIBRARY_PATH" on not-Windows. On Windows, we'll look for "PATH".
    This should be close enough given we're really looking for logging in
    general and not so much specific logging messages except as that's the
    easiest way to check for logging output.)
  4. @mwoehlke-kitware

    BUG: Fix App4ConfigureLauncherTest-ConfigureStep

    mwoehlke-kitware authored
    Tweak ctkAppLauncher.cmake to accept an optional argument with build
    configurations to use as hints when looking for the launcher executable
    (which is needed to find it in the build dirextory of a multi-config
    build). Adjust test invocation to pass along current configuration to
    the test scripts, and aforementioned test to pass along the
    configuration when configuring the test project, for use in the new
    search path list.
    
    This fixes App4ConfigureLauncherTest-ConfigureStep failing with
    multi-config generators.
  5. @mwoehlke-kitware

    BUG: Fix unit tests single/multi-configuration

    mwoehlke-kitware authored
    Fix incorrect handling of single- versus multi-configuration generators
    assuming that we are multi-configuration iff WIN32. Fix missing handling
    of multi-configuration generators in recently added configure launcher
    tests.
  6. @jcfr

    Merge pull request #47 from mwoehlke-kitware/fix-build-with-older-qt

    jcfr authored
    Fix build against Qt < 4.8
  7. @mwoehlke-kitware

    COMP: Fix build against Qt < 4.8

    mwoehlke-kitware authored
    Add a fallback for QProcessEnvironment::keys(), which was added in Qt
    4.8.
  8. @jcfr

    Merge pull request #46 from mwoehlke-kitware/test-multi-line-string-f…

    jcfr authored
    …ixes
    
    Fix failing tests due to CTest quirk
    
    Tested on Ubuntu 13.10 on Debug build
    ```
    100% tests passed, 0 tests failed out of 53
    ```
  9. @jcfr

    Fix checkout "hang" updating dashboard driver script to use git url

    jcfr authored
    Using the "http" url now expect the user to enter a password and can not
    be used to anonymously checkout the repository.
    
    See [1] for more details about the different protocol that can be used
    for cloning.
    
    [1] https://gist.github.com/grawity/4392747
  10. @mwoehlke-kitware

    BUG: Work around CTest quirk than can break test

    mwoehlke-kitware authored
    It seems that CTest (some versions at least) on Windows reads its
    scripts in binary mode, such that if the script has CRLF line endings, a
    multi-line string will also include the '\r' characters, which can cause
    our output matching to wrongly fail. Work around this by adding a step
    to strip out any '\r's to ensure that the expected string has the
    intended value.
    
    Also remove some debugging code that was accidentally left in a previous
    commit.
Something went wrong with that request. Please try again.