Skip to content

Commit 04fdfb8

Browse files
authored
Merge pull request openrails/openrails#135 from cjakeman/website/svn-to-git
Website: update references from svn to git
2 parents 23e9d36 + 1ca864b commit 04fdfb8

File tree

2 files changed

+16
-62
lines changed

2 files changed

+16
-62
lines changed

contribute/developing-code/index.php

Lines changed: 14 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -28,61 +28,33 @@
2828
<a href=# id="public_changes"><h2 class="accordion_head"><span class="glyphicon glyphicon-play btn-xs"></span> Public Changes</h2></a>
2929
<div class="accordion_body">
3030
<p>
31-
If your changes might be useful to others, then we encourage you to <a href="#submitting_a_change">submit them for inclusion into the product</a>. We will respond to all
31+
If your changes might be useful to others, then we encourage you to submit them for inclusion into the product. We will respond to all
3232
submissions and give credit in the project record for submissions that are included.
33+
</p><p>
34+
Click <a href="https://github.com/twpol/openrails/blob/feature/contributing/CONTRIBUTING.md">here for detailed advice and instructions for contributing to Open Rails</a>.
3335
</p>
3436
</div>
3537
</li><li>
3638
<a href=# id="source_code_repository"><h2 class="accordion_head"><span class="glyphicon glyphicon-play btn-xs"></span> Version Control System</h2></a>
3739
<div class="accordion_body">
3840
<p>
39-
The Open Rails project uses Subversion (SVN) as the versioning and revision control system for our software.
40-
Revisions are archived in a repository and can be compared, restored and merged, so that versions are safe and several developers can work
41+
The Open Rails project uses Git as the versioning and revision control system for our software.
42+
Revisions are kept in <a href="https://github.com/openrails/openrails">a public repository at GitHub.com</a> and can be compared, restored and merged, so that versions are safe and several developers can work
4143
independently without (too much) conflict.
4244
</p><p>
43-
The Open Rails source code is managed on <a href="http://svn.uktrainsim.com/svn/openrails/trunk">our Subversion server</a>.
44-
Read-only access is provided from the guest login:
45-
</p>
46-
<ul>
47-
<li>Username: <span class="tt">orpublic</span></li>
48-
<li>Password: <span class="tt">orpublic</span></li>
49-
</ul><br>
50-
<p>
51-
From your PC, you can use an Subversion client such as <a href="http://tortoisesvn.net">TortoiseSVN</a> to access the files, or simply view the repository from a web browser.
45+
From your PC, you can simply view the repository from a web browser.
46+
GitHub.com provides the GitHub Desktop program to interface between GitHub.com and your PC (for 64-bit Windows only).
47+
Other Windows programs are SourceTree and TortoiseGit and also Visual Studio includes a Git tool.
5248
</p><p>
53-
P.S. - Our thanks to <a href="http://www.uktrainsim.com">UKTrainSim.com</a> for donating the Subversion server space and admin services.
54-
</p>
55-
</div>
56-
</li><li>
57-
<a href=# id="accessing_the_code"><h2 class="accordion_head"><span class="glyphicon glyphicon-play btn-xs"></span> Accessing The Code With TortoiseSVN</h2></a>
58-
<div class="accordion_body">
59-
<p>
60-
If you are not familiar with Subversion, please study the TortoiseSVN help first.
61-
</p>
62-
<ol>
63-
<li>From <i>Windows Explorer</i>, choose a folder to hold the project code.</li>
64-
<li>Right click on the folder, select <i>SVN Checkout...</i></li>
65-
<li>In the <i>Checkout</i> dialog box, enter the <i>URL of repository</i> :
66-
<span class="tt">http://svn.uktrainsim.com/svn/openrails/trunk</span>
67-
</li>
68-
<li>Enter username <span class="tt">&nbsp;orpublic</span></li>
69-
<li>Enter password <span class="tt">&nbsp;orpublic</span></li>
70-
<li>Check that the <i>Checkout directory</i> shows the folder where you want the files extracted to - e.g.
71-
<span class="tt">C:\Users\Wayne\Desktop\openrails</span>
72-
</li>
73-
<li>Click OK.</li>
74-
</ol><br>
75-
<p>
7649
The main folders in the repository are:
77-
</p>
50+
</p>
7851
<ul>
7952
<li>Addons - accessory files shipped with the installation package</li>
8053
<li>Architecture - an incomplete experiment in restructuring the program</li>
81-
<li>Archive - abandoned code</li>
8254
<li>Documentation - operations manual and other documentation</li>
8355
<li>Program - empty space for executables once they are compiled</li>
8456
<li>Source - the principal source code files</li>
85-
<li>SVNTesting - sandbox for training new users on SVN</li>
57+
<li>Website - source for this website</li>
8658
</ul>
8759
</div>
8860
</li><li>
@@ -92,7 +64,7 @@
9264
To compile and debug the Open Rails source code, ensure you have the following Microsoft products installed:
9365
</p>
9466
<ul>
95-
<li>Visual Studio 2015/17, any edition. The
67+
<li>Visual Studio 2015/17/19, any edition. The
9668
<a href="https://www.visualstudio.com/downloads/">Community Edition</a>
9769
is free
9870
<br />(Note 1: To save on disk space, all you need is the option Windows > .NET Development)
@@ -132,22 +104,6 @@
132104
<li>Press F5 to run RunActivity.exe using your activity.</li>
133105
</ol>
134106
</div>
135-
</li><li>
136-
<a href=# id="submitting_a_change"><h2 class="accordion_head"><span class="glyphicon glyphicon-play btn-xs"></span> Submitting A Change</h2></a>
137-
<div class="accordion_body">
138-
<p>
139-
A change is best packaged as a "patch" file - a file which contains instructions to alter the current version of Open Rails code to
140-
include your changes. Patches are short and readable. Subversion will usually apply your patch successfully
141-
even after code has been changed by someone else.
142-
</p><p>
143-
If you are offering a fix to a Bug Report, then simply attach your patch file to the <a href="http://launchpad.net/or">Bug Tracker</a> explaining what you have done.
144-
</p><p>
145-
If you are offering an improvement or a new feature, then attach your file to a post on the Elvas Tower forum <a href="http://www.elvastower.com/forums/index.php?/forum/192-discussion/">Open Rails Discussion</a>. It would be helpful to post a message before
146-
you start work to give us some idea of your intentions.
147-
</p><p>
148-
We cannot promise that your changes will make it into the code, but show us what you can do and then we can talk about it.
149-
</p>
150-
</div>
151107
</li>
152108
<li>
153109
<a href=# id="code_policy"><h2 class="accordion_head"><span class="glyphicon glyphicon-play btn-xs"></span> Policy for Code Changes</h2></a>
@@ -168,11 +124,12 @@
168124
<li><em>Targeted</em> means "Milestone" is set to the next planned stable version.</li>
169125
<li><em>Approved</em> means "Direction" is "Approved", "Milestone target" is unset or set to the next planned stable version, and at least 7 days of discussion has taken place.</li>
170126
</ol>
127+
<br>
171128
<p>
172129
For members of the <a href="../../discover/project-team/">Development Team</a>, these policies are defined in more detail in
173-
<a href="http://www.elvastower.com/forums/index.php?/topic/26392-new-policy-for-code-changes/">New policy for code changes</a>
130+
<a href="http://www.elvastower.com/forums/index.php?/topic/26392-new-policy-for-code-changes/">Policy for code changes</a>
174131
and
175-
<a href="http://www.elvastower.com/forums/index.php?/topic/27109-new-policy-for-blueprints/">New policy for blueprints</a>.
132+
<a href="http://www.elvastower.com/forums/index.php?/topic/27109-new-policy-for-blueprints/">Policy for blueprints</a>.
176133
</p>
177134
</div>
178135
</li>

download/source/index.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
<p style="text-align: center;">
3131
<?php echo date('d F Y', filemtime("$file_path/$source_stable")) . ', ' . round(filesize("$file_path/$source_stable") / 1024 / 1024) . 'MB'; ?>
3232
</p>
33-
<!--<p class="alert alert-info">
34-
We're working hard on producing the next stable version. Please check back soon.
35-
</p>-->
3633
</div>
3734
<div class="col-md-2"></div>
3835
<div class="col-md-4">
@@ -60,9 +57,9 @@
6057
<p>
6158
One of the ways that the <a href="../../discover/license/">Free Software License (GPL)</a> protects our rights is by requiring everyone who distributes software under the GPL to make the source available also. That way, everyone who uses the software can examine it and customize it if they wish.
6259
</p>
63-
<h2>Subversion (SVN) Software Versioning Control System</h2>
60+
<h2>Git Software Versioning Control System</h2>
6461
<p>
65-
The entire history of project development is archived in our Subversion repository, so visitors are able to extract not just the current version but all the previous ones too back to version 1 in December 2009.
62+
The entire history of project development is <a href="https://github.com/openrails/openrails">archived in our public Git repository</a>, so visitors are able to extract not just the current version but all the previous ones too back to version 1 in December 2009.
6663
</p><p>
6764
For access details, see <a href="../../contribute/developing-code/">Contribute > Code</a>.
6865
</p>

0 commit comments

Comments
 (0)