Version 5 (modified by 16 years ago) (diff) | ,
---|
TOL Development
Experienced users and developers of Tol use several resources available in this pages to access the Tol source code and to develop in a collaborative way.
Are you a experienced user?
If you feel you are an advanced TOL user and are interested in helping the TOL team, you can do it by updating the Documentation project. Tol documentation is in a very poor state. The current development and bug fixing rate makes it very hard for developers to keep documentation up to date.
If you want to contribute to the documentation project contact the devel at tol-project.org.
Will we ever use other languages?
Tol is being developed by a spanish-speaking community of mathematicians, economists and software engineers.
Nevertheless, Tol language's syntax has been done in English, and TolBase interface can be used in both languages, English and Spanish. You can also find some of the documentation in both languages.
All Tol users worldwide are welcome to translate Tol and Tolbase into all other languages. If you want to contribute, please check the state of Tol translation to read about how you can help us translating the project into your language.
SVN usage
The version control used by TOL develpoment team to share code and resources is Subversion (SVN).
You can find here a good introduction to SVN.
The best interface of SVN for Windows is Tortoise SVN using WinMerge as diff tool.
The recommended interface for Linux is RapidSVN using meld as diff tool.
Starting
Creating a branch
When trunk version is released as Official version a branch must be created to allow parallel evolution. Another posible use of branches is trying new features.
- Move to the tolp root of your local copy
- Update remote changes
- Comit all local changes
- Make the remote branch as a copy of current trunk, for example
svn copy https://www.tol-project.org/svn/tolp/trunk \ https://www.tol-project.org/svn/tolp/branches/tol_v_1_1_7 \ -m "Branch for official version TOL v.1.1.7"
- Gets a local copy of new branch
svn update branches/tol_v_1_1_7
Recovering a trying branch to trunk
- Move to the tolp root of your local copy
- Update remote changes in both trunk and trying branch
- Comit all local changes in both trunk and trying branch
- Merge changes from in both trying branch to trunk
svn merge https://www.tol-project.org/svn/tolp/branches/my_trying_branch https://www.tol-project.org/svn/tolp/trunk trunk
- If there is a conflict you will be asked in order to select one of two versions or pospone the decision. So you must monitorice the console from time to time.
- If there new or deleted files in the branch you must add or remove them manually.
- When there is no pendent conflict commit all changes