Ticket #1866 (closed task: fixed)

Opened 10 years ago

Last modified 9 years ago

Move edit/ and vfs/ directories into src/

Reported by: andrew_b Owned by: slavazanko
Priority: trivial Milestone: 4.7.1
Component: mc-core Version: master
Keywords: Cc:
Blocked By: Blocking:
Branch state: Votes for changeset: committed-master committed-stable

Description (last modified by metux) (diff)

Moving edit* and vfs/ subdirs to src/

Change History

comment:1 Changed 10 years ago by andrew_b

  • Summary changed from Move edit/ and vfs/ subdirectories into src/ to Move edit/ and vfs/ directories into src/

comment:2 Changed 10 years ago by slavazanko

  • Status changed from new to accepted
  • Owner set to slavazanko

comment:3 Changed 10 years ago by slavazanko

  • severity changed from no branch to on rework

Created branch 1866_filesystem_reorganization
Current status: 'on rework'

comment:4 Changed 10 years ago by slavazanko

  • severity changed from on rework to on review

Branch: 1866_filesystem_reorganization

Changesets:

Review, please.

comment:5 follow-up: ↓ 6 Changed 10 years ago by andrew_b

  • severity changed from on review to on rework

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

comment:6 in reply to: ↑ 5 Changed 10 years ago by metux

  • Description modified (diff)

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

comment:7 Changed 10 years ago by metux

  • Description modified (diff)

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

comment:8 Changed 10 years ago by slavazanko

  • severity changed from on rework to on review

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)?

comment:9 Changed 10 years ago by metux

  • severity changed from on review to on rework

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

[....]

comment:10 Changed 9 years ago by slavazanko

  • severity changed from on rework to on review

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

comment:11 Changed 9 years ago by andrew_b

  • Votes for changeset set to andrew_b

comment:12 Changed 9 years ago by styx

  • Votes for changeset changed from andrew_b to andrew_b styx

comment:13 Changed 9 years ago by styx

  • severity changed from on review to approved

comment:14 Changed 9 years ago by slavazanko

  • Status changed from accepted to testing
  • Votes for changeset changed from andrew_b styx to commited-master commited-stable
  • Resolution set to fixed
  • severity changed from approved to merged

merge in master:173d2d4b909483608c449be15b545b4d305750ac

stable branch:

git log 7db3ed92ac7995534c2be72df198a530501efbcf^...e7fb6cf7a590f12b15eec18e04339feb74612155

comment:15 Changed 9 years ago by slavazanko

  • Status changed from testing to closed

comment:16 Changed 9 years ago by zaytsev

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

comment:17 Changed 9 years ago by slavazanko

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

yes, this is a reason.

Note: See TracTickets for help on using tickets.