Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Made the VFS server work again #34

Merged
merged 8 commits into from
May 21, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions grub.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ module /servers/console
module /servers/keyboard
module /servers/vga
module /servers/log
module /servers/virtual_file_system
module /servers/boot
2 changes: 1 addition & 1 deletion servers/Rakefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Rake.application.options.rakelib = [pwd + '/../rakelib'] if Rake.application.options.rakelib.first == 'rakelib'

subfolders = %w(
file_system
system
video
)

# These haven't been upgraded to work w/ Rake yet.
# network
# system
# file_system
# sound
# other
# block
Expand Down
23 changes: 23 additions & 0 deletions servers/file_system/Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Rake.application.options.rakelib = [pwd + '/../../rakelib'] if Rake.application.options.rakelib.first == 'rakelib'

subfolders = %w(
virtual_file_system
)

task :default => subfolders do |t|
t.prerequisites.each do |folder|
sh "cd #{folder} && #{RAKE_COMMAND}"
end
end

task :clean do
subfolders.each do |folder|
sh "cd #{folder} && #{RAKE_COMMAND} clean"
end
end

task :install => :default do
subfolders.each do |folder|
sh "cd #{folder} && #{RAKE_COMMAND} install"
end
end
30 changes: 0 additions & 30 deletions servers/file_system/makefile

This file was deleted.

15 changes: 15 additions & 0 deletions servers/file_system/virtual_file_system/Rakefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
OBJECTS = %w(
virtual_file_system.o
)

LIBRARIES = %w(
ipc
memory
log
string
system
)

OUTPUT = 'virtual_file_system'

load '../../servers.rake'
Loading