Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

[[ Cleanup ]] Remove unused variable #6624

Merged
livecodepanos merged 2 commits into from
Sep 24, 2018
Merged

[[ Cleanup ]] Remove unused variable #6624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5e000a
[[ Cleanup ]] Remove unused variable
montegoulding Aug 3, 2018
a3068a8
[[ Xcode Config ]] Use legacy build system
montegoulding Aug 3, 2018
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
20 changes: 20 additions & 0 deletions config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import re
import os
import subprocess
import shutil

# The set of platforms for which this branch supports automated builds
BUILDBOT_PLATFORM_TRIPLES = (
Expand Down Expand Up @@ -789,6 +790,7 @@ def configure_mac(opts):
validate_target_arch(opts)
validate_xcode_sdks(opts)
validate_java_tools(opts)
copy_workspace_settings(opts)

args = core_gyp_args(opts) + ['-Dtarget_sdk=' + opts['XCODE_TARGET_SDK'],
'-Dhost_sdk=' + opts['XCODE_HOST_SDK'],
Expand All @@ -815,5 +817,23 @@ def configure(args):
}
configure_procs[opts['OS']](opts)

def copy_workspace_settings(opts):
validate_gyp_settings(opts)
if opts['BUILD_EDITION'] == 'commercial':
project = os.path.join(opts['GENERATOR_OUTPUT'], '..', 'livecode-commercial.xcodeproj')
else:
project = os.path.join(opts['GENERATOR_OUTPUT'], 'livecode.xcodeproj')

xcshareddata = os.path.join(project, 'project.xcworkspace', 'xcshareddata')

if not os.path.exists(xcshareddata):
os.makedirs(xcshareddata)

workspacesettingsdest= os.path.join(xcshareddata, 'WorkspaceSettings.xcsettings')
workspacesettingssource = os.path.join('config', 'WorkspaceSettings.xcsettings')

if not os.path.exists(workspacesettingsdest):
shutil.copyfile(workspacesettingssource, workspacesettingsdest)

if __name__ == '__main__':
configure(sys.argv[1:])
8 changes: 8 additions & 0 deletions config/WorkspaceSettings.xcsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildSystemType</key>
<string>Original</string>
</dict>
</plist>
6 changes: 3 additions & 3 deletions libgraphics/src/drawing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1724,13 +1724,13 @@ void MCGDrawingContext::ExecutePath(VisitorT& p_visitor)

case kMCGDrawingPathOpcodeSmoothCubicTo:
{
MCGPoint t_a, t_b, t_point;
if (!Point(t_b) ||
MCGPoint t_a, t_point;
if (!Point(t_a) ||
!Point(t_point))
{
break;
}
p_visitor.PathSmoothCubicTo(t_b,
p_visitor.PathSmoothCubicTo(t_a,
t_point);
}
break;
Expand Down