From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Sun, 10 Mar 2019 12:34:13 +0000 (+0300)
Subject: everything moved to sysbystem Diff, removed patch utility, blackbox commands and... 
X-Git-Url: https://deadsoftware.ru/gitweb?p=bbdiff.git;a=commitdiff_plain;h=65ef09d8042439853e2aa295e441cf2c4f7102f4

everything moved to sysbystem Diff, removed patch utility, blackbox commands and algorithms are separated, fixed linux version
---

diff --git a/Dev/Mod/Diff.odc b/Dev/Mod/Diff.odc
deleted file mode 100644
index ecba41c..0000000
Binary files a/Dev/Mod/Diff.odc and /dev/null differ
diff --git a/Diff/Mod/Base.odc b/Diff/Mod/Base.odc
new file mode 100644
index 0000000..4d45507
Binary files /dev/null and b/Diff/Mod/Base.odc differ
diff --git a/Diff/Mod/Main.odc b/Diff/Mod/Main.odc
new file mode 100644
index 0000000..04c0728
Binary files /dev/null and b/Diff/Mod/Main.odc differ
diff --git a/Diff/Mod/Old/Patch.odc b/Diff/Mod/Old/Patch.odc
new file mode 100644
index 0000000..d8440f5
Binary files /dev/null and b/Diff/Mod/Old/Patch.odc differ
diff --git a/Diff/Mod/Sys.odc b/Diff/Mod/Sys.odc
new file mode 100644
index 0000000..13f03ec
Binary files /dev/null and b/Diff/Mod/Sys.odc differ
diff --git a/Diff/Mod/SysLinux.odc b/Diff/Mod/SysLinux.odc
new file mode 100644
index 0000000..ceafa5f
Binary files /dev/null and b/Diff/Mod/SysLinux.odc differ
diff --git a/Diff/Mod/SysWin32.odc b/Diff/Mod/SysWin32.odc
new file mode 100644
index 0000000..8a632fe
Binary files /dev/null and b/Diff/Mod/SysWin32.odc differ
diff --git a/Diff/Mod/Utils.odc b/Diff/Mod/Utils.odc
new file mode 100644
index 0000000..53777a7
Binary files /dev/null and b/Diff/Mod/Utils.odc differ
diff --git a/Diff/Script/build-linux.sh b/Diff/Script/build-linux.sh
new file mode 100755
index 0000000..270ca31
--- /dev/null
+++ b/Diff/Script/build-linux.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+set -e
+DIR="$(dirname $0)"
+cd "$DIR/../.."
+
+./blackbox <<DATA
+
+DevCompiler.CompileThis DiffBase DiffSys DiffSysLinux DiffMain
+
+Dev2Linker1.LinkElf Linux odctool := Kernel$+ Files HostFiles HostConsole Log Math Strings Dialog Meta Stores Sequencers Models Converters Fonts Ports Services Views Printers Dates Printing Controllers Mechanisms Properties Containers Documents Windows Console StdInterpreter StdDialog StdApi StdCmds StdCFrames Controls HostFonts HostWindows HostDialog TextModels TextRulers TextSetters TextViews TextControllers TextMappers StdStamps StdClocks StdFolds StdETHConv StdLinks HostTextConv StdLog DevCommanders DiffBase DiffSys DiffSysLinux DiffMain
+
+DATA
diff --git a/Odctool/Mod/Linux.odc b/Odctool/Mod/Linux.odc
deleted file mode 100644
index 945981f..0000000
Binary files a/Odctool/Mod/Linux.odc and /dev/null differ
diff --git a/Odctool/Mod/Main.odc b/Odctool/Mod/Main.odc
deleted file mode 100644
index b23c3b8..0000000
Binary files a/Odctool/Mod/Main.odc and /dev/null differ
diff --git a/Odctool/Mod/Sys.odc b/Odctool/Mod/Sys.odc
deleted file mode 100644
index 4a9c244..0000000
Binary files a/Odctool/Mod/Sys.odc and /dev/null differ
diff --git a/Odctool/Mod/Win32.odc b/Odctool/Mod/Win32.odc
deleted file mode 100644
index c62f898..0000000
Binary files a/Odctool/Mod/Win32.odc and /dev/null differ
diff --git a/README b/README
index 81432a6..5c03ad5 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 BlackBox diffutils
 --------------------
 
-Clone of diff, patch and diff3 utilites from *nix for BlackBox and its binary Compound Document format.
+Clone of diff and diff3 utilites from *nix for BlackBox and its binary Compound Document format.
 
 
 Commands
@@ -9,38 +9,31 @@ Commands
 
 To use tools within Blackbox just compile DevDiff.
 
-DevDiff.Compare (guard TextCmds.FocusGuard)
+DiffUtils.Compare (guard TextCmds.FocusGuard)
 
 	Compare texts from two windows.
-	Can directly replace DevSearch.Compare in Dev/Rsrc/Menus.odc.
+	You can directly replace DevSearch.Compare with it in Dev/Rsrc/Menus.odc.
 
 
-^Q DevDiff.CompareThis <oldfile> <newfile> [">" <outfile>]
+^Q DiffUtils.CompareThis <oldfile> <newfile> [">" <outfile>]
 
 	Compare two files and produce patch in unified diff format.
 
 
-^Q DevDiff.ApplyPatch <patchfile>
+^Q DiffUtils.MergeThis <my> <old> <your> [">" <outfile>]
 
-	Read unified diff format and apply changes from it.
-
-
-^Q DevDiff.MergeThis <my> <old> <your> [">" <outfile>]
-
-	Read three files and do three-way merge like.
+	Read three files and do three-way merge like diff3.
 
 
 Dedicated tool
 --------------------
 
 You can read, create diffs and merge documents from command line using odctool.
-To build open OdctoolMain and execute commanders at the end of document.
-Call `odctoll.exe help` to learn how to use it.
-
-Warning: It tested only with wine and NOT tested on windows or native linux.
+To build it, open DiffMain and execute commanders at the end of document.
+Call `odctool help` to learn how to use it.
 
 
-Integration with GIT
+Integration with Git
 --------------------
 
 It is possible to integrate three-way merge with git.
@@ -49,7 +42,7 @@ It is possible to integrate three-way merge with git.
 
 	[merge "odctool"]
 		name = BlackBox Compound Document merge driver
-		driver = /full/path/to/odctool merge -P %P %A %O %B %A
+		driver = /full/path/to/odctool merge -p %P -o %A %A %O %B
 
 2. Open/create .git/info/attributes and add this line:
 
@@ -62,6 +55,5 @@ Checked not only text, but also views and formatting.
 Current state
 --------------------
 
-This is NOT final version of module DevDiff and Odctool. It is NOT well tested, you are warned!
-Also, program and user interfaces can be changed later.
-Todo list see at the and of sources and build tools.
+This is NOT final version of subsustem Diff and odctool. It is NOT well tested, you are warned!
+Also, program and user interface are not stable yet, so it can be changed in future.