Diff - Revision history

Josef templ: /* For GUI */

2016-11-16T11:03:35Z

For GUI

← Older revision		Revision as of 11:03, 16 November 2016
Line 5:		Line 5:
	Here is how to set it up for Git:		Here is how to set it up for Git:

	1. Download and unpack the [[Media:~~DiffConfig~~.zip\|DiffConfig1.6]] package, which simply		1. Download and unpack the [[Media:DiffConfig17.zip\|DiffConfig1.7]] package, which simply
	contains a special version of a BlackBox 1.6 Config file. You may need to recompile it if you need it for a version other than 1.6. For ~~the forthcoming~~ BlackBox 1.~~7 center edition~~ you can use the [[Media:~~DiffConfig17~~.zip\|DiffConfig1.7]] package~~, which is already compiled for 1.7~~.		contains a special version of a BlackBox 1.7 Config file. You may need to recompile it if you need it for a version other than 1.7. For BlackBox 1.6 you can use the [[Media:DiffConfig.zip\|DiffConfig1.6]] package.

	2. Under Git settings configure a diff viewer for the .odc file name extension.		2. Under Git settings configure a diff viewer for the .odc file name extension.
Line 14:		Line 14:
	Extension: ''.odc''		Extension: ''.odc''

	External Program: ''"C:\Program Files\BlackBox Component Builder 1.6\BlackBox.exe" /USE "C:\Program Files\DiffConfig" %mine %base''		External Program: ''"C:\Program Files\BlackBox Component Builder 1.7\BlackBox.exe" /USE "C:\Program Files\DiffConfig" %mine %base''

	The BlackBox.exe path of course may need to be adapted. Note that there are double quotes required if the path contains spaces. That is it.		The BlackBox.exe path of course may need to be adapted. Note that there are double quotes required if the path contains spaces. That is it.

Ivan denisov at 20:09, 23 July 2016

2016-07-23T20:09:10Z

← Older revision		Revision as of 20:09, 23 July 2016
Line 28:		Line 28:
	git clone http://github.com/gertvv/odcread.git		git clone http://github.com/gertvv/odcread.git
	cd odcread		cd odcread
			sudo apt-get install g++
	make		make
	sudo mv odcread /usr/bin		sudo mv odcread /usr/bin

Josef templ: /* For GUI */

2016-07-23T06:49:37Z

For GUI

← Older revision		Revision as of 06:49, 23 July 2016
Line 6:		Line 6:

	1. Download and unpack the [[Media:DiffConfig.zip\|DiffConfig1.6]] package, which simply		1. Download and unpack the [[Media:DiffConfig.zip\|DiffConfig1.6]] package, which simply
	contains a special version of a BlackBox 1.6 Config file. You ~~will~~ need to recompile it if you need it for a version other than 1.6. For the forthcoming BlackBox 1.7 center edition you can use the [[Media:DiffConfig17.zip\|DiffConfig1.7]] package, which is already compiled for 1.7.		contains a special version of a BlackBox 1.6 Config file. You may need to recompile it if you need it for a version other than 1.6. For the forthcoming BlackBox 1.7 center edition you can use the [[Media:DiffConfig17.zip\|DiffConfig1.7]] package, which is already compiled for 1.7.

	2. Under Git settings configure a diff viewer for the .odc file name extension.		2. Under Git settings configure a diff viewer for the .odc file name extension.
Line 16:		Line 16:
	External Program: ''"C:\Program Files\BlackBox Component Builder 1.6\BlackBox.exe" /USE "C:\Program Files\DiffConfig" %mine %base''		External Program: ''"C:\Program Files\BlackBox Component Builder 1.6\BlackBox.exe" /USE "C:\Program Files\DiffConfig" %mine %base''

	The BlackBox.exe path of course may need to be adapted. That is it.		The BlackBox.exe path of course may need to be adapted. Note that there are double quotes required if the path contains spaces. That is it.

	Now you can use all the diff commands of your Git client for .odc files. The Config file simply tiles the window vertically, the left window showing the base version, and the right window showing the new version. Then it invokes the Info->Compare Texts command (F9). You use F9 to step to the next difference.		Now you can use all the diff commands of your Git client for .odc files. The Config file simply tiles the window vertically, the left window showing the base version, and the right window showing the new version. Then it invokes the Info->Compare Texts command (F9). You use F9 to step to the next difference.

Josef templ: /* For GUI */

2016-07-23T06:47:18Z

For GUI

← Older revision		Revision as of 06:47, 23 July 2016
Line 6:		Line 6:

	1. Download and unpack the [[Media:DiffConfig.zip\|DiffConfig1.6]] package, which simply		1. Download and unpack the [[Media:DiffConfig.zip\|DiffConfig1.6]] package, which simply
	contains a special version of a BlackBox 1.6 Config file. You will need to recompile it if you need it for a version other than 1.6. For the forthcoming BlackBox 1.7 center edition you can use the [[Media:DiffConfig17.zip\|DiffConfig1.7]] package.		contains a special version of a BlackBox 1.6 Config file. You will need to recompile it if you need it for a version other than 1.6. For the forthcoming BlackBox 1.7 center edition you can use the [[Media:DiffConfig17.zip\|DiffConfig1.7]] package, which is already compiled for 1.7.

	2. Under Git settings configure a diff viewer for the .odc file name extension.		2. Under Git settings configure a diff viewer for the .odc file name extension.

Josef templ: /* For GUI */

2016-07-22T07:12:38Z

For GUI

← Older revision		Revision as of 07:12, 22 July 2016
Line 5:		Line 5:
	Here is how to set it up for Git:		Here is how to set it up for Git:

	1. ~~download~~ and unpack the [[Media:DiffConfig.zip\|~~DiffConfig~~]] package, which simply		1. Download and unpack the [[Media:DiffConfig.zip\|DiffConfig1.6]] package, which simply
	contains a special version of a BlackBox 1.6 Config file. You will need to recompile it if you need it for a version other than 1.6.		contains a special version of a BlackBox 1.6 Config file. You will need to recompile it if you need it for a version other than 1.6. For the forthcoming BlackBox 1.7 center edition you can use the [[Media:DiffConfig17.zip\|DiffConfig1.7]] package.

	2. Under Git settings configure a diff viewer for the .odc file name extension.		2. Under Git settings configure a diff viewer for the .odc file name extension.

	The details depend on which Git client tool you use but there is always a way for setting up a diff viewer for a specific ~~file name~~ extension. For [https://tortoisegit.org/ TortoiseGit] you select the entry 'Settings' under the Git Popup menu. Then select 'Diff Viewer' and 'Advanced...'. Then 'Add...' a new diff viewer and adapt the paths as needed:		The details depend on which Git client tool you use but there is always a way for setting up a diff viewer for a specific filename extension. For [https://tortoisegit.org/ TortoiseGit] you select the entry 'Settings' under the Git Popup menu. Then select 'Diff Viewer' and 'Advanced...'. Then 'Add...' a new diff viewer and adapt the paths as needed:

	Extension: ''.odc''		Extension: ''.odc''
Line 16:		Line 16:
	External Program: ''"C:\Program Files\BlackBox Component Builder 1.6\BlackBox.exe" /USE "C:\Program Files\DiffConfig" %mine %base''		External Program: ''"C:\Program Files\BlackBox Component Builder 1.6\BlackBox.exe" /USE "C:\Program Files\DiffConfig" %mine %base''

	That is it.		The BlackBox.exe path of course may need to be adapted. That is it.

	Now you can use all the diff commands of your Git client for .odc files. The Config file simply tiles the window vertically, the left window showing the base version, and the right window showing the new version. Then it invokes the Info->Compare Texts command (F9). You use F9 to step to the next difference.		Now you can use all the diff commands of your Git client for .odc files. The Config file simply tiles the window vertically, the left window showing the base version, and the right window showing the new version. Then it invokes the Info->Compare Texts command (F9). You use F9 to step to the next difference.

Josef templ: package DiffConfig.zip uploaded to Wiki

2015-12-20T09:40:39Z

package DiffConfig.zip uploaded to Wiki

← Older revision		Revision as of 09:40, 20 December 2015
Line 5:		Line 5:
	Here is how to set it up for Git:		Here is how to set it up for Git:

	1. download and unpack the [~~http~~:~~//redmine.blackboxframework.org/attachments/download/22/~~DiffConfig.zip DiffConfig] package, which simply		1. download and unpack the [[Media:DiffConfig.zip\|DiffConfig]] package, which simply
	contains a special version of a BlackBox 1.6 Config file.		contains a special version of a BlackBox 1.6 Config file. You will need to recompile it if you need it for a version other than 1.6.

	2. Under Git settings configure a diff viewer for the .odc file name extension.		2. Under Git settings configure a diff viewer for the .odc file name extension.

	The details depend on which Git client tool you use but there is always a way for setting up a diff viewer for a specific file name extension. For [https://~~code~~.~~google.com/p/tortoisegit~~/ TortoiseGit] you select the entry 'Settings' under the Git Popup menu. Then select 'Diff Viewer' and 'Advanced...'. Then 'Add...' a new diff viewer and adapt the paths as needed:		The details depend on which Git client tool you use but there is always a way for setting up a diff viewer for a specific file name extension. For [https://tortoisegit.org/ TortoiseGit] you select the entry 'Settings' under the Git Popup menu. Then select 'Diff Viewer' and 'Advanced...'. Then 'Add...' a new diff viewer and adapt the paths as needed:

	Extension: ''.odc''		Extension: ''.odc''

Ivan denisov: /* For Terminal */

2015-06-07T08:40:48Z

For Terminal

← Older revision		Revision as of 08:40, 7 June 2015
Line 22:		Line 22:
	== For Terminal ==		== For Terminal ==

	To use binary to text converter from terminal:		To use binary to text converter from terminal in Linux:

	1. Download [http://github.com/gertvv/odcread odcread], compile and install it in a system folder.		1. Download [http://github.com/gertvv/odcread odcread], compile and install it in a system folder.
Line 35:		Line 35:
	*.odc diff=cp		*.odc diff=cp

	3. In file '''.git/config''' add next three ~~strings~~ at the end:		3. In file '''.git/config''' add next three lines at the end:

	[diff "cp"]		[diff "cp"]
	binary = true		binary = true
	textconv = /usr/bin/odcread		textconv = /usr/bin/odcread

Ivan denisov: /* For Terminal */

2014-08-17T10:05:23Z

For Terminal

← Older revision		Revision as of 10:05, 17 August 2014
Line 26:		Line 26:
	1. Download [http://github.com/gertvv/odcread odcread], compile and install it in a system folder.		1. Download [http://github.com/gertvv/odcread odcread], compile and install it in a system folder.

	git clone ~~https~~://github.com/gertvv/odcread.git		git clone http://github.com/gertvv/odcread.git
	cd odcread		cd odcread
	make		make

Ivan denisov: /* For Terminal */

2014-08-17T10:05:05Z

For Terminal

← Older revision		Revision as of 10:05, 17 August 2014
Line 25:		Line 25:

	1. Download [http://github.com/gertvv/odcread odcread], compile and install it in a system folder.		1. Download [http://github.com/gertvv/odcread odcread], compile and install it in a system folder.

			git clone https://github.com/gertvv/odcread.git
			cd odcread
			make
			sudo mv odcread /usr/bin

	2. In local repository make file '''.git/info/attributes''' with content		2. In local repository make file '''.git/info/attributes''' with content
Line 30:		Line 35:
	*.odc diff=cp		*.odc diff=cp

	3. In file '''.git/config''' add next three strings:		3. In file '''.git/config''' add next three strings at the end:

	[diff "cp"]		[diff "cp"]
	binary = true		binary = true
	textconv = /usr~~/local~~/bin/odcread		textconv = /usr/bin/odcread

Ivan denisov: /* For Terminal */

2014-08-17T10:02:09Z

For Terminal

← Older revision		Revision as of 10:02, 17 August 2014
Line 24:		Line 24:
	To use binary to text converter from terminal:		To use binary to text converter from terminal:

	1. Download [http://github.com/gertvv/odcread odcread], compile and install in folder ~~/usr/local/bin/~~		1. Download [http://github.com/gertvv/odcread odcread], compile and install it in a system folder.

	2. In local repository make file '''.git/info/attributes''' with content		2. In local repository make file '''.git/info/attributes''' with content