-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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
Fix docs missings & improve dev scripts #1981
Conversation
LeoColomb
commented
Mar 29, 2013
- Move installation guide of specific platform in INSTALL.md instead of readme.txt
- Leave all docs guides in docs folder
- ...
CodeBlocks link didn't get anything
osxSL is not anymore a platform for building
👍 to the gitignore changes. |
@bilderbuchi Also, there are ~20 @arturoc What do think about this PR? |
this is only partly right - the "important" ones are only 4 - .gitignore, apps/.gitignore, addons/.gitignore, examples/.gitignore, and they are distributed like that to precisely avoid one huge gitignore file with a lot of special rules to only affect subpaths etc. Instead we have all the general ignore patterns in the root .gitignore file, and the subpath-relevant (e.g. for "official" addons) in the respective subpath. most of the others are necessary placeholders to be able to check empty folders into the git repo (all thos with "Ignore everything in here apart from the .gitignore file" in them), or ignore files for specialist applications (e.g. /dev/style/) for which it would make no sense to pollute/bloat the more general gitignore files higher up in the tree. |
looks great to me, are really there so many gitignores? in that case we should remove some but i think having gitignores in important folders like addons, examples and apps can be useful |
didn't read this before:
to check empty folders we switched to a .gitkeep file in examples that's better cause that way we avoid ignoring the contents of that folder, if there's any folder with .gitignore still it should be changed to .gitkeep |
but sometimes you want to have empty folders in the repo, which stay empty (i.e. ignore everything except gitignore). gitkeep does not do this. example: the gitignores in the libs folders. |
that does not always make sense: if we wanted to not ignore content in that folder, the content would be in there and we wouldn't need a gitkeep. if not, the content is user-specific or autogenerated, and thus should not be in the repo. thus, the gitignore which ignores everything except itself. gitkeep makes sense where we want to show users that e.g. there's a /data folder, but we don't use it for anything (i.e. the example doesn't put anything there), but without a dummy file in it we could not commit it as git does not see empty directories. |
the one which could be optimized away would be the one in SerialTest. the ones in apps/devApps/AdvancedImageLoading and /libs/openFrameworksCompiled/lib/*/ could probably be optimized away, but you would have to replace them with gitkeep files, and some rules in the upper gitignores to not ignore those gitkeep files. number of files stays the same, number of rules grow, i'm not sure it would be worth it, since the current gitignore files are pretty explicit about what they do. if you wonder why you can't commit files which are in there, there's a gitignore file right there telling you why, instead of some special path-adapted rule in another gitignore 3 levels up the file tree. |
@bilderbuchi @arturoc OK, so I tried something "just for fun", see my latest commits. What do you think about this? |
I'm sorry, I have to ask, how familiar are you with the gitignore logic? It's unfortunate that you put all your changes into one commit, this way it's really hard to isolate the good/neutral changes from the bad. There are some things in there which are ok and make sense. There are some redundant changes in there. There are some things which I think are wrong. Unfortunately I currently can't test this rigorously. Also, these changes have nothing to do with this PR, but will keep it from being merged until this is resolved. A better way (for the future) is to submit a separate PR for a separate topic. Considering how complicated it is/was to arrive at a working gitignore system (and this doesn't even consider people force-committing things improperly instead of correcting rules), I vote for removing these two commits. Actually, I'd prefer you to rebase them out of the PR. If you only revert, your commits/changes will pollute the git history (as you will show up as the last committer). Unfortunately, this could mean bad things for whoever pulled your branch in the meantime - another reason to follow our contribution policy and keep PR topics separated (especially if they're "just for fun"). In any case, I downloaded the patch files of your commits, so the work is not lost. Hopefully I'll get around to teasing out the good changes sometime, next time I streamline the gitignore structure. |
Yes, I do. I have tested it about 1 hours, make modifications in files, create new ones and new folder, modify hierarchy, ..., and try to commit all of this changes separately, and never use
It's true, I'm sorry.
Right, I'm sorry. I will close this PR and create the same but without latest ignore diffs. |
Edit: In fact, no problem in official addons. |
OK, thank you.
Are you sure? This is not correct afaik - I just tried and can edit e.g. ofxOsc without problems, and git will pick it up. Although I just realized that ofxSynth and ofxThreadedImageLoader are missing in the list of official addons. You know what, I'll open a new issue for the gitignore changes (edit: #2057), and we'll move the discussion over theree, collect all the problems, and then I'll make a PR based on your work. |
@bilderbuchi Rebasing succeeded. So, good to merge? |
looks good to me, but I can't judge the packaging script, but @arturoc seems to have already approved the changes? |
Yes => here |
nah, I'll do that, I got your commits. some other stuff to fix anyway. |
@arturoc so finally, is that good? |
yes seems good to me |
@arturoc so will you merge it, or should I do it? |
Fix docs missings & improve dev scripts