Skip to content

Commit

Permalink
Merge pull request #489 from misl6/fix-cwd
Browse files Browse the repository at this point in the history
Adds initial_working_directory
  • Loading branch information
AndreMiras authored May 9, 2020
2 parents c35c94a + eeeb062 commit 085d04b
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions kivy_ios/toolchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

curdir = dirname(__file__)

initial_working_directory = getcwd()

# For more detailed logging, use something like
# format='%(asctime)s,%(msecs)d %(levelname)-8s [%(filename)s:%(funcName)s():%(lineno)d] %(message)s'
Expand Down Expand Up @@ -349,11 +350,11 @@ def __init__(self):

# root of the toolchain
self.root_dir = realpath(dirname(__file__))
self.build_dir = "{}/build".format(getcwd())
self.cache_dir = "{}/.cache".format(getcwd())
self.dist_dir = "{}/dist".format(getcwd())
self.install_dir = "{}/dist/root".format(getcwd())
self.include_dir = "{}/dist/include".format(getcwd())
self.build_dir = "{}/build".format(initial_working_directory)
self.cache_dir = "{}/.cache".format(initial_working_directory)
self.dist_dir = "{}/dist".format(initial_working_directory)
self.install_dir = "{}/dist/root".format(initial_working_directory)
self.include_dir = "{}/dist/include".format(initial_working_directory)
self.archs = (
Arch64Simulator(self),
Arch64IOS(self))
Expand Down Expand Up @@ -1364,7 +1365,7 @@ def create(self):
}
cookiecutter(template_dir, no_input=True, extra_context=context)
filename = join(
getcwd(),
initial_working_directory,
"{}-ios".format(args.name.lower()),
"{}.xcodeproj".format(args.name.lower()),
"project.pbxproj")
Expand Down

0 comments on commit 085d04b

Please sign in to comment.