SisMaker 4 лет назад
Родитель
Сommit
3c5344d5a1
1 измененных файлов: 31 добавлений и 2 удалений
  1. +31
    -2
      src/sync/esUtils.erl

+ 31
- 2
src/sync/esUtils.erl Просмотреть файл

@ -217,6 +217,23 @@ determineIncludeDirFromBeamDir(IncludeBase, IncludeDir, BeamDir) ->
undefined
end
end.
%% get the src dir
getRootSrcDirFromSrcDir(SrcDir) ->
NewDirName = filename:dirname(SrcDir),
BaseName = filename:basename(SrcDir),
case BaseName of
?rootSrcDir ->
NewDirName;
_ ->
case NewDirName =/= SrcDir of
true ->
getRootSrcDirFromSrcDir(NewDirName);
_ ->
undefined
end
end.
%% Then we dig back through the parent directories until we find our include directory
findIncludeDirFromAncestors(Cwd, Cwd, _) -> undefined;
@ -361,7 +378,13 @@ collSrcFiles(IsAddPath) ->
true ->
case isDelDir(DelSrcDirs, OneFiles) of
false ->
[RootSrcDir | _Other] = binary:split(OneFiles, ?rootSrcDir),
RootSrcDir =
case getRootSrcDirFromSrcDir(OneFiles) of
undefined ->
filename:dirname(OneFiles);
RetSrcDir ->
RetSrcDir
end,
case getOptions(RootSrcDir) of
undefined ->
Mod = erlang:binary_to_atom(filename:basename(OneFiles, filename:extension(OneFiles)), utf8),
@ -710,7 +733,13 @@ reloadIfNecessary(Module, OldBinary, Binary, Filename) ->
recompileSrcFile(SrcFile, SwSyncNode) ->
%% Get the module, src dir, and options...
[RootSrcDir | _Other] = binary:split(SrcFile, ?rootSrcDir),
RootSrcDir =
case getRootSrcDirFromSrcDir(SrcFile) of
undefined ->
filename:dirname(SrcFile);
RetSrcDir ->
RetSrcDir
end,
CurSrcDir = filename:dirname(SrcFile),
{CompileFun, Module} = getCompileFunAndModuleName(SrcFile),
{OldBinary, Filename} = getObjectCode(Module),

Загрузка…
Отмена
Сохранить