SVN V3 Suggestions - Revision history

Mellinger: /* If you already have a pre-release working-copy of version 3.0, */

2011-02-17T12:56:39Z

If you already have a pre-release working-copy of version 3.0,

← Older revision		Revision as of 12:56, 17 February 2011
Line 26:		Line 26:
	moving from /branches/3.0 to /trunk, so you would relocate as follows,		moving from /branches/3.0 to /trunk, so you would relocate as follows,
	starting in your existing '3.0' directory:		starting in your existing '3.0' directory:
	svn switch ~~http://www.bci2000.org/svn/branches/3.0~~ http://www.bci2000.org/svn/trunk		svn switch http://www.bci2000.org/svn/trunk
	Again, in TortoiseSVN, choose the "switch" option		Again, in TortoiseSVN, choose the "switch" option
	from the sub-menu, and enter http://www.bci2000.org/svn/trunk		from the sub-menu, and enter http://www.bci2000.org/svn/trunk

Mellinger: /* When you are in the midst of performing experiments */

2011-02-17T12:56:19Z

When you are in the midst of performing experiments

← Older revision		Revision as of 12:56, 17 February 2011
Line 19:		Line 19:
	your existing 'trunk' directory:		your existing 'trunk' directory:

	svn switch ~~http://www.bci2000.org/svn/trunk~~ http://www.bci2000.org/svn/tags/BCI2000.v2.1		svn switch http://www.bci2000.org/svn/tags/BCI2000.v2.1
	In TortoiseSVN, choose the "switch" option from the sub-menu, and enter http://www.bci2000.org/svn/tags/BCI2000.v2.1		In TortoiseSVN, choose the "switch" option from the sub-menu, and enter http://www.bci2000.org/svn/tags/BCI2000.v2.1

Mellinger: /* If you already have a pre-release working-copy of version 3.0, */

2011-02-16T19:35:49Z

If you already have a pre-release working-copy of version 3.0,

← Older revision		Revision as of 19:35, 16 February 2011
Line 28:		Line 28:
	svn switch http://www.bci2000.org/svn/branches/3.0 http://www.bci2000.org/svn/trunk		svn switch http://www.bci2000.org/svn/branches/3.0 http://www.bci2000.org/svn/trunk
	Again, in TortoiseSVN, choose the "switch" option		Again, in TortoiseSVN, choose the "switch" option
	from the sub-menu.		from the sub-menu, and enter http://www.bci2000.org/svn/trunk

	==When you want to upgrade your existing v2 source directory to v3,==		==When you want to upgrade your existing v2 source directory to v3,==

Mellinger: /* When you are in the midst of performing experiments */

2011-02-16T19:35:26Z

When you are in the midst of performing experiments

← Older revision		Revision as of 19:35, 16 February 2011
Line 20:		Line 20:

	svn switch http://www.bci2000.org/svn/trunk http://www.bci2000.org/svn/tags/BCI2000.v2.1		svn switch http://www.bci2000.org/svn/trunk http://www.bci2000.org/svn/tags/BCI2000.v2.1
	In TortoiseSVN, choose the "switch" option from the sub-menu.		In TortoiseSVN, choose the "switch" option from the sub-menu, and enter http://www.bci2000.org/svn/tags/BCI2000.v2.1

	==If you already have a pre-release working-copy of version 3.0,==		==If you already have a pre-release working-copy of version 3.0,==

Mellinger at 19:32, 16 February 2011

2011-02-16T19:32:49Z

← Older revision		Revision as of 19:32, 16 February 2011
Line 8:		Line 8:


	With the release of v3 on Feb. 16, we will move the current 3.0 branch on SVN to the trunk, and the current trunk to tags/2.1. Thus, when you update your source repository after that date, you will receive v3 by default.		With the release of v3 on Feb. 16, we will move the current 3.0 branch on SVN to the trunk, and the current trunk to tags/BCI2000.v2.1. Thus, when you update your source repository after that date, you will receive v3 by default.

	Depending on your situation, upgrading your own source tree to v3 may or may not be advisable.		Depending on your situation, upgrading your own source tree to v3 may or may not be advisable.

Mellinger: /* If you already have a pre-release working-copy of version 3.0, */

2011-02-16T19:32:19Z

If you already have a pre-release working-copy of version 3.0,

← Older revision		Revision as of 19:32, 16 February 2011
Line 26:		Line 26:
	moving from /branches/3.0 to /trunk, so you would relocate as follows,		moving from /branches/3.0 to /trunk, so you would relocate as follows,
	starting in your existing '3.0' directory:		starting in your existing '3.0' directory:
	svn switch ~~--relocate~~ http://www.bci2000.org/svn/branches/3.0 http://www.bci2000.org/svn/trunk		svn switch http://www.bci2000.org/svn/branches/3.0 http://www.bci2000.org/svn/trunk
	Again, in TortoiseSVN, choose the ~~"relocate" (not~~ "switch") option		Again, in TortoiseSVN, choose the "switch" option
	from the sub-menu.		from the sub-menu.

Mellinger: /* When you are in the midst of performing experiments */

2011-02-16T19:31:57Z

When you are in the midst of performing experiments

← Older revision		Revision as of 19:31, 16 February 2011
Line 16:		Line 16:

	If you want to preserve your version 2 working-copy for now, and		If you want to preserve your version 2 working-copy for now, and
	keep it under version control, you should perform a "~~relocation~~" from		keep it under version control, you should perform a "switch" from
	your existing 'trunk' directory:		your existing 'trunk' directory:

	svn switch ~~--relocate~~ http://www.bci2000.org/svn/trunk http://www.bci2000.org/svn/tags/BCI2000.v2.1		svn switch http://www.bci2000.org/svn/trunk http://www.bci2000.org/svn/tags/BCI2000.v2.1
	In TortoiseSVN, choose the ~~"relocate" (not~~ "switch") option from the sub-menu.		In TortoiseSVN, choose the "switch" option from the sub-menu.

	==If you already have a pre-release working-copy of version 3.0,==		==If you already have a pre-release working-copy of version 3.0,==

Mellinger: /* When you are in the midst of performing experiments */

2011-02-16T15:28:11Z

When you are in the midst of performing experiments

← Older revision		Revision as of 15:28, 16 February 2011
Line 12:		Line 12:
	Depending on your situation, upgrading your own source tree to v3 may or may not be advisable.		Depending on your situation, upgrading your own source tree to v3 may or may not be advisable.
	==When you are in the midst of performing experiments==		==When you are in the midst of performing experiments==
	using your own module(s), you should not upgrade to v3 until the experiments are finished.		using your own module(s), you should not upgrade to v3 until the experiments are finished.
	Also, when you want to use a contribution (e.g. source module) that comes with v3 but not v2, together with your own module(s), there is no need to upgrade. Modules may be mixed between v2 and v3.		Also, when you want to use a contribution (e.g. source module) that comes with v3 but not v2, together with your own module(s), there is no need to upgrade. Modules may be mixed between v2 and v3.

Line 19:		Line 19:
	your existing 'trunk' directory:		your existing 'trunk' directory:

	svn switch --relocate http://www.bci2000.org/svn/trunk http://www.bci2000.org/svn/tags/2.1		svn switch --relocate http://www.bci2000.org/svn/trunk http://www.bci2000.org/svn/tags/BCI2000.v2.1
	In TortoiseSVN, choose the "relocate" (not "switch") option from the sub-menu.		In TortoiseSVN, choose the "relocate" (not "switch") option from the sub-menu.

Mellinger at 17:42, 15 February 2011

2011-02-15T17:42:07Z

← Older revision		Revision as of 17:42, 15 February 2011
Line 22:		Line 22:
	In TortoiseSVN, choose the "relocate" (not "switch") option from the sub-menu.		In TortoiseSVN, choose the "relocate" (not "switch") option from the sub-menu.

	==If you already have a pre-release working-copy of version 3.0,== that is		==If you already have a pre-release working-copy of version 3.0,==
			that is
	moving from /branches/3.0 to /trunk, so you would relocate as follows,		moving from /branches/3.0 to /trunk, so you would relocate as follows,
	starting in your existing '3.0' directory:		starting in your existing '3.0' directory:

Mellinger at 17:41, 15 February 2011

2011-02-15T17:41:29Z

New page

If you obtained BCI2000 via SVN (rather than by just downloading one
package with all the binaries pre-built) then you should be aware of
the changes that will happen when you perform svn updates after Feb
16. If you have added your own custom code to your svn working-copy,
or if you are using your svn working-copy for active experiments, you
should take steps to avoid large-scale changes and conflicts when you
use svn.

With the release of v3 on Feb. 16, we will move the current 3.0 branch on SVN to the trunk, and the current trunk to tags/2.1. Thus, when you update your source repository after that date, you will receive v3 by default.

Depending on your situation, upgrading your own source tree to v3 may or may not be advisable.
==When you are in the midst of performing experiments==
using your own module(s), you should not upgrade to v3 until the experiments are finished.
Also, when you want to use a contribution (e.g. source module) that comes with v3 but not v2, together with your own module(s), there is no need to upgrade. Modules may be mixed between v2 and v3.

If you want to preserve your version 2 working-copy for now, and
keep it under version control, you should perform a "relocation" from
your existing 'trunk' directory:

svn switch --relocate http://www.bci2000.org/svn/trunk http://www.bci2000.org/svn/tags/2.1
In TortoiseSVN, choose the "relocate" (not "switch") option from the sub-menu.

==If you already have a pre-release working-copy of version 3.0,== that is
moving from /branches/3.0 to /trunk, so you would relocate as follows,
starting in your existing '3.0' directory:
svn switch --relocate http://www.bci2000.org/svn/branches/3.0 http://www.bci2000.org/svn/trunk
Again, in TortoiseSVN, choose the "relocate" (not "switch") option
from the sub-menu.

==When you want to upgrade your existing v2 source directory to v3,==
you should do one of the following:

a. If you want to stick with the Borland compiler, make a backup copy of your code, and use “SVN update” to update your BCI2000 directory to v3.
When recompiling your module, you might get "unresolved external" messages. If this happens to you, please post on the BCI2000 forum (http://www.bci2000.org/phpbb) to get help in resolving these.

b. If you want to change compilers to use MSVC or MinGW rather than Borland, please do the following:
*Make a backup copy of your code.
*Use “SVN update” to update your BCI2000 directory to v3.
*Copy a CMakeLists.txt file from a similar module to your module's directory.
*Edit the copy with a text editor.
*At the top of the file, change the executable name to your module's name.
*At the bottom of the file, go to the list of source files, and modify it to contain your module's proper source files.
*In the directory above your module's source directory, edit the CMakeLists.txt file, and add a line:
ADD_DIRECTORY(name_of_your_module_directory)
*For the compiler/IDE of your choice, execute the "Create project files" batch file from the BCI2000 build directory.
*Open the resulting solution/project file, and locate your module's project to work on it.