===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/_contrib.wxs,v
retrieving revision 1.4
retrieving revision 1.7
diff -u -p -r1.4 -r1.7
--- OpenXM_contrib2/windows/_contrib.wxs	2013/12/17 19:30:30	1.4
+++ OpenXM_contrib2/windows/_contrib.wxs	2016/06/29 14:16:35	1.7
@@ -44,6 +44,9 @@
             <Component Id="cmp8CDFDD4D149A75F128EC229F16398FFC" Guid="85A69574-244C-40A2-BB4E-E6218E40EA11">
                 <File Id="fil69A3775719D2FA4866FF3EE8F86DEF18" KeyPath="yes" Source="$(var.contribDir)\gnuplotf.rr" />
             </Component>
+            <Component Id="cmp151795882726CE28AA1DF4CA49F04858" Guid="1FC1BCB1-BC55-4380-8B61-3353140B0455">
+                <File Id="fil8AD22D8872AC0AD411830A95EEBBAD89" KeyPath="yes" Source="$(var.contribDir)\gtt_ekn.rr" />
+            </Component>
             <Component Id="cmp2EBC516B2C2DCB78D20204511C5C10B9" Guid="8BCD5643-A7BE-4ECA-AC73-6F4C56446DC2">
                 <File Id="fil769A417E9FC2EB12F1D361F954883235" KeyPath="yes" Source="$(var.contribDir)\hermit.rr" />
             </Component>
@@ -62,6 +65,9 @@
             <Component Id="cmp2FAEA5454A0C13E322726EF61B5EE3DC" Guid="724B5373-FD4A-4546-A44C-F2897FD71D0F">
                 <File Id="fil603C99CB297466C38031749CFA769EDA" KeyPath="yes" Source="$(var.contribDir)\knapsack-factor.rr" />
             </Component>
+            <Component Id="cmp3763531955F384D9627F8DA37211A318" Guid="C198D7E5-C0FD-4C92-B5CB-C3074CC189A2">
+                <File Id="fil21BE2373BC90BD89D97E895F369003F8" KeyPath="yes" Source="$(var.contribDir)\ko_fb_pfaffian.rr" />
+            </Component>
             <Component Id="cmp158C869D798AF1DD1E2B0917880334C4" Guid="977AEC23-4D5A-4184-B106-FED402110964">
                 <File Id="fil98D04394826911CA6C01789084E4F6E0" KeyPath="yes" Source="$(var.contribDir)\la_solution_guide.rr" />
             </Component>
@@ -86,15 +92,24 @@
             <Component Id="cmp5CCFFEB48311C4964BD28C11FC9809E6" Guid="6CD2DAF5-3C25-4584-8B2D-1DA1425372B0">
                 <File Id="fil8EE33416D3A5A9037AAF7A5426F0B147" KeyPath="yes" Source="$(var.contribDir)\names.rr" />
             </Component>
+            <Component Id="cmp4EE34ED6B0A40B6338FC4F6D943EF595" Guid="269CE3B2-7D51-49EA-AD3C-ABDCAE34C4AA">
+                <File Id="filCEDD3476C3A39CA2508B4B06E6A6EC18" KeyPath="yes" Source="$(var.contribDir)\nk_fb_gen_c.rr" />
+            </Component>
             <Component Id="cmp65748E6017684E8FDEF66C7C2D70BCCB" Guid="C9A5B6E8-3202-48AC-B205-9FBC6FBA9940">
                 <File Id="fil7E239EC1F6DF6DB6937663CD9D96A20F" KeyPath="yes" Source="$(var.contribDir)\nk_restriction.rr" />
             </Component>
+            <Component Id="cmp683AE228E98077755EAB5E5305166180" Guid="67069650-233C-4DD2-9CFA-FC85A9848831">
+                <File Id="fil5F6D2B4ED8590F523E7CF1E18A51B028" KeyPath="yes" Source="$(var.contribDir)\nk_toric.rr" />
+            </Component>
             <Component Id="cmpC251678517D46321743D6C19C4047A72" Guid="625B48A3-B81A-4F9F-BD7E-FA02BB87E1A4">
                 <File Id="filAA511E86A5C50E6DBB6E4852FF8584C4" KeyPath="yes" Source="$(var.contribDir)\nn_ndbf.rr" />
             </Component>
             <Component Id="cmpF70FBA9207EF39BCE28811F8B18D3C40" Guid="D12DCECA-0B18-4643-9187-E9B99B5D5C02">
                 <File Id="fil11FCF3BBDCA0F214123B5A3815856CA4" KeyPath="yes" Source="$(var.contribDir)\noro_de.rr" />
             </Component>
+            <Component Id="cmp41E15856624364326C1C81C08B9CF95F" Guid="521D0615-7059-470C-974D-3B137DD5824A">
+                <File Id="filCA98CEB866EACD4C284A13BAB24A2994" KeyPath="yes" Source="$(var.contribDir)\noro_grcrt.rr" />
+            </Component>
             <Component Id="cmp7DECBFF38704400E06C98A02C3F82A95" Guid="27D4C958-72F5-4DFA-B083-1009F8C70E3E">
                 <File Id="filB29097F3C40FC3D46B6FE0BCA8132370" KeyPath="yes" Source="$(var.contribDir)\noro_gw.rr" />
             </Component>
@@ -155,6 +170,18 @@
             <Component Id="cmpF6854F57B9B062796479DB9006FE6363" Guid="20481759-1ED5-4789-B2AE-9ED3DD26BEF5">
                 <File Id="fil1810C16EE465452866A798C674988812" KeyPath="yes" Source="$(var.contribDir)\om.rr" />
             </Component>
+            <Component Id="cmp98B5394117FE1F96DA12059C74D73A12" Guid="5AA19B8E-8A7A-417C-9B69-EDC4134CA2B5">
+                <File Id="filBF809F57DAD2CA16B4D9FDD60FA41915" KeyPath="yes" Source="$(var.contribDir)\os_muldif.rr" />
+            </Component>
+            <Component Id="cmpA5CB04D04E9C83B77048CD0AB7C296D2" Guid="98ED2D78-EE26-4D8C-8608-E4A647B635E2">
+                <File Id="fil19D246B0EACE41B754811939C9811A78" KeyPath="yes" Source="$(var.contribDir)\ot_hessian_ahg.rr" />
+            </Component>
+            <Component Id="cmp2277A7B5C951A4DAB5A154455CAFEE00" Guid="FDCE894C-8CB4-4453-AD8B-CE05C9DB652E">
+                <File Id="fil977150AC0730D3BFC6B511301C0A5CBA" KeyPath="yes" Source="$(var.contribDir)\ot_hgm_ahg.rr" />
+            </Component>
+            <Component Id="cmpDA0671D816E881B0C50057122CA28C1F" Guid="A793D167-3680-4464-8376-69D1E23F54AF">
+                <File Id="fil43D5D4A98C6A05AED6A6A65463063C57" KeyPath="yes" Source="$(var.contribDir)\oxpari-win.rr" />
+            </Component>
             <Component Id="cmp82337225B19707D20DBC0A0337AB135B" Guid="AEC242E6-4FCC-4730-8C67-555099F080A6">
                 <File Id="filEF7879E0BB83A0C09746C2FE24349CA4" KeyPath="yes" Source="$(var.contribDir)\oxrfc100.rr" />
             </Component>
@@ -251,18 +278,33 @@
             <Component Id="cmp9E860A6C6942229078E5DE3F2E05BD1F" Guid="DD229CDB-039E-4756-9F90-464FF5DC3268">
                 <File Id="filC90989DC096D480BF631ABB999C72A7A" KeyPath="yes" Source="$(var.contribDir)\taka_weyl.rr" />
             </Component>
+            <Component Id="cmp9252724B140CF644F8B1E46FBD8BC280" Guid="B815B7A9-49D8-4034-80C6-4E82C51CAC0E">
+                <File Id="filBAE92D06C86A873C8E0DDE9AA974E7BA" KeyPath="yes" Source="$(var.contribDir)\test_hook.rr" />
+            </Component>
             <Component Id="cmp9B4AD281876C6032FAD7AE71DE7D4B7F" Guid="EEADF5AB-01A9-4AD0-8259-D56EC24BB6E0">
                 <File Id="fil2CFDB6B637D736CCDB657BBDE6FF5009" KeyPath="yes" Source="$(var.contribDir)\tex_symbols.rr" />
             </Component>
             <Component Id="cmp7C1DEBBAE5F3D4D5641D6AFF0AEE9584" Guid="2C933D05-A6C8-47DB-94B4-6CD576D028F6">
                 <File Id="filF2EC77F92C575D91CB2B7ED0EC5FF6C2" KeyPath="yes" Source="$(var.contribDir)\tigers.rr" />
             </Component>
+            <Component Id="cmpB99B702A3700F9A5C01B8167796339B0" Guid="7F7E2A9C-4FE0-411C-88BC-E4A0447ACBD4">
+                <File Id="fil13CB99209850E1728B7DBA16D67B7CCD" KeyPath="yes" Source="$(var.contribDir)\tk_asir_contrib_update.rr" />
+            </Component>
             <Component Id="cmpA18F1E989DE2C4D6649D1565C938E7AF" Guid="8C10959F-23C6-4CC6-9D10-F90D47507C62">
                 <File Id="fil36648D24AF94A8FCA4D5D054025EF1CD" KeyPath="yes" Source="$(var.contribDir)\tk_bess2.rr" />
             </Component>
+            <Component Id="cmpDB8606CB40EF944185838AD28276B279" Guid="E686BA14-2920-489F-B149-A972E0106CF6">
+                <File Id="filFECA462EF4250F4C8BFE49C366671200" KeyPath="yes" Source="$(var.contribDir)\tk_cc111.rr" />
+            </Component>
             <Component Id="cmpF61E7DDCA2B0497A1297AD1D991BD57A" Guid="FE76F6AA-C0C4-4D8F-8398-6F23E1C7D733">
                 <File Id="fil7FFEA67E57D6C7CACF76B0A0481A050D" KeyPath="yes" Source="$(var.contribDir)\tk_cform.rr" />
             </Component>
+            <Component Id="cmpB28D62C7C0E433C1BAF291E2C7B2C555" Guid="DDBEA92E-7E8C-4CF2-A7F3-B12688E95911">
+                <File Id="fil2FCECDE29B2293CCC4BBC0F2C56FC952" KeyPath="yes" Source="$(var.contribDir)\tk_fd.rr" />
+            </Component>
+            <Component Id="cmpD98AF800A84635E993DA53C22551F323" Guid="DAA760D9-95F3-4C47-B935-C8A3AFE5EF0E">
+                <File Id="fil50887C8CAC485C79DB81AA95A4DE9726" KeyPath="yes" Source="$(var.contribDir)\tk_hgpoly.rr" />
+            </Component>
             <Component Id="cmp301DA0BF07FDC694224C862E092D05CA" Guid="2BA54D3E-8B68-45A8-A2AE-46E5A97CEC34">
                 <File Id="fil9B6A3B901BCFC0980FDDFB932A0BEC53" KeyPath="yes" Source="$(var.contribDir)\tk_intde-1.rr" />
             </Component>
@@ -284,6 +326,9 @@
             <Component Id="cmp46FB58BFA82DF191E455554F66476A15" Guid="BD6D16F9-3711-4139-8B0C-D475ED9841B1">
                 <File Id="fil6A20BD1031EBC0E24699520EA473302B" KeyPath="yes" Source="$(var.contribDir)\tk_r.rr" />
             </Component>
+            <Component Id="cmp2AA814F1962D3DC679E0F1C6B2AC8E83" Guid="9939A348-4CEE-4A3A-89FD-8B5B617C0C70">
+                <File Id="filA5D24D59D0BD65276B78AE750585EC44" KeyPath="yes" Source="$(var.contribDir)\tk_sm1emu.rr" />
+            </Component>
             <Component Id="cmp44A12B25C84007CECCE9453B15308DCF" Guid="C0A6B604-01B1-45A3-A7D2-691F64166D2A">
                 <File Id="fil4B9E22FF30AD98D128A224AE655FFE89" KeyPath="yes" Source="$(var.contribDir)\tk_test1.rr" />
             </Component>
@@ -321,6 +366,23 @@
                     <File Id="filCE65A22DDA02F8AE5BCF28AC52EACFD7" KeyPath="yes" Source="$(var.contribDir)\f_res\tools.rr" />
                 </Component>
             </Directory>
+             <Directory Id="dir7E151A1F00ABC885CA5B521CDCF178B3" Name="gtt_ekn">
+                 <Component Id="cmpC991C9BD192492AE06CED6C20AFBA3A6" Guid="452600DD-C464-4712-ADE1-1A28DA1F15FB">
+                     <File Id="filCE241B5776F9E09944939FD12B287ED3" KeyPath="yes" Source="$(var.contribDir)\gtt_ekn\childprocess.rr" />
+                 </Component>
+                 <Component Id="cmp637F03462E60265A18AE8AFDB8B0958F" Guid="2911CA59-25A7-4F98-83BC-FE44272B69AB">
+                     <File Id="fil3E6A1E80ACBCFE916AA9910953B504F7" KeyPath="yes" Source="$(var.contribDir)\gtt_ekn\ekn_eval.rr" />
+                 </Component>
+                 <Component Id="cmpAE9568D61D82CE79B6C125DA3694CC36" Guid="F93DDA25-0733-4D45-81B3-ABA5ADA6754B">
+                     <File Id="fil01A28A5F3A8DBE84FA370965E96925EC" KeyPath="yes" Source="$(var.contribDir)\gtt_ekn\ekn_pfaffian_8.rr" />
+                 </Component>
+                 <Component Id="cmpE304922E7E13BD7FB91D695DDF8F1B7F" Guid="4037AEF5-283C-4E5D-B924-7F3677855CE8">
+                     <File Id="fil03672136BD94745F595FAABD287A0958" KeyPath="yes" Source="$(var.contribDir)\gtt_ekn\g_mat_fac.rr" />
+                 </Component>
+                 <Component Id="cmp7D9E83CAB14FEE1D6E0D161DE7DA3758" Guid="A135AB40-2166-421B-B92E-BC42940CE0AB">
+                     <File Id="filE5114F2D97C64DECC2FA5A672953415F" KeyPath="yes" Source="$(var.contribDir)\gtt_ekn\test-tb1.rr" />
+                 </Component>
+             </Directory>
             <Directory Id="dirB98DA44485958D0A5A0102F933B8BA30" Name="nk_gfan_4ti2">
                 <Component Id="cmpA431B34D5A19FAA5F137432B9477B38B" Guid="2B39E44A-3187-4AE7-A8A1-2131665FF8E7">
                     <File Id="fil527734511A7CD7BA9BECF24EBF3E85EB" KeyPath="yes" Source="$(var.contribDir)\nk_gfan_4ti2\4ti2_rr.rb" />
@@ -413,12 +475,14 @@
             <ComponentRef Id="cmp98FA59BDC9476BB84C9F44DCC912D893" />
             <ComponentRef Id="cmpD94BAFF16E666E49D42DD37BB0DEEBDE" />
             <ComponentRef Id="cmp8CDFDD4D149A75F128EC229F16398FFC" />
+            <ComponentRef Id="cmp151795882726CE28AA1DF4CA49F04858" />
             <ComponentRef Id="cmp2EBC516B2C2DCB78D20204511C5C10B9" />
             <ComponentRef Id="cmpD094D2D8AFC1CCFB545DACDD89D49705" />
             <ComponentRef Id="cmpB259F4D4488F025ECC3ABAAD34A05494" />
             <ComponentRef Id="cmpDD2275DDC27DB570BDB169FAB4AD60A7" />
             <ComponentRef Id="cmp32023A87036713F5E150A11AFF53ADD8" />
             <ComponentRef Id="cmp2FAEA5454A0C13E322726EF61B5EE3DC" />
+            <ComponentRef Id="cmp3763531955F384D9627F8DA37211A318" />
             <ComponentRef Id="cmp158C869D798AF1DD1E2B0917880334C4" />
             <ComponentRef Id="cmp1C4C3737B2E00B0CC815327FF18FC405" />
             <ComponentRef Id="cmp470149447EDAF19E4A6EC75B04231042" />
@@ -427,9 +491,12 @@
             <ComponentRef Id="cmpF8995920067F1A81388DF993BF75D2E8" />
             <ComponentRef Id="cmp72B8273B53A130EDBF06D17D7670359F" />
             <ComponentRef Id="cmp5CCFFEB48311C4964BD28C11FC9809E6" />
+            <ComponentRef Id="cmp4EE34ED6B0A40B6338FC4F6D943EF595" />
             <ComponentRef Id="cmp65748E6017684E8FDEF66C7C2D70BCCB" />
+            <ComponentRef Id="cmp683AE228E98077755EAB5E5305166180" />
             <ComponentRef Id="cmpC251678517D46321743D6C19C4047A72" />
             <ComponentRef Id="cmpF70FBA9207EF39BCE28811F8B18D3C40" />
+            <ComponentRef Id="cmp41E15856624364326C1C81C08B9CF95F" />
             <ComponentRef Id="cmp7DECBFF38704400E06C98A02C3F82A95" />
             <ComponentRef Id="cmp9F63BF783837E82C54BBA8CD4EAD3083" />
             <ComponentRef Id="cmpC7D1881810843269B2D07A7E24BCC87C" />
@@ -450,6 +517,10 @@
             <ComponentRef Id="cmp8C9D29AD8A5E7BD3E60291C9FEDE35EF" />
             <ComponentRef Id="cmp0117FC7A9F5040725826035228FC2AD3" />
             <ComponentRef Id="cmpF6854F57B9B062796479DB9006FE6363" />
+            <ComponentRef Id="cmp98B5394117FE1F96DA12059C74D73A12" />
+            <ComponentRef Id="cmpA5CB04D04E9C83B77048CD0AB7C296D2" />
+            <ComponentRef Id="cmp2277A7B5C951A4DAB5A154455CAFEE00" />
+            <ComponentRef Id="cmpDA0671D816E881B0C50057122CA28C1F" />
             <ComponentRef Id="cmp82337225B19707D20DBC0A0337AB135B" />
             <ComponentRef Id="cmp27F3D0188A11974BE75367286064B580" />
             <ComponentRef Id="cmp2C80985970F202136088982CD2957720" />
@@ -482,10 +553,15 @@
             <ComponentRef Id="cmpCEBEEEDD118A63E85EE917455D003981" />
             <ComponentRef Id="cmp5979478AFE1EEDB79D2288174DE2873E" />
             <ComponentRef Id="cmp9E860A6C6942229078E5DE3F2E05BD1F" />
+            <ComponentRef Id="cmp9252724B140CF644F8B1E46FBD8BC280" />
             <ComponentRef Id="cmp9B4AD281876C6032FAD7AE71DE7D4B7F" />
             <ComponentRef Id="cmp7C1DEBBAE5F3D4D5641D6AFF0AEE9584" />
+            <ComponentRef Id="cmpB99B702A3700F9A5C01B8167796339B0" />
             <ComponentRef Id="cmpA18F1E989DE2C4D6649D1565C938E7AF" />
+            <ComponentRef Id="cmpDB8606CB40EF944185838AD28276B279" />
             <ComponentRef Id="cmpF61E7DDCA2B0497A1297AD1D991BD57A" />
+            <ComponentRef Id="cmpB28D62C7C0E433C1BAF291E2C7B2C555" />
+            <ComponentRef Id="cmpD98AF800A84635E993DA53C22551F323" />
             <ComponentRef Id="cmp301DA0BF07FDC694224C862E092D05CA" />
             <ComponentRef Id="cmp73DAB3216C9E9CC2129561F8359EBA26" />
             <ComponentRef Id="cmp899FA28684D99E515D872932130926B8" />
@@ -493,6 +569,7 @@
             <ComponentRef Id="cmpDADDBE9C37113516164A48AAAACEB5D5" />
             <ComponentRef Id="cmp9E0BCB90D083FFF3BA1CEB447BBA9084" />
             <ComponentRef Id="cmp46FB58BFA82DF191E455554F66476A15" />
+            <ComponentRef Id="cmp2AA814F1962D3DC679E0F1C6B2AC8E83" />
             <ComponentRef Id="cmp44A12B25C84007CECCE9453B15308DCF" />
             <ComponentRef Id="cmp9E268F28AA7D96EF0123578CABBB1789" />
             <ComponentRef Id="cmp303CCBE595A41FFDF46860003E7F72A9" />
@@ -504,6 +581,11 @@
             <ComponentRef Id="cmpC568240CFC2061863D48515C9C7F42A9" />
             <ComponentRef Id="cmpAC361EA4C98AE50F4242EDA9AEE9C77B" />
             <ComponentRef Id="cmp7F7D6F3BF4EAB254E0B959C9E6DD226C" />
+            <ComponentRef Id="cmpC991C9BD192492AE06CED6C20AFBA3A6" />
+            <ComponentRef Id="cmp637F03462E60265A18AE8AFDB8B0958F" />
+            <ComponentRef Id="cmpAE9568D61D82CE79B6C125DA3694CC36" />
+            <ComponentRef Id="cmpE304922E7E13BD7FB91D695DDF8F1B7F" />
+            <ComponentRef Id="cmp7D9E83CAB14FEE1D6E0D161DE7DA3758" />
             <ComponentRef Id="cmpA431B34D5A19FAA5F137432B9477B38B" />
             <ComponentRef Id="cmp2483EEE62F64C994464C6D48475A33B6" />
             <ComponentRef Id="cmp2BF7A9F54ECCC9FF35A60039F1559583" />