mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Introjucer: improved handling of windows filenames when run on *nix.

Browse source
This commit is contained in:
jules 2012-04-16 12:20:58 +01:00
parent 3f953ca21d
commit cebf34d9bb
8 changed files with 50 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

26
extras/Introjucer/Source/Utility/jucer_FileHelpers.cpp
View file

@ -112,12 +112,19 @@ namespace FileHelpers
return path.replaceCharacter ('/', '\\');
}
bool isAbsolutePath (const String& path)
{
return File::isAbsolutePath (path)
|| path.startsWithChar ('/') // (needed because File::isAbsolutePath will ignore forward-slashes on Windows)
|| path.startsWithChar ('$')
|| path.startsWithChar ('~')
|| (CharacterFunctions::isLetter (path[0]) && path[1] == ':')
|| path.startsWithIgnoreCase ("smb:");
}
static String appendPath (const String& path, const String& subpath)
{
if (File::isAbsolutePath (subpath)
|| subpath.startsWithChar ('$')
|| subpath.startsWithChar ('~')
|| (CharacterFunctions::isLetter (subpath[0]) && subpath[1] == ':'))
if (isAbsolutePath (subpath))
return subpath.replaceCharacter ('\\', '/');
String path1 (path.replaceCharacter ('\\', '/'));
@ -145,4 +152,15 @@ namespace FileHelpers
return path1.substring (0, commonBitLength).removeCharacters ("/:").isNotEmpty();
}
String getRelativePathFrom (const File& file, const File& sourceFolder)
{
#if ! JUCE_WINDOWS
// On a non-windows machine, we can't know if a drive-letter path may be relative or not.
if (CharacterFunctions::isLetter (file.getFullPathName()[0]) && file.getFullPathName()[1] == ':')
return file.getFullPathName();
#endif
return file.getRelativePathFrom (sourceFolder);
}
}