Ecosyste.ms: Awesome
An open API service indexing awesome lists of open source software.
https://github.com/haf/castle.releases
Test for sharing utils
https://github.com/haf/castle.releases
Last synced: about 1 month ago
JSON representation
Test for sharing utils
- Host: GitHub
- URL: https://github.com/haf/castle.releases
- Owner: haf
- Created: 2011-04-28T17:38:13.000Z (over 13 years ago)
- Default Branch: master
- Last Pushed: 2011-05-16T11:56:27.000Z (over 13 years ago)
- Last Synced: 2024-10-19T21:17:46.425Z (2 months ago)
- Language: Ruby
- Homepage:
- Size: 109 KB
- Stars: 0
- Watchers: 2
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# Castle Releases
A getting-started tutorial in git form.
## What it does:
It lets you add a subtree to `/buildscripts` which contains:
* nice-to-have rake/albacore tasks which haven't been merged with a release of albacore yet
* ilmerge
* ilmerge config
* environment configuration through tasks (e.g. `env:release` or for 'product'-type releases: `env:rc[3]`)
* utility scripts for copying
* utility scripts for http://nvie.com/posts/a-successful-git-branching-model/
* resharper naming conventions for the castle project
* this readme
## How to use:
If you have a previous /buildscripts folder (1-6), otherwise, step 7:
1. Remove the buildscripts from git's index.
2. You can squash this commit with 'git rebase -i HEAD~1' and then 's'-key, if you feel up for it.
3. Make tmp branch and switch to it to place old buildscripts in it
4. Add buildscripts to this branch
5. Commit these changes to the tmp branch
6. Go back to the branch you came from
1-6:
```
git rm -r --cached buildscripts
git commit -m "intermediate commit to remove buildscripts from index."
git checkout -b tmp
git add .
git commit -m "branch with buildscripts"
git checkout master
```
You're done with saving what has been in buildscripts. Now let's add the subtree.
[More Info](http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html)
- name the other project "Releases", and fetch.
- prepare for the later step to record the result as a merge.
- read "master" branch of Releases to the subdirectory "buildscripts".
- record the merge result.
7-10:
```
git remote add -f Releases https://[email protected]/haf/Castle.Releases.git
git merge -s ours --no-commit Releases/master
git read-tree --prefix=buildscripts/ -u Releases/master
git commit -m "Merge Releases project as our subdirectory"
```
If you have branched off your previous /buildscripts, merge it back in (11-12), otherwise skip this step.
11-12:
```
git merge tmp
git branch -d tmp
```
You have applied the code in Releases! Congrats!
Maintain the result with subsequent merges using the "subtree" strategy:
```
git pull -s subtree Releases master
```
# What now?
When this is done, enjoy your work and start configuring your project! First
you'll need the rakefile, so do
```
mv buildscripts/rakefile.rb ./rakefile.rb
```
then update these files with your project data and paths:
* buildscripts/project_data.rb
* buildscripts/paths.rb
then verify that you have a tools directory and that it contains whatever paths.rb points to.