Skip to content

Commit 855d7cf

Browse files
HainishHainish
committed
Adding additional exclusions to .build_exclusions and fixing exclusion logic
1 parent b3eb4f5 commit 855d7cf

2 files changed

Lines changed: 16 additions & 6 deletions

File tree

‎.build_exclusions‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
pkg/*.xpi
22
*~
33
*.sw?
4+
*/.*.sw?
5+
*/*/.*.sw?
6+
*/*/*/.*.sw?
47
chrome/content/rules/*.xml
58
chrome/content/rules/*.py
69
chrome/content/rules/validity-*
710
chrome/content/rules/make-*
811
*.xcf.gz
912
.gitignore
13+
webextension/.gitignore
1014
chrome-resources/update-from-chrome-svn.sh
15+
webextension/chrome-resources/update-from-chrome-svn.sh
16+
.eslintrc.json
17+
webextension/.eslintrc.json

‎utils/create_xpi.py‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,19 @@
2525

2626
args = parser.parse_args()
2727

28-
exclusions = []
29-
with open(args.exclusions) as f:
30-
for line in f:
31-
exclusions.extend(glob.glob(line.strip()))
32-
exclusions = map(lambda x: './'+x, exclusions)
33-
3428
compress = zipfile.ZIP_DEFLATED
3529

3630
xpiFile = zipfile.ZipFile(args.xpiname, mode='w', compression=compress)
3731

32+
f = open(args.exclusions)
33+
3834
os.chdir(args.directory)
35+
36+
exclusions = []
37+
for line in f:
38+
exclusions.extend(glob.glob(line.strip()))
39+
exclusions = map(lambda x: './'+x, exclusions)
40+
print exclusions
41+
3942
xpiFile.write_from_directory(".", exclusions, compress_type=compress)
4043
xpiFile.close()

0 commit comments

Comments
 (0)