983438 - reference xilinx_vip packages for the non-precompile simulation flow

[rajklair]

GK: please merge to XilinxTclStore master branch (xsim app, priority-p1). Thanks.

[rajklair]

Please update 2017.3 and 2018.1 catalogs. Thanks

[binochotta]

If the changes are needed for 2018.1, you have to modify 2018.1-dev branch. Updating 2018.1 catalog on master branch will not work as P4 automation is pulling content from 2018.1-dev git branch. Thanks, Bin From: rajklair [mailto:[email protected]] Sent: Tuesday, September 12, 2017 10:51 AM To: Xilinx/XilinxTclStore <[email protected]> Cc: Subscribed <[email protected]> Subject: Re: [Xilinx/XilinxTclStore] 983438 - reference xilinx_vip packages for the non-precompile simulation flow (#605) Please update 2017.3 and 2018.1 catalogs. Thanks — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub<#605 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AC5-O6hzCv2vMqiot7q_nCOms8aE1XcUks5shsSagaJpZM4PT0ZI>.

[rajklair]

Thanks. I will publish to 2018.1-dev separately. Please update 2017.3 catalog only.

[dbmccrohan]

I looks like there are merge errors when I reach step 7 of the merge flow<http://confluence.xilinx.com/display/XSW/Tclstore+Gatekeeper+Checklist>: tclstore update_repo -repo . -merge 605 -v -I- Start logging messages to '/proj/cogsparusr/sandboxes/mccrohan/tmp/tclstore/605/tclstore.log' on Tue Sep 12 14:24:32 MDT 2017.

…

-I- git: /tools/batonroot/rodin/devkits/lnx64/git-1.9.5/bin/git -I- git version: 1.9.5 -I- curl: /usr/bin/curl -I- current Git branch '2017.3-dev' -I- merging a pull request (605) on branch '2017.3-dev' (upstream::refs/pull/605/head) -E- Git command failed ------------------------------------------------------- Auto-merging catalog/catalog_2017.3.xml CONFLICT (content): Merge conflict in catalog/catalog_2017.3.xml Automatic merge failed; fix conflicts and then commit the result. From https://github.com/Xilinx/XilinxTclStore * branch refs/pull/605/head -> FETCH_HEAD ------------------------------------------------------- -I- Git log for branch '2017.3-dev' (last 2 commits) 926ad0e -update catalog 2eb41d3 write_project_tcl - fixes related to rm and bd creation -I- reverting to Git branch '2017.3-dev' -E- Git command failed -I- reverting to Git branch '2017.3-dev' -E- Git command failed catalog/catalog_2017.3.xml: needs merge error: you need to resolve your current index first -I- Stop logging messages to 'tclstore.log' on Tue Sep 12 14:24:34 MDT 2017. Raj, can you please look into this and generate a new pull request?

-dm From: rajklair [mailto:[email protected]] Sent: Tuesday, September 12, 2017 11:06 AM To: Xilinx/XilinxTclStore <[email protected]> Cc: Subscribed <[email protected]> Subject: Re: [Xilinx/XilinxTclStore] 983438 - reference xilinx_vip packages for the non-precompile simulation flow (#605) Thanks. I will publish to 2018.1-dev separately. Please update 2017.3 catalog only. — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub<#605 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AEWeH_HJYn1UGh2Yp0kvqqZo458Aev50ks5shsgPgaJpZM4PT0ZI>.

[dbmccrohan]

Close/reject due to merge conflicts.