Skip to content
Merged
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.01)
cmake_minimum_required(VERSION 3.10)

project(libpolymake_julia)

Expand Down
2 changes: 1 addition & 1 deletion include/jlpolymake/jlpolymake.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

#define JLPOLYMAKE_VERSION_MAJOR 0
#define JLPOLYMAKE_VERSION_MINOR 14
#define JLPOLYMAKE_VERSION_PATCH 0
#define JLPOLYMAKE_VERSION_PATCH 2

#define __JLPOLYMAKE_STR_HELPER(x) #x
#define __JLPOLYMAKE_STR(x) __JLPOLYMAKE_STR_HELPER(x)
Expand Down
16 changes: 12 additions & 4 deletions src/polymake/generate_deps_tree.jl
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,18 @@ function full_artifact_dir(m::Module)
end
end

function force_symlink(source::AbstractString, target::AbstractString)
tmpfile = tempname(dirname(target); cleanup=false)
symlink(source, tmpfile)
Base.Filesystem.rename(tmpfile, target)
function force_symlink(target::AbstractString, link::AbstractString)
# the rename operation below should be atomic and make sure the link always points
# to a valid directory
# but macos disagrees and sometimes reading files below this path fails with `EINVAL`
# see also: http://www.weirdnet.nl/apple/rename.html
# (it seems to be fixed on hfs+ but not on apfs...)
# to reduce the frequency of this we only write the symlink if necessary
# (note this does not fully avoid the error)
islink(link) && readlink(link) == target && return
tmpfile = tempname(dirname(link); cleanup=false)
symlink(target, tmpfile)
Base.Filesystem.rename(tmpfile, link)
end

function prepare_deps_tree(targetdir::String)
Expand Down
1 change: 1 addition & 0 deletions src/polymake/type_setup.pl
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ sub EdgeMap {

Map(String,String),
Map(String,Int),
Map(Int,String),
Map(Int,Int),
Map(Integer,Int),
Map(Rational,Rational),
Expand Down
Loading