Skip to content

added rakefile check for ENV['ARRAY_CYCLES_DISABLE'] (this can now live ... #132

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −4
Open

added rakefile check for ENV['ARRAY_CYCLES_DISABLE'] (this can now live ... #132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions lib/motion/project/template/ios/config.rb
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ class IOSConfig < XcodeConfig

variable :device_family, :interface_orientations, :background_modes,
:status_bar_style, :icons, :prerendered_icon, :fonts, :seed_id,
:provisioning_profile, :manifest_assets
:provisioning_profile, :manifest_assets, :environment_variables

def initialize(project_dir, build_mode)
super
@@ -41,6 +41,7 @@ def initialize(project_dir, build_mode)
@icons = []
@prerendered_icon = false
@manifest_assets = []
@environment_variables = {}
end

def platforms; ['iPhoneSimulator', 'iPhoneOS']; end
@@ -454,7 +455,7 @@ def main_cpp_file_txt(spec_objs)
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
int retval = 0;
EOS
if ENV['ARR_CYCLES_DISABLE']
if(ENV['ARR_CYCLES_DISABLE'] || environment_variables['ARR_CYCLES_DISABLE'])
main_txt << <<EOS
setenv("ARR_CYCLES_DISABLE", "1", true);
EOS
5 changes: 3 additions & 2 deletions lib/motion/project/template/osx/config.rb
View file
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ class OSXConfig < XcodeConfig
register :osx

variable :icon, :copyright, :category, :embedded_frameworks,
:codesign_for_development
:codesign_for_development, :environment_variables

def initialize(project_dir, build_mode)
super
@@ -40,6 +40,7 @@ def initialize(project_dir, build_mode)
@frameworks = ['AppKit', 'Foundation', 'CoreGraphics']
@embedded_frameworks = []
@codesign_for_development = false
@environment_variables = {}
end

def platforms; ['MacOSX']; end
@@ -191,7 +192,7 @@ def main_cpp_file_txt(spec_objs)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
EOS
if ENV['ARR_CYCLES_DISABLE']
if(ENV['ARR_CYCLES_DISABLE'] || environment_variables['ARR_CYCLES_DISABLE'])
main_txt << <<EOS
setenv("ARR_CYCLES_DISABLE", "1", true);
EOS