Skip to content

Commit

Permalink
Update SVN references to git, mostly in docs.
Browse files Browse the repository at this point in the history
  • Loading branch information
tierra committed Feb 21, 2015
1 parent 9ea2138 commit 29eb2a7
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 34 deletions.
4 changes: 2 additions & 2 deletions docs/contributing/how-to-add-new-sample.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ To add a new sample "foo" under directory "samples/foo" you need to do
the following: (note that all this applies also to demos: just replace
samples/ with demos/ where needed).

1. Create the directory samples/foo locally and "svn add" it.
1. Create the directory samples/foo.

2. "svn add" the sample sources (usually based on minimal.cpp) as well.
2. "git add" the sample sources (usually based on minimal.cpp) as well.

Note that unless your sample requires something special you shouldn't
add foo.rc, foo.ico, ... any more, please just reuse the generic sample.*
Expand Down
6 changes: 1 addition & 5 deletions docs/contributing/how-to-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,12 @@ Update the release announcement post in docs/publicity/announce.txt.

Tag the release:

svn cp https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@123456 \
https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_x_y_z -m 'Tag x.y.z release.'
git tag WX_x_y_z -m 'Tag x.y.z release.'


Creating release files
----------------------

The currently used release scripts need to be used from git-svn checkout and
rely on Git to avoid problems with using non-clean trees and such.

Follow these steps assuming the current working directory is the root of git
working copy and you want to prepare distribution for the version x.y.z:

Expand Down
4 changes: 2 additions & 2 deletions docs/contributing/translators-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ First of all, here is what you will need:
fine, but you'd have to use some kind of "for /s" loop with the
command.com/cmd.exe.

3. (at least read) access to the subversion is not necessary strictly speaking, but
will make things a lot easier for you and others.
3. Access to the git repository is not necessary strictly speaking, but will
make things a lot easier for you and others.


Now a brief overview of the process of translations (please refer to GNU
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ ALIASES += rightCurly="}"
#---------------------------------------------------------------------------

# For indicating a sample location
ALIASES += sampledir{1}="@e Location: @c samples/\1 subdirectory of your wxWidgets installation or http://svn.wxwidgets.org/viewvc/wx/wxWidgets/trunk/samples/\1"
ALIASES += sampledir{1}="@e Location: @c samples/\1 subdirectory of your wxWidgets installation or https://github.com/wxWidgets/wxWidgets/tree/master/samples/\1"

# For refering to the corresponding sample in a class document or a overview
# Usually placed in the queue of @see
Expand Down
3 changes: 1 addition & 2 deletions docs/doxygen/mainpages/introduction.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ configurations but at least 1GB and possibly more is required.
The download links can be found at http://www.wxwidgets.org. The primary
download location is https://sourceforge.net/downloads/wxwindows/ and there is
also an FTP mirror at ftp://ftp.wxwidgets.org/pub/. Additionally, the latest
version can always be retrieved from our version control system using either
Subversion (http://svn.wxwidgets.org/svn/wx/wxWidgets/) or Git
version can always be retrieved from our version control system using Git
(https://github.com/wxWidgets/wxWidgets).
wxWidgets documentation that you are reading is also available online at
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/mainpages/samples.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ subdirectory of the library distribution. When a @c foobar sample is mentioned
below, its sources can be found in @c samples/foobar directory of your
wxWidgets tree. If you installed wxWidgets from a binary package, you might not
have this directory. In this case, you may view the samples online at
http://svn.wxwidgets.org/viewvc/wx/wxWidgets/trunk/samples/ but you need to
https://github.com/wxWidgets/wxWidgets/tree/master/samples/ but you need to
download the source distribution in order to be able to build them (highly
recommended).
Expand Down
9 changes: 4 additions & 5 deletions docs/doxygen/mainpages/translations.h
Original file line number Diff line number Diff line change
Expand Up @@ -448,11 +448,10 @@ Here are the steps you should follow:
-# Get the latest version of the file <tt>locale/wxstd.pot</tt> from the
wxWidgets source tree: if you're using
<a href="http://www.wxwidgets.org/develop/svn.htm">Subversion</a>
or the <a href="http://wxwindows.sourceforge.net/snapshots/">daily snapshots</a>
you should already have it.
Otherwise you can always retrieve it directly from the Subversion repository via the
<a href="http://svn.wxwidgets.org/viewvc/wx/wxWidgets/trunk/locale/wxstd.pot?view=co">Web interface</a>.
<a href="https://www.wxwidgets.org/develop/code-repository/">git</a>
you should already have it. Otherwise you can always retrieve it directly
from the git repository:
<a href="https://raw.githubusercontent.com/wxWidgets/wxWidgets/master/locale/wxstd.pot">locale/wxstd.pot</a>.
-# Rename it to <tt>XY.po</tt> where <tt>"XY"</tt> is the 2 letter
<a href="http://www.loc.gov/standards/iso639-2/php/English_list.php">ISO 639-2 language code</a>
for your language.
Expand Down
9 changes: 4 additions & 5 deletions docs/doxygen/overviews/xrc.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,13 @@ specialised tool. Examples of these include:
dialog editor.
@e Free:
@li XRCed <http://xrced.sf.net/>, a wxPython-based dialog editor that you
can find in the wxPython/tools subdirectory of the wxWidgets SVN archive.
@li XRCed <http://xrced.sourceforge.net/>, a wxPython-based dialog editor.
@li wxFormBuilder <http://wxformbuilder.org/>, a C++-based form designer that
can output C++, XRC or python.
@li wxCrafter (free version) <http://www.codelite.org/wxcrafter/>, a C++-based form designer that
can output C++ or XRC.
@li wxCrafter (free version) <http://www.codelite.org/wxcrafter/>, a C++-based
form designer that can output C++ or XRC.
There's a more complete list at <http://www.wxwidgets.org/wiki/index.php/Tools>
There's a more complete list at <https://wiki.wxwidgets.org/Tools>
This small demonstration XRC file contains a simple dialog:
@code
Expand Down
4 changes: 2 additions & 2 deletions docs/gtk/install.txt
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ are enabled by default.

Normally, you won't have to choose a toolkit, because when
you download wxGTK, it will default to --with-gtk etc. But
if you use all of our SVN repository you have to choose a
toolkit. You must do this by running configure with either of:
if you use the git repository you have to choose a toolkit.
You must do this by running configure with either of:

--with-gtk=2 Use the GTK+ 2.0. Default.
--with-gtk=3 Use the GTK+ 3.
Expand Down
12 changes: 6 additions & 6 deletions include/wx/chkconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
If you get an error saying "wxUSE_FOO must be defined", it means that you
are not using the correct up-to-date version of setup.h. This happens most
often when using svn or daily snapshots and a new symbol was added to
setup0.h and you haven't updated your local setup.h to reflect it. If
this is the case, you need to propagate the changes from setup0.h to your
setup.h and, if using makefiles under MSW, also remove setup.h under the
build directory (lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that
the new setup.h is copied there.
often when using git or snapshots and a new symbol was added to setup0.h
and you haven't updated your local setup.h to reflect it. If this is the
case, you need to propagate the changes from setup0.h to your setup.h and,
if using makefiles under MSW, also remove setup.h under the build directory
(lib/$(COMPILER)_{lib,dll}/msw[u][d][dll]/wx) so that the new setup.h is
copied there.
If you get an error of the form "wxFoo requires wxBar", then the settings
in your setup.h are inconsistent. You have the choice between correcting
Expand Down
2 changes: 1 addition & 1 deletion misc/languages/genlang.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# include/wx/intl.h and src/common/intl.cpp using information from langtabl.txt
#
# Warning: error detection and reporting here is rudimentary, check if the
# files were updated correctly with "svn diff" before committing them!
# files were updated correctly with "git diff" before committing them!

import os
import string
Expand Down
2 changes: 1 addition & 1 deletion src/generic/scrlwing.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1535,7 +1535,7 @@ wxSize wxScrolledT_Helper::FilterBestSize(const wxWindow *win,
// the window into sizer as expandable so that it can use all space
// available to it.
//
// See also http://svn.wxwidgets.org/viewvc/wx?view=rev&revision=45864
// See also https://github.com/wxWidgets/wxWidgets/commit/7e0f7539

wxSize minSize = win->GetMinSize();

Expand Down
2 changes: 1 addition & 1 deletion utils/wxrc/wxrc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,7 @@ bool XmlResApp::Validate()
{
wxLogError("Running RELAX NG validator failed.");
wxLogError("Please install Jing (http://www.thaiopensource.com/relaxng/jing.html).");
wxLogError("See http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk/misc/schema/README for more information.");
wxLogError("See https://github.com/wxWidgets/wxWidgets/blob/master/misc/schema/README for more information.");
return false;
}

Expand Down

0 comments on commit 29eb2a7

Please sign in to comment.