Skip to content

Commit

Permalink
Merge pull request ANTsX#46 from muschellij2/master
Browse files Browse the repository at this point in the history
Updating Windows configure.win
  • Loading branch information
muschellij2 authored Nov 5, 2019
2 parents 3ba8d25 + 6447d04 commit d235528
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: ITKR
Type: Package
Title: ITK in R
Version: 0.5.1.2
Date: 2019-10-20
Version: 0.5.2
Date: 2019-11-05
Authors@R: c(
person(c("Brian", "B"), "Avants", role = c("aut", "cre"), email = "[email protected]"),
person(c("Benjamin", "M"), "Kandel", role = "ctb", email = "NA"),
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ build_script:
test_script:
- travis-tool.sh run_tests
- ls
- cp -ravTf *.zip %APPVEYOR_BUILD_FOLDER%
- cp -ravTf C:/run %APPVEYOR_BUILD_FOLDER%
- cd %APPVEYOR_BUILD_FOLDER%
- ls
Expand Down
4 changes: 2 additions & 2 deletions configure.win
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd ./src
# itkgit=https://github.com/InsightSoftwareConsortium/ITK
# itktag=81c14ce858a530699ee2fbf7fa48b884ad26b984
itkgit=https://github.com/muschellij2/ITK.git
itktag=ad8254df7675626f06508718b88b3709a15cdf7e
itktag=4dc020cd1b451fb6dc79c7b5c3d5968cb45c3c1c
mkdir itks itkb
# as per https://discourse.itk.org/t/path-length-limitation-in-windows-lifted/545/12
mkdir -p ../data
Expand All @@ -17,7 +17,7 @@ echo "ITK;${itktag}" >> ../data/softwareVersions.csv
echo "ITKURL;${itkgit}" >> ../data/softwareVersions.csv
git_exe=`${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe -e "x=Sys.which('git'); cat(x)"`
if [ -z "${git_exe}" ]; then
${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe -e "if (!requireNamespace('git2r')) install.packages('git2r')"
${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe -e 'if (!requireNamespace("git2r")) install.packages("git2r")'
str="repo = git2r::clone(\""
str="${str}${itkgit}"
str="${str}\", local_path = \"./itks\")"
Expand Down

0 comments on commit d235528

Please sign in to comment.