-
Notifications
You must be signed in to change notification settings - Fork 451
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
Mac: Update build scripts to handle new Profiling configuration #375
Conversation
@@ -38,6 +38,11 @@ GITPATH="$(find $PACKAGES/gitformac.gvfs.installer/$GITVERSION -type f -name *.d | |||
# Now that we have a path containing the version number, generate GVFSConstants.GitVersion.cs | |||
$SCRIPTDIR/GenerateGitVersionConstants.sh "$GITPATH" $BUILDDIR || exit 1 | |||
|
|||
# If we're building the Profiling(Release) configuration, remove Profiling() for building .NET code | |||
if [ "$CONFIGURATION" == "Profiling(Release)" ]; then | |||
CONFIGURATION=Release |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be DOTNETCONFIGURATION
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh I see, DOTNETCONFIGURATION
hasn't been set yet. I would probably clean this up so we're deciding how to set DOTNETCONFIGURATION
rather than changing CONFIGURATION
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have to set DOTNETCONFIGURATION for the Debug/default case too so I'd rather have two separate conversions. One to reset 'Profiling(Release)' to Release and then another to unconditionally add '.Mac' to the configuration, regardless of if it's Debug/Release/malformed input.
@@ -14,5 +14,10 @@ PROJFS=$SRCDIR/ProjFS.Mac | |||
|
|||
xcodebuild -configuration $CONFIGURATION -workspace $PROJFS/PrjFS.xcworkspace build -scheme PrjFS -derivedDataPath $ROOTDIR/BuildOutput/ProjFS.Mac/Native || exit 1 | |||
|
|||
# If we're building the Profiling(Release) configuration, remove Profiling() for building .NET code | |||
if [ "$CONFIGURATION" == "Profiling(Release)" ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use DOTNETCONFIGURATION
for consistency?
Do we need a change in the MirrorProvider scripts too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do need a change in the MirrorProvider, adding that. On making that change, I discovered that the MirrorProvider's script does something different (doesn't bother making a DOTNETCONFIGURATION variable so I'll make that change in the BuildGVFSForMac script too.
Update build scripts to be able to handle the 'Profiling(Release)' configuration. Only pass that configuration value into xcodebuild as .NET requires 'Release.Mac' to be the configuration.