diff options
author | Adam Mitz <mitza@ociweb.com> | 2015-05-14 12:18:54 -0500 |
---|---|---|
committer | Adam Mitz <mitza@ociweb.com> | 2015-05-14 12:18:54 -0500 |
commit | 1b7987cf5c72f63f8d6d4e41595cdee7160de8ef (patch) | |
tree | e357134d87e2e389529e0b700c8d247658e8c28a | |
parent | 1a9ce1f99df10531c3f99de7d6c06a062a05efa3 (diff) | |
parent | 66069eed4dcf9a13f482fa8ae985281529c0b280 (diff) | |
download | ATCD-1b7987cf5c72f63f8d6d4e41595cdee7160de8ef.tar.gz |
Merge pull request #78 from mitza-oci/master
Fixed bug in make_release.py which skipped packaging files after those that were supposed to be
-rwxr-xr-x | ACE/bin/make_release.py | 9 | ||||
-rw-r--r-- | ACE/tests/.gitignore | 73 |
2 files changed, 77 insertions, 5 deletions
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index 9b6c5b2e4ba..e8d8dfb17cb 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -820,7 +820,6 @@ def create_file_lists (base_dir, prefix, exclude): 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: @@ -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"]) + "ACE_wrappers", ["TAO", ".gitignore"]) # 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"]) + "ACE_wrappers/TAO", ["CIAO", "DAnCE", ".gitignore"]) # 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", []) + "ACE_wrappers/TAO/DAnCE", [".gitignore"]) # 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", []) + "ACE_wrappers/TAO/CIAO", [".gitignore"]) # write_file_lists ("fCIAO" + decorator, text_files, bin_files) update_packages ("\n".join (text_files), diff --git a/ACE/tests/.gitignore b/ACE/tests/.gitignore index efe9f764810..702741d6897 100644 --- a/ACE/tests/.gitignore +++ b/ACE/tests/.gitignore @@ -15,12 +15,42 @@ /Bug_1576_Regression_Test /Bug_1890_Regression_Test /Bug_2368_Regression_Test +/Bug_2434_Regression_Test /Bug_2497_Regression_Test /Bug_2540_Regression_Test +/Bug_2609_Regression_Test +/Bug_2610_Regression_Test /Bug_2653_Regression_Test /Bug_2659_Regression_Test +/Bug_2740_Regression_Test +/Bug_2772_Regression_Test /Bug_2815_Regression_Test /Bug_2820_Regression_Test +/Bug_2975_Regression_Test +/Bug_2980_Regression_Test +/Bug_3102_Regression_Test +/Bug_3319_Regression_Test +/Bug_3332_Regression_Test +/Bug_3334_Regression_Test +/Bug_3432_Regression_Test +/Bug_3500_Regression_Test +/Bug_3505_Regression_Test +/Bug_3532_Regression_Test +/Bug_3539_Regression_Test +/Bug_3541_Regression_Test +/Bug_3673_Regression_Test +/Bug_3709_Regression_Test +/Bug_3710_Regression_Test +/Bug_3729_Regression_Test +/Bug_3744_Regression_Test +/Bug_3758_Regression_Test +/Bug_3878_Regression_Test +/Bug_3911_Regression_Test +/Bug_3912_Regression_Test +/Bug_3943_Regression_Test +/Bug_3974_Regression_Test +/Bug_4055_Regression_Test +/Bug_4189_Regression_Test /Cache_Map_Manager_Test /Cached_Accept_Conn_Test /Cached_Allocator_Test @@ -30,8 +60,40 @@ /CDR_File_Test /CDR_Fixed_Test /CDR_Test +/Chrono_Test /Codecs_Test /Collection_Test +/Compiler_Features_01_Test +/Compiler_Features_02_Test +/Compiler_Features_03_Test +/Compiler_Features_04_Test +/Compiler_Features_05_Test +/Compiler_Features_06_Test +/Compiler_Features_07_Test +/Compiler_Features_09_Test +/Compiler_Features_10_Test +/Compiler_Features_11_Test +/Compiler_Features_12_Test +/Compiler_Features_13_Test +/Compiler_Features_14_Test +/Compiler_Features_15_Test +/Compiler_Features_16_Test +/Compiler_Features_17_Test +/Compiler_Features_18_Test +/Compiler_Features_19_Test +/Compiler_Features_21_Test +/Compiler_Features_23_Test +/Compiler_Features_24_Test +/Compiler_Features_25_Test +/Compiler_Features_26_Test +/Compiler_Features_27_Test +/Compiler_Features_28_Test +/Compiler_Features_29_Test +/Compiler_Features_31_Test +/Compiler_Features_32_Test +/Compiler_Features_33_Test +/Compiler_Features_34_Test +/Compiler_Features_35_Test /Config_Test /Conn_Test /Date_Time_Test @@ -41,6 +103,7 @@ /DLL_Test /DLList_Test /Dynamic_Priority_Test +/Dynamic_Test /Enum_Interfaces_Test /Env_Value_Test /FIFO_Test @@ -57,9 +120,12 @@ /INET_Addr_Test /INET_Addr_Test_IPV6 /Integer_Truncate_Test +/Intrusive_Auto_Ptr_Test /IOStream_Test /Lazy_Map_Manager_Test +/Log_Msg_Backend_Test /Log_Msg_Test +/Log_Thread_Inheritance_Test /Logging_Strategy_Test /Malloc_Test /Manual_Event_Test @@ -70,11 +136,17 @@ /Mem_Map_Test /MEM_Stream_Test /Memcpy_Test +/Message_Block_Large_Copy_Test /Message_Block_Test /Message_Queue_Notifications_Test /Message_Queue_Test /Message_Queue_Test_Ex +/Missing_Svc_Conf_Test /MM_Shared_Memory_Test +/Monotonic_Manual_Event_Test +/Monotonic_Message_Queue_Test +/Monotonic_Task_Test +/MT_NonBlocking_Connect_Test /MT_Reactor_Timer_Test /MT_Reactor_Upcall_Test /MT_Reference_Counted_Event_Handler_Test @@ -90,6 +162,7 @@ /NonBlocking_Conn_Test /Notification_Queue_Unit_Test /Notify_Performance_Test +/Object_Manager_Flipping_Test /Object_Manager_Test /Obstack_Test /OrdMultiSet_Test |