Remove misleading deprecation of old support directory #3613
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mossheim
reviewed
Mar 30, 2018
| supportDirectory.string().c_str()); | ||
| } | ||
| #endif | ||
|
|
There was a problem hiding this comment.
thanks! Can you remove the includes above for boost/filesystem/path, boost/filesystem/operations, and SC_Filesystem? This is the only place they're needed in this file (I guess I should have put SC_Filesystem in the ifdef when I last edited this)
aspiers
force-pushed
the
rm-support-dir-deprecation
branch
from
d28cdb8 to
143a176
Compare
|
@aspiers - would you mind removing the include for I have this change locally, so I can just push it myself to this branch if you're ok with that. |
On UNIX-like systems, if SuperCollider is compiled from source into
the user's home directory via:
cmake -DCMAKE_INSTALL_PREFIX=$HOME
make install
then Platform.systemAppSupportDir and Platform.resourceDir will be set
to
$HOME/share/SuperCollider
This is due to CMakeLists.txt containing the definition of SC_DATA_DIR:
elseif(UNIX)
add_definitions(-DSC_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/SuperCollider")
endif()
which is then consumed by common/SC_Filesystem_unix.cpp.
Unfortunately, this resulting path is identical to the old location
for the *user* support directory, so it triggers a misleading warning.
However this deprecation was introduced by 2b77ef6 in August 2011,
so it should be safe to remove it by now.
Fixes supercollider#3367.
aspiers
force-pushed
the
rm-support-dir-deprecation
branch
from
143a176 to
9cf80b8
Compare
|
Done but yeah, feel free to push yourself in future if you don't want to wait :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On UNIX-like systems, if SuperCollider is compiled from source into the user's home directory via:
then
Platform.systemAppSupportDirandPlatform.resourceDirwill be set toThis is due to
CMakeLists.txtcontaining the definition ofSC_DATA_DIR:which is then consumed by
common/SC_Filesystem_unix.cpp.Unfortunately, this resulting path is identical to the old location for the user support directory, so it triggers a misleading warning. However this deprecation was introduced by 2b77ef6 in August 2011, so it should be safe to remove it by now.
Fixes #3367.