Skip to content

Commit

Permalink
fix for a bug so we don't skip JSS that doesn't live in a platform dir
Browse files Browse the repository at this point in the history
TIMOB-4447
  • Loading branch information
marshall committed Jul 20, 2011
1 parent 4ba8abb commit 301b5cb
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions support/common/css/csscompiler.py
Expand Up @@ -80,7 +80,7 @@ def is_platform(self,key):
def is_platform_ios(self):
return self.platform in ["iphone", "ipad", "ios", "universal"]

def is_platform_dir(self, dir,):
def is_platform_dir(self, dir):
platform_dirs = [os.path.join(self.dir, p) for p in ["iphone", "android", "blackberry"]]

if dir in platform_dirs:
Expand All @@ -89,7 +89,10 @@ def is_platform_dir(self, dir,):
return True
elif self.platform == basename:
return True
return False
# Only return false if this is actually a platform directory, but *NOT* the specified platform
# We still want to copy from directories that are non-platform (hence the "return True" catch all)
return False
return True

def __init__(self, dir, platform, appid):
self.dir = dir
Expand All @@ -103,7 +106,8 @@ def __init__(self, dir, platform, appid):

for name in ignoreDirs:
if name in dirs:
dirs.remove(name) # don't visit ignored directories
# don't visit ignored directories
dirs.remove(name)
for f in files:
if f in ignoreFiles: continue
if not f.endswith('.jss'): continue
Expand Down

0 comments on commit 301b5cb

Please sign in to comment.