Programming Reference:Patches - Revision history

Mellinger: /* Applying a Patch */

2012-08-23T16:02:47Z

Applying a Patch

← Older revision		Revision as of 16:02, 23 August 2012
Line 2:		Line 2:
	Typically, such modifications are made in order to add some configuration option to a BCI2000 module, or you make a small modification to an analysis tool in order to make it easier to use.		Typically, such modifications are made in order to add some configuration option to a BCI2000 module, or you make a small modification to an analysis tool in order to make it easier to use.
	Patches are shared in form of text files that contain the differences between the unchanged source code, and your modified source code.		Patches are shared in form of text files that contain the differences between the unchanged source code, and your modified source code.

			==Reading a Patch==
			A patch is a plain text file that describes original lines in source files (prepended with -), and their replacements by the patch (prepended with +). So you may read a patch in order to learn how someone modified BCI2000, even if you don't intend to apply it. Typically, web browsers will display a patch as text when you click its "download" link.

	==Applying a Patch==		==Applying a Patch==
	Applying a patch will apply the modifications recorded in the patch file, to your version of the source code. To apply a patch, follow these steps:		Applying a patch will apply the modifications recorded in the patch file, to your version of the source code. To apply a patch, follow these steps:
	*Download the patch file to your BCI2000 directory.		*Download the patch file to your BCI2000 directory. Typically, you can do this by right-clicking its "Download" link, and choose "Save file..." from the context menu.
	*With TortoiseSVN, right-click the patch file, and choose "TortoiseSVN->Apply Patch..." from the context menu. TortoiseMerge appears, with a floating window on top. Right-click the first entry in the floating window, and choose "Patch all" from the context menu.		*With TortoiseSVN, right-click the patch file, and choose "TortoiseSVN->Apply Patch..." from the context menu. TortoiseMerge appears, with a floating window on top. Right-click the first entry in the floating window, and choose "Patch all" from the context menu.
	*When using a Unix-based operating system, cd to the BCI2000 top level directory. Then, execute <code>patch < ThePatchFile.patch</code>.		*When using a Unix-based operating system, cd to the BCI2000 top level directory. Then, execute <code>patch < ThePatchFile.patch</code>.

Mellinger: /* Windows (TortoiseSVN) */

2012-07-05T16:48:22Z

Windows (TortoiseSVN)

← Older revision		Revision as of 16:48, 5 July 2012
Line 12:		Line 12:
	==Creating a Patch==		==Creating a Patch==
	===Windows (TortoiseSVN)===		===Windows (TortoiseSVN)===
	*If you added new files to the BCI2000 source code, make sure to add them to SVN by right-clicking and choosing TortoiseSVN->Add... from the context menu.		*If you added new files to the BCI2000 source code, make sure to add them to SVN by right-clicking and choosing "TortoiseSVN->Add..." from the context menu.
	*Right-click your BCI2000 folder and choose TortoiseSVN->Create Patch... from the context menu.		*Right-click your BCI2000 folder and choose "TortoiseSVN->Create Patch..." from the context menu.
	*In the list of modified files, deselect those that contain changes unrelated to your modification, and click OK.		*In the list of modified files, deselect those that contain changes unrelated to your modification, and click OK.
	*In the File Save dialog, save the patch to any location, and provide a name that gives some idea about the modification.		*In the File Save dialog, save the patch to any location, and provide a name that gives some idea about the modification.

	===Command-line SVN===		===Command-line SVN===
	*Make sure to call <code>svn add</code> on all files that you added to the source code.		*Make sure to call <code>svn add</code> on all files that you added to the source code.

Mellinger: /* Applying a Patch */

2012-07-05T16:48:02Z

Applying a Patch

← Older revision		Revision as of 16:48, 5 July 2012
Line 5:		Line 5:
	==Applying a Patch==		==Applying a Patch==
	Applying a patch will apply the modifications recorded in the patch file, to your version of the source code. To apply a patch, follow these steps:		Applying a patch will apply the modifications recorded in the patch file, to your version of the source code. To apply a patch, follow these steps:
	*Download the patch file.		*Download the patch file to your BCI2000 directory.
	*With TortoiseSVN, right-click ~~the BCI2000 folder to which you want to apply~~ the patch, and choose TortoiseSVN->Apply Patch... ~~Then~~, choose the ~~downloaded patch file~~.		*With TortoiseSVN, right-click the patch file, and choose "TortoiseSVN->Apply Patch..." from the context menu. TortoiseMerge appears, with a floating window on top. Right-click the first entry in the floating window, and choose "Patch all" from the context menu.
	*When using a Unix-based operating system, cd to the BCI2000 top level directory. Then, execute <code>patch < ~~/path/to/downloaded/~~patch</code>.		*When using a Unix-based operating system, cd to the BCI2000 top level directory. Then, execute <code>patch < ThePatchFile.patch</code>.
	*When application of the patch fails, open the patch file with a text editor, and determine the SVN revision against which the patch was created. Then, do a new checkout of that revision, and apply the patch there.		*When application of the patch fails, open the patch file with a text editor, and determine the SVN revision against which the patch was created. Then, do a new checkout of that revision, and apply the patch there.

Mellinger: /* Uploading a Patch */

2012-07-05T16:37:03Z

Uploading a Patch

← Older revision		Revision as of 16:37, 5 July 2012
Line 24:		Line 24:
	*Make sure you are logged into the wiki. Use the "log in" link at the top right of the wiki page in order to log in. When prompted for a user account and password, use your BCI2000 user account.		*Make sure you are logged into the wiki. Use the "log in" link at the top right of the wiki page in order to log in. When prompted for a user account and password, use your BCI2000 user account.
	*Click the "Upload file" link from the wiki toolbox to the left. In the upload page, choose your patch file, and put a few lines of description into the "Summary" field. Then, click "upload".		*Click the "Upload file" link from the wiki toolbox to the left. In the upload page, choose your patch file, and put a few lines of description into the "Summary" field. Then, click "upload".
			*The file's wiki page appears. You may edit your summary here.
			*On top of the wiki page, there is a link to the actual file on the server. Copy that link into the clipboard.
			*Edit the [[Contributions:Patches]] wiki page to contain the summary, and links to your contributed patch. Paste the link to the actual file from the clipboard.

	==See also==		==See also==

Mellinger: /* Patches */

2012-07-05T16:32:45Z

Patches

← Older revision		Revision as of 16:32, 5 July 2012
Line 1:		Line 1:
	~~==Patches==~~
	Patches contain modifications to the BCI2000 source code that may affect a few files, or many.		Patches contain modifications to the BCI2000 source code that may affect a few files, or many.
	Typically, such modifications are made in order to add some configuration option to a BCI2000 module, or you make a small modification to an analysis tool in order to make it easier to use.		Typically, such modifications are made in order to add some configuration option to a BCI2000 module, or you make a small modification to an analysis tool in order to make it easier to use.

Mellinger at 16:32, 5 July 2012

2012-07-05T16:32:36Z

New page

==Patches==
Patches contain modifications to the BCI2000 source code that may affect a few files, or many.
Typically, such modifications are made in order to add some configuration option to a BCI2000 module, or you make a small modification to an analysis tool in order to make it easier to use.
Patches are shared in form of text files that contain the differences between the unchanged source code, and your modified source code.

==Applying a Patch==
Applying a patch will apply the modifications recorded in the patch file, to your version of the source code. To apply a patch, follow these steps:
*Download the patch file.
*With TortoiseSVN, right-click the BCI2000 folder to which you want to apply the patch, and choose TortoiseSVN->Apply Patch... Then, choose the downloaded patch file.
*When using a Unix-based operating system, cd to the BCI2000 top level directory. Then, execute <code>patch < /path/to/downloaded/patch</code>.
*When application of the patch fails, open the patch file with a text editor, and determine the SVN revision against which the patch was created. Then, do a new checkout of that revision, and apply the patch there.

==Creating a Patch==
===Windows (TortoiseSVN)===
*If you added new files to the BCI2000 source code, make sure to add them to SVN by right-clicking and choosing TortoiseSVN->Add... from the context menu.
*Right-click your BCI2000 folder and choose TortoiseSVN->Create Patch... from the context menu.
*In the list of modified files, deselect those that contain changes unrelated to your modification, and click OK.
*In the File Save dialog, save the patch to any location, and provide a name that gives some idea about the modification.
===Command-line SVN===
*Make sure to call <code>svn add</code> on all files that you added to the source code.
*CD to the BCI2000 directory, and execute <code>svn diff > MyModification.patch</code>.

==Uploading a Patch==
No special permission is required to upload a patch. Everyone with a BCI2000 user account may log into the wiki, edit the patches page, and upload a patch. In order to upload a patch, please follow these steps:
*Make sure you are logged into the wiki. Use the "log in" link at the top right of the wiki page in order to log in. When prompted for a user account and password, use your BCI2000 user account.
*Click the "Upload file" link from the wiki toolbox to the left. In the upload page, choose your patch file, and put a few lines of description into the "Summary" field. Then, click "upload".

==See also==
[[Contributions:Patches]]

[[Category:Howto]]