diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-05-07 12:07:27 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2015-05-07 12:07:27 +0200 |
| commit | 80310d5a14daa383ac29bee1c442a3e1f8b074be (patch) | |
| tree | 18712ac6e2a858514868da2e60d2499d384754b6 | |
| parent | 36f1ecd6eb1defa405372adb5f4075049e2a74e9 (diff) | |
| parent | 3871108507ab11b0850a0911105825c2e4d29350 (diff) | |
| download | ATCD-80310d5a14daa383ac29bee1c442a3e1f8b074be.tar.gz | |
Merge branch 'master' of git://github.com/DOCGroup/ATCD
| -rwxr-xr-x | ACE/bin/make_release.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index c3ba27e384f..f460c5af31c 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -807,7 +807,7 @@ def create_file_lists (base_dir, prefix, exclude): if excluded: continue - # Remove dirs from our exclude pattern + # Remove dirs that are listed in our exclude pattern for item in dirs: # print "item", item # Remove our excludes @@ -815,13 +815,12 @@ def create_file_lists (base_dir, prefix, exclude): # print "Removing " + item + " from consideration...." dirs.remove (item) + # Remove files that are listed in our exclude pattern for item in files: - fullitem = os.path.join (relroot, item) if fullitem in exclude or item in exclude: # print "Removing " + fullitem + " from consideration...." files.remove (item) - continue else: if bin_regex.search (fullitem) is not None: bin_files.append ('"' + os.path.join (prefix, fullitem) + '"') @@ -861,7 +860,7 @@ def package (stage_dir, package_dir, decorator): pass # swallow any errors text_files, bin_files = create_file_lists (join (stage_dir, "ACE_wrappers"), - "ACE_wrappers", ["TAO", ".gitignore"]) + "ACE_wrappers", ["TAO"]) # write_file_lists ("fACE" + decorator, text_files, bin_files) update_packages ("\n".join (text_files), @@ -876,7 +875,7 @@ def package (stage_dir, package_dir, decorator): # for TAO: text_files, bin_files = create_file_lists (join (stage_dir, "ACE_wrappers/TAO"), - "ACE_wrappers/TAO", ["CIAO", "DAnCE", ".gitignore"]) + "ACE_wrappers/TAO", ["CIAO", "DAnCE"]) # write_file_lists ("fTAO" + decorator, text_files, bin_files) update_packages ("\n".join (text_files), @@ -891,7 +890,7 @@ def package (stage_dir, package_dir, decorator): # for DAnCE: text_files, bin_files = create_file_lists (join (stage_dir, "ACE_wrappers/TAO/DAnCE"), - "ACE_wrappers/TAO/DAnCE", [".gitignore"]) + "ACE_wrappers/TAO/DAnCE", []) # write_file_lists ("fTAO" + decorator, text_files, bin_files) update_packages ("\n".join (text_files), @@ -905,7 +904,7 @@ def package (stage_dir, package_dir, decorator): bin_files = list () # for CIAO: text_files, bin_files = create_file_lists (join (stage_dir, "ACE_wrappers/TAO/CIAO"), - "ACE_wrappers/TAO/CIAO", [".gitignore"]) + "ACE_wrappers/TAO/CIAO", []) # write_file_lists ("fCIAO" + decorator, text_files, bin_files) update_packages ("\n".join (text_files), |