Tidy up and fix cscript some more.

1 files changed, 18 insertions, 24 deletions

diff --git a/cscript b/cscript
index 2563f27..a8dcbd0 100644
--- a/cscript
+++ b/cscript
@@ -19,29 +19,23 @@
 
 def build(target, options):
     if target.platform == 'linux':
-        target.command('make generic')
-        target.command('make -j%d -C build_generic' % target.parallel)
-        target.command('mkdir -p %s/include/lwext4' % target.directory)
-        target.command('cp -r include/* %s/include/lwext4' % target.directory)
-        target.command('cp -r build_generic/include/generated %s/include/lwext4' % target.directory)
-        target.command('cp blockdev/linux/file_dev.h %s/include/lwext4' % target.directory)
-        target.command('cp build_generic/src/liblwext4.so %s/lib' % target.directory)
-        target.command('cp build_generic/blockdev/libblockdev.so %s/lib' % target.directory)
+        type = 'generic'
+        blockdev = 'linux'
+        ext = 'so'
     elif target.platform == 'osx':
-        target.command('make generic')
-        target.command('make -j%d -C build_generic' % target.parallel)
-        target.command('mkdir -p %s/include/lwext4' % target.directory)
-        target.command('cp -r include/* %s/include/lwext4' % target.directory)
-        target.command('cp -r build_generic/include/generated %s/include/lwext4' % target.directory)
-        target.command('cp blockdev/linux/file_dev.h %s/include/lwext4' % target.directory)
-        target.command('cp build_generic/src/liblwext4.dylib %s/lib' % target.directory)
-        target.command('cp build_generic/blockdev/libblockdev.dylib %s/lib' % target.directory)
+        type = 'generic'
+        blockdev = 'linux'
+        ext = 'dylib'
     elif target.platform == 'windows':
-        target.command('make mingw')
-        target.command('make -j%d -C build_mingw')
-        target.command('mkdir -p %s/include/lwext4' % target.directory)
-        target.command('cp -r include/* %s/include/lwext4' % target.directory)
-        target.command('cp -r build_mingw/include/generated %s/include/lwext4' % target.directory)
-        target.command('cp blockdev/windows/file_dev.h %s/include/lwext4' % target.directory)
-        target.command('cp build_mingw/src/liblwext4.dll %s/lib' % target.directory)
-        target.command('cp build_mingw/blockdev/libblockdev.dll %s/lib' % target.directory)
+        type = 'mingw'
+        blockdev = 'windows'
+        ext = 'dll'
+
+    target.command('mkdir -p %s/include/lwext4' % target.directory)
+    target.command('cp -r include/* %s/include/lwext4' % target.directory)
+    target.command('make %s' % type)
+    target.command('make -j%d -C build_%s' % (target.parallel, type))
+    target.command('cp -r build_%s/include/generated %s/include/lwext4' % (type, target.directory))
+    target.command('cp blockdev/%s/file_dev.h %s/include/lwext4' % (blockdev, target.directory))
+    target.command('cp build_%s/src/liblwext4.%s %s/lib' % (type, ext, target.directory))
+    target.command('cp build_%s/blockdev/libblockdev.%s %s/lib' % (type, ext, target.directory))