For example, if you are working on ProjectFoo in GitHub, somewhere there will be a ProjectFoo folder on your local disk that contains a README.me, .gitignore, and folders such as src and test. I will assume that this has been done, plus your project, in this state, already exists on GitHub as github.com/UserName/ProjectFoo.git.
You want your javadocs to go into a completely separate folder from your main project. Otherwise you are constantly switching back and forth. I have organized my projects as follows, splitting my "master" GIT_FOLDER into master and gh-pages subfolders:
GIT_FOLDER (all git projects go here)
master
ProjectFoo
ProjectSomeOther
gh-pages
ProjectFoo
ProjectSomeOther
You don't have to follow this arrangement. But the important thing is to get the javadocs separated from the main project so the branches don't keep stepping on each other.
Initial Setup
cd to GIT_FOLDER/gh-pages (or, if you have a different setup for the gh-pages branch, to the corresponding folder) and open a Command Window.Checkout your main branch there
>git clone https://github.com/UserName/ProjectFoo.git
This will create a folder GIT_FOLDER/gh-pages/ProjectFoo. CD there and check your branch.
>cd ProjectFoo.
>git branch
* master
Do not create a gh-pages branch yet! Instead, checkout a new orphan branch named gh-pages
>git checkout --orphan gh-pages
Switched to a new branch 'gh-pages'
In my experience, git still says you are on master if you go git branch, but ignore that for now, it will eventually figure things out.
A directory command (dir /A /B) should show your Java code, with src and possibly test folders, something like:
.git
.gitignore
LICENSE
README.md
src
test
All you want here are the javadocs.
- Delete the LICENSE file, and the src and test folders.
- Create (or copy) the javadocs to a folder named javadocs.
- Double check that .gitignore isn't doing anything too goofy
Your folder should now contain:
.git
.gitignore
javadocs
README.md
.gitignore
javadocs
README.md
Check your git status. It should now have the correct branch. Your list of deleted files will vary.
>git status
# On branch gh-pages
# Changes not staged for commit:
# (use "git add/rm ..." to update what will be committed)
# (use "git checkout -- ..." to discard changes in working directory)
#
# deleted: LICENSE
# deleted: src/com/company/package/SomeFile1.java
# deleted: src/com/company/package/SomeFile2.java
# deleted: src/com/company/package/package-info.java
# deleted: test/com/company/package/SomeFile1Test.java
#
# Untracked files:
# (use "git add ..." to include in what will be committed)
#
# javadocs/
Add javadocs to the repository. You may see warnings about line endings.
>git add javadocs
Commit them. You may see warnings about line endings.
>git commit -m "1st checkin of javadocs"
Now, commit everything else to delete the src and test folders
>git commit -a -m "deleted src from gh-pages"
As a final check, git status should now be clean and git branch shows the new branch:
>git status
# On branch gh-pages
nothing to commit, working directory clean
>git branch
* gh-pages
master
Finally, push to GitHub.
>git push origin gh-pages
Username for 'https://github.com': UserName
Password for 'https://UserName@github.com':
Counting objects: ...
... reused 0 (delta 0)
... reused 0 (delta 0)
To https://github.com/UserName/project.git
* [new branch] gh-pages -> gh-pages
Now, you can login to GitHub with your browser, and you should see the new branch. Assuming you want a prominent link to these javadocs, go to the main branch and add this line somewhere in the README file:
[JavaDocs are here](http://UserName.github.io/ProjectFoo/javadocs/)
For an example, see my Nava project.
Later on, how to update the JavaDocs:
- Generate (or copy) them into that javadocs folder
- Open a command window there
- git status to see whats going on. You should be on the gh-pages branch!
- You will probably need to add some new docs: git add .
- git commit -m "some comment"
- git status (if you are paranoid)
- git push origin gh-pages
- git status Everything should be clean.
No comments:
Post a Comment