Aurora-Sim/Development/en
De DigiWiki.
| Ligne 1 : | Ligne 1 : | ||
| - | {{Languages|Developer | + | {{Languages|Aurora-Sim/Developer/Documentation}} |
| - | + | ||
= Developing Aurora-Sim = | = Developing Aurora-Sim = | ||
| - | |||
NOTES: This really should be split into many pages each large section probably becoming a page | NOTES: This really should be split into many pages each large section probably becoming a page | ||
Needs cleaned up, and a bit more 'beef' added to it | Needs cleaned up, and a bit more 'beef' added to it | ||
| - | |||
=== Documentation and Code Contribution Home === | === Documentation and Code Contribution Home === | ||
| - | |||
Documentation references can be found at [[Developer_Documentation|our documentation home]]. | Documentation references can be found at [[Developer_Documentation|our documentation home]]. | ||
| - | |||
===Getting the Source Code=== | ===Getting the Source Code=== | ||
| - | |||
The Aurora-Sim source code is hosted at https://github.com/ and can be accessed at <pre>https://github.com/aurora-sim/aurora-sim/</pre> and this uses git as the source versioning system. | The Aurora-Sim source code is hosted at https://github.com/ and can be accessed at <pre>https://github.com/aurora-sim/aurora-sim/</pre> and this uses git as the source versioning system. | ||
| - | |||
The source code can be pulled directly from | The source code can be pulled directly from | ||
| - | |||
<pre>git clone https://github.com/aurora-sim/Aurora-Sim.git</pre> | <pre>git clone https://github.com/aurora-sim/Aurora-Sim.git</pre> | ||
| - | |||
====Git help==== | ====Git help==== | ||
| - | |||
''How to create a new instance of the git repository.'' | ''How to create a new instance of the git repository.'' | ||
This will create a new folder named Aurora-Sim and download/pull all the files in the repository from the server. | This will create a new folder named Aurora-Sim and download/pull all the files in the repository from the server. | ||
| Ligne 28 : | Ligne 18 : | ||
<pre>git clean -xf -d && git pull</pre> | <pre>git clean -xf -d && git pull</pre> | ||
This will remove any changed files before merging newer changes into the local repository. | This will remove any changed files before merging newer changes into the local repository. | ||
| - | |||
=====Git Branches===== | =====Git Branches===== | ||
| - | |||
Sometimes git repositories have multiple branches/versions. | Sometimes git repositories have multiple branches/versions. | ||
It is possible to list current branches with.. | It is possible to list current branches with.. | ||
| Ligne 41 : | Ligne 29 : | ||
<pre>git branch <branch name> | <pre>git branch <branch name> | ||
git checkout <branch name></pre> | git checkout <branch name></pre> | ||
| - | |||
=====Git Remotes===== | =====Git Remotes===== | ||
| - | |||
A remote is like a link to another repository, it can allow you to merge or cheery-pick commits/patches from other projects. | A remote is like a link to another repository, it can allow you to merge or cheery-pick commits/patches from other projects. | ||
| Ligne 59 : | Ligne 45 : | ||
Checkout remote branch | Checkout remote branch | ||
<pre>git checkout -b <remote name> <branch name></pre> | <pre>git checkout -b <remote name> <branch name></pre> | ||
| - | |||
=====Git Cherrypicking===== | =====Git Cherrypicking===== | ||
| - | |||
It may be nessicary to update the repositories before cherry-picking. | It may be nessicary to update the repositories before cherry-picking. | ||
<pre>git remote update</pre> | <pre>git remote update</pre> | ||
Version du 24 janvier 2012 à 01:36
Sommaire |
Developing Aurora-Sim
NOTES: This really should be split into many pages each large section probably becoming a page
Needs cleaned up, and a bit more 'beef' added to it
Documentation and Code Contribution Home
Documentation references can be found at our documentation home.
Getting the Source Code
The Aurora-Sim source code is hosted at https://github.com/ and can be accessed athttps://github.com/aurora-sim/aurora-sim/and this uses git as the source versioning system.
The source code can be pulled directly from
git clone https://github.com/aurora-sim/Aurora-Sim.git
Git help
How to create a new instance of the git repository. This will create a new folder named Aurora-Sim and download/pull all the files in the repository from the server.
How to update an existing repository
First change into the repository directory, and run
git clean -xf -d && git pull
This will remove any changed files before merging newer changes into the local repository.
Git Branches
Sometimes git repositories have multiple branches/versions. It is possible to list current branches with..
git branch
It is possible to change the branch with
git checkout <branch>
In cases where you want to experiment with code it is best to create your own branch, this can be done like so.
git branch <branch name> git checkout <branch name>
Git Remotes
A remote is like a link to another repository, it can allow you to merge or cheery-pick commits/patches from other projects.
Please ensure you read the terms and conditions of all projects/repositories involved with development.
To add a remote the syntax is: git remote add <name> <uri>, and then a "git fetch" is required update tracking. git remote update, updates the local repository.
git remote add opensim https://github.com/opensim/opensim.git git fetch git remote update
List remote branches
git branch -r
Checkout remote branch
git checkout -b <remote name> <branch name>
Git Cherrypicking
It may be nessicary to update the repositories before cherry-picking.
git remote update
Cherry-picking commits from remote branches
git cherry-pick <commit ID
Checking conflicts
git diff
Commiting all changed files
git commit -a


