Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changing the directory structure #169

Merged
merged 3 commits into from Jul 17, 2019
Merged

changing the directory structure #169

merged 3 commits into from Jul 17, 2019

Conversation

DStrelak
Copy link
Collaborator

@DStrelak DStrelak commented Jul 2, 2019

No description provided.

Copy link
Contributor

@cossorzano cossorzano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

@dmaluenda
Copy link
Member

How this will affect to the developers? How to proceed?

I mean, after this pull request is merge, we should warn to all people that they must move the Xmipp repository from xmipp-bundle/src/xmipp to xmipp-bundle/. In this way, all the already compiled files are spread in the xmipp-repo home and it should be removed...

Another option is to ask people to start from the beginning. And after code is there, they can bring his branches there, but that branches must be merged with devel first...

We should define a very clear instructions to proceed...

@DStrelak
Copy link
Collaborator Author

DStrelak commented Jul 4, 2019

Yes, the most clean way is to start from scratch (I am willing to take the blame by sending the email), as manual changes might end up corrupting the repo.
As for the branches, I dare say people will get merge conflicts. There are ways how to solve them (see link and link)
I will talk now to @fede-pe, @ajimoreno and @rsanchezgarc. If they can merge their PRs before this one, it will make our lives easier.

@dmaluenda
Copy link
Member

Ok. Even though, we have to take into account the rest of people that use xmipp in devel mode (i.e. installed from the xmipp-bundle instead of from scipion installer).

For that reason, we need a clear instructions (maybe that mail in the wiki) to point people there.

@DStrelak
Copy link
Collaborator Author

DStrelak commented Jul 5, 2019

Ok, I will prepare sth later today

@delarosatrevin
Copy link
Member

I totally agree with @dmaluenda that would be good to have clear instructions how to install Xmipp with these changes...both from Scipion or standalone. I always install Xmipp with Scipion, but from sources and using the bundle, not the plugin manager.

@dmaluenda
Copy link
Member

dmaluenda commented Jul 5, 2019

Well, the installation via Scipion will be exactly following the same way (from the user point of veiew) for all the standard installation ways (command line and plugin manager, using binaries or sources). Even, a clear installation of xmipp-bundle is 'almost' exactly in the same way than before (even more clear).

The issues become when you want to merge your own branches to this new structure. Or, if you are using xmipp-bundle, then a ./xmipp git pull (after this PR merge) will perform a tricky behavior.

@DStrelak
Copy link
Collaborator Author

DStrelak commented Jul 5, 2019

Indeed. That's gonna be, how to put it mildly, unsettling for a while :D

@dmaluenda
Copy link
Member

dmaluenda commented Jul 8, 2019

Great!! I agree with the change in the readme and in the doc, excepting for the hint to a Scipion user.

I think that in that case, they haven't to do anything. When a new plugin version will be available, that version will have associated a new bundle set (sources, bin_Centos, bin_Debian) in this new structure (and new code) and it will be installed as usual. Therefore, I suggest this change in the doc:

What does it mean for me as a user?

  • In Scipion: Nothing to do. Just update the plugin version and the binaries when available.

@DStrelak
Copy link
Collaborator Author

DStrelak commented Jul 8, 2019

When a new plugin version will be available, that version will have associated a new bundle set (sources...)

Do I understand correctly that updating Xmipp (as sources) will result in deleting the entire folder, new clone and build? If so, is there some routine which was (re)moving Xmipp repository files? Or did it checkout the Xmipp script only?

# Conflicts:
#	.gitignore
#	README.md
@DStrelak DStrelak merged commit 18cf40b into devel Jul 17, 2019
@cossorzano cossorzano deleted the ds_changingDirStructure branch October 22, 2019 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants