Move edit/ and vfs/ directories into src/

[andrew_b]

Moving edit* and vfs/ subdirs to src/

[slavazanko]

Created branch 1866_filesystem_reorganization
Current status: 'on rework'

[slavazanko]

Branch: 1866_filesystem_reorganization

Changesets:

• 30fb3d187b1265f501d051b29bf398b9902599ea: Moved dir $(srcdir)/edit into $(srcdir)/src/editor
• bb777d48a682c6e002278fea6bf613154d0370b3: Changes into sources for respect movement of $(srcdir)/edit into $(srcdir)/src/editor

• b260fc6a6a5c5b5ae89eecea7ca457e345a0f660: Moved dir $(srcdir)/vfs into $(srcdir)/lib/vfs/mc-vfs
• 1f53c07f45de3fc86a5baaaeb57f9ce333924cc0: Changes into sources for respect movement of $(srcdir)/vfs into $(srcdir)/lib/vfs/mc-vfs

• ac5bf9f070a06f0ad4a1c63b7dbd08c6495a6986: Moved dir $(srcdir)/syntax into $(srcdir)/misc/syntax

• 9ce180986ad27aac1e25213bf0fe7a5a1f96239e: Massive moved some dirs (filehighlight, mcconfig, search, skin, tty) from $(srcdir)/src into $(srcdir)/lib
• be9e21cfb57f37bac13034f56e681deb315db358: Changes into sources for respect mass movement of $(srcdir)/src/*/ into $(srcdir)/lib/*/

Review, please.

[andrew_b]

Cannot build:

Making all in filehighlight
mkdir .libs
 gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I/home/andrew/work.c/mc/mc-1866_filesystem_reorganization/lib/filehighlight -I../.. -I../ -I/home/andrew/work.c/mc/mc-1866_filesystem_reorganization/src -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DDATADIR=\"/home/andrew/work.c/mc/mc-1866_filesystem_reorganization/BUILD_ROOT/INSTALL_ROOT/share/mc/\" -DLOCALEDIR=\"/home/andrew/work.c/mc/mc-1866_filesystem_reorganization/BUILD_ROOT/INSTALL_ROOT/share/locale\" -fdiagnostics-show-option -Wcomment -Wdeclaration-after-statement -Wformat -Wimplicit-function-declaration -Wimplicit-int -Wmissing-braces -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-long-long -Wno-unreachable-code -Wparentheses -Wpointer-sign -Wreturn-type -Wshadow -Wsign-compare -Wswitch -Wuninitialized -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wwrite-strings -g3 -O -ggdb -g -O2 -MT libmcfilehighlight_la-common.lo -MD -MP -MF .deps/libmcfilehighlight_la-common.Tpo -c /home/andrew/work.c/mc/mc-1866_filesystem_reorganization/lib/filehighlight/common.c  -fPIC -DPIC -o .libs/libmcfilehighlight_la-common.o
In file included from /home/andrew/work.c/mc/mc-1866_filesystem_reorganization/lib/filehighlight/common.c:31:
../../../src/global.h:96:24: error: ../vfs/vfs.h: No such file or directory
make[3]: *** [libmcfilehighlight_la-common.lo] Error 1
make[2]: *** [all-recursive] Error 1
make[1]: *** [all-recursive] Error 1
make: *** [all] Error 2

[metux]

Replying to andrew_b:

Cannot build:

Making all in filehighlight
mkdir .libs
 gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I/home/andrew/work.c/mc/mc-1866_filesystem_reorganization/lib/filehighlight -I../.. -I../ -I/home/andrew/work.c/mc/mc-1866_filesystem_reorganization/src -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DDATADIR=\"/home/andrew/work.c/mc/mc-1866_filesystem_reorganization/BUILD_ROOT/INSTALL_ROOT/share/mc/\" -DLOCALEDIR=\"/home/andrew/work.c/mc/mc-1866_filesystem_reorganization/BUILD_ROOT/INSTALL_ROOT/share/locale\" -fdiagnostics-show-option -Wcomment -Wdeclaration-after-statement -Wformat -Wimplicit-function-declaration -Wimplicit-int -Wmissing-braces -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-long-long -Wno-unreachable-code -Wparentheses -Wpointer-sign -Wreturn-type -Wshadow -Wsign-compare -Wswitch -Wuninitialized -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wwrite-strings -g3 -O -ggdb -g -O2 -MT libmcfilehighlight_la-common.lo -MD -MP -MF .deps/libmcfilehighlight_la-common.Tpo -c /home/andrew/work.c/mc/mc-1866_filesystem_reorganization/lib/filehighlight/common.c  -fPIC -DPIC -o .libs/libmcfilehighlight_la-common.o
In file included from /home/andrew/work.c/mc/mc-1866_filesystem_reorganization/lib/filehighlight/common.c:31:
../../../src/global.h:96:24: error: ../vfs/vfs.h: No such file or directory
make[3]: *** [libmcfilehighlight_la-common.lo] Error 1
make[2]: *** [all-recursive] Error 1
make[1]: *** [all-recursive] Error 1
make: *** [all] Error 2

[metux]

perhaps we should merge the vfs.h/vfsdummy.h reworking first
(this makes all .c files including vfs.h directly)

[slavazanko]

• a1c213dd6fe5d91203b1eae9829e35fdc2726179: Fixed for sucessfull build with vfs stuff

review again, please

perhaps we should merge the vfs.h/vfsdummy.h reworking first (this makes all .c files including vfs.h directly)

Is these will be incompatible with this branch (if branch will merged into master)?

[metux]

fish.c:55:27: error: ../src/global.h: No such file or directory
fish.c:57:63: error: ../lib/tty/tty.h: No such file or directory
fish.c:59:43: error: ../src/wtools.h: No such file or directory
fish.c:60:49: error: ../src/main.h: No such file or directory
fish.c:61:25: error: ../src/util.h: No such file or directory
fish.c:62:30: error: ../src/strescape.h: No such file or directory
fish.c:63:31: error: ../src/unixcompat.h: No such file or directory
fish.c:64:23: error: ../src/fs.h: No such file or directory

[....]

[slavazanko]

Okay, errors fixed. Try to review again :).
Branch contain lot of commits therefore look into sources directly, not from web-interface :)

[slavazanko]

merge in master:173d2d4b909483608c449be15b545b4d305750ac

stable branch:

git log 7db3ed92ac7995534c2be72df198a530501efbcf^...e7fb6cf7a590f12b15eec18e04339feb74612155

[zaytsev]

Very funny to see this in the STABLE branch, but well, I agree that it will make easier to cherry-pick.

[slavazanko]

I agree that it will make easier to cherry-pick.

yes, this is a reason.