Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change print_escaped to escape_string #136

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
environment:
matrix:
- JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
- JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
- JULIAVERSION: "julialang/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
- JULIAVERSION: "julialang/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the correct directory as it had worked for my package GeoEfficiency

- JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
- JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"

branches:
only:
- master
- /release-.*/

notifications:
- provider: Email
on_build_success: false
on_build_failure: false
on_build_status_changed: false

install:
# Download most recent Julia Windows binary
- ps: (new-object net.webclient).DownloadFile(
$("http://s3.amazonaws.com/"+$env:JULIAVERSION),
"C:\projects\julia-binary.exe")
# Run installer silently, output to C:\projects\julia
- C:\projects\julia-binary.exe /S /D=C:\projects\julia

build_script:
# Need to convert from shallow to complete for Pkg.clone to work
- IF EXIST .git\shallow (git fetch --unshallow)
- C:\projects\julia\bin\julia -e "versioninfo();
Pkg.clone(pwd(), \"Tk\"); Pkg.build(\"Tk\")"

test_script:
- C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"Tk\")"
4 changes: 2 additions & 2 deletions src/tkwidget.jl
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ function init()
tcldir = dirname(String(tclfile[1:len]))
libpath = IOBuffer()
print(libpath,"set env(TCL_LIBRARY) [subst -nocommands -novariables {")
print_escaped(libpath,abspath(tcldir,"..","share","tcl"),"{}")
escape_string(libpath,abspath(tcldir,"..","share","tcl"),"{}")
print(libpath,"}]")
tcl_eval(takebuf_string(libpath),tclinterp)
print(libpath,"set env(TK_LIBRARY) [subst -nocommands -novariables {")
print_escaped(libpath,abspath(tcldir,"..","share","tk"),"{}")
escape_string(libpath,abspath(tcldir,"..","share","tk"),"{}")
print(libpath,"}]")
tcl_eval(takebuf_string(libpath),tclinterp)
end
Expand Down