From e160594f7f0417de9ec04105feab261ed3bd9dc3 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 25 Apr 2014 09:18:12 -0400 Subject: [PATCH] Merge pull request #178 from Hybris95/fr_traduction --- README.markdown | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/README.markdown b/README.markdown index e1a5fa8..fb8632f 100644 --- a/README.markdown +++ b/README.markdown @@ -1,35 +1,40 @@ Gitblit ================= -Gitblit is an open source, pure Java Git solution for managing, viewing, and serving [Git](http://git-scm.com) repositories.<br/> +Gitblit is an open source, pure Java Git solution for managing, viewing, and serving [Git](http://git-scm.com) repositories. More information about Gitblit can be found [here](http://gitblit.com). License ------- -Gitblit is distributed under the terms of the [Apache Software Foundation license, version 2.0](http://www.apache.org/licenses/LICENSE-2.0).<br/> +Gitblit is distributed under the terms of the [Apache Software Foundation license, version 2.0](http://www.apache.org/licenses/LICENSE-2.0). The text of the license is included in the file LICENSE in the root of the project. Java Runtime Requirement ------------------------------------ -Gitblit requires at Java 6 Runtime Environment (JRE) or a Java 6 Development Kit (JDK). +Gitblit requires at Java 7 Runtime Environment (JRE) or a Java 7 Development Kit (JDK). Getting help ------------ -Read the online documentation available at the [Gitblit website](http://gitblit.com)<br/> +Read the online documentation available at the [Gitblit website](http://gitblit.com) Issues, binaries, & sources @ [Google Code](http://code.google.com/p/gitblit) Building Gitblit ---------------- [Eclipse](http://eclipse.org) is recommended for development as the project settings are preconfigured. -1. Import the gitblit project into your Eclipse workspace.<br/> +1. Import the gitblit project into your Eclipse workspace. *There will be lots of build errors.* -2. Using Ant, execute the `build.xml` script in the project root.<br/> +2. Using Ant, execute the `build.xml` script in the project root. *This will download all necessary build dependencies and will also generate the Keys class for accessing settings.* 3. Select your gitblit project root and **Refresh** the project, this should correct all build problems. -4. Using JUnit, execute the `com.gitblit.tests.GitBlitSuite` test suite.<br/> +4. Using JUnit, execute the `com.gitblit.tests.GitBlitSuite` test suite. *This will clone some repositories from the web and run through the unit tests.* -5. Execute the *com.gitblit.Launcher* class to start Gitblit. \ No newline at end of file +5. Execute the *com.gitblit.GitBlitServer* class to start Gitblit GO. + +Building Tips & Tricks +---------------------- +1. If you are running Ant from an ANSI-capable console, consider setting the `MX_COLOR` environment variable before executing Ant.<pre>set MX_COLOR=true</pre> +2. The build script will honor your Maven proxy settings. If you need to fine-tune this, please review the [settings.moxie](http://gitblit.github.io/moxie/settings.html) documentation. \ No newline at end of file -- Gitblit v1.9.1