Skip to content

Transfer to new a directory structure

Jump to bottom
DStrelak edited this page Jul 16, 2019 · 8 revisions

New directory structure

With the pull request 169, we have changed the directory structure of the Xmipp repository.

Why?

We want to simplify the installation and allow external tools to analyze our code

What does it mean for me as a user?

We recommend you to remove the current installation and replace it with a new version:

  • In Scipion: Nothing to do. Just update the plugin version and the binaries when available.
  • In Standalone: remove entire Xmipp folder, clone the repository again and run xmipp script in the root

What does it mean for me as a developer?

To avoid possible issues, we recommend you to move entire Xmipp folder to a backup directory, clone the repository again and run xmipp script in the root.

cd
mv xmipp-bundle xmipp-bundle-BKUP
git clone https://github.com/I2PC/xmipp xmipp-bundle

In case you have an existing branch (with old directory structure), you might experience merge conflict while creating a PR to the new directory structure. First, try if this affects you:

  1. git checkout devel
  2. git pull
  3. git checkout myDevelBranch # change to your original branch
  4. git merge

If you don't get any merge conflict, then you are good to go. Otherwise:

  • try to resolve the merge conflict using mergetool of your choice (e.g. KDiff3).
  • try to create a patch with your changes, and manually change the file paths, as described here

Make sure that any deleted / newly created file is in proper location.

If none of this works, please contact us at i2pc@cnb.csic.es

Developed by xmipp team

Clone this wiki locally