Changeset 552

Timestamp:

02/14/09 00:51:26 (3 years ago)

Author:

mooneer

Message:

Added pre and post-clean rules, and gcc will compile files only when .c/.cc/.cpp is newer than the .o file.

File:

• interpreter/trunk/modules/System/package/builder.kt (modified) (7 diffs)

interpreter/trunk/modules/System/package/builder.kt

@@ -55 +55 @@
     property custom_post_install_rules
         /[Custom install rules (post-install).]/,
+    property custom_pre_clean_rules
+        /[Custom install rules (pre-clean).]/,
+    property custom_post_clean_rules
+        /[Custom install rules (post-clean).]/,
     property module_depends
         /[Modules that libraries depend on.]/,
@@ -70 +74 @@
         this.custom_pre_install_rules = [];
         this.custom_post_install_rules = [];
+        this.custom_pre_clean_rules = [];
+        this.custom_post_clean_rules = [];
     ]
 ];
@@ -89 +95 @@
         [
             # Simple Kite file. Copy to dist folder.
-            run_command_with_echo("cp %s dist/%s"|format([lib_file, lib|replace(".", "/")]));
+            run_command_with_echo("cp -f %s dist/%s"|format([lib_file, lib|replace(".", "/")]));
             null;
             return;
@@ -96 +102 @@
         [
             # C++ file.
-            run_command_with_echo("%s %s %s -c %s"|format([
+            run_command_with_echo("if [ \! \( -e %s \) -o \( %s -nt %s \) ]; then %s %s %s -c %s; fi"|format([
+                (make System.regex("\\..+?$"))|replace(lib_file, ".o"),
+                lib_file,
+                (make System.regex("\\..+?$"))|replace(lib_file, ".o"),
                 System.compile_options.build_cplusplus,
                 System.compile_options.build_cxxflags,
@@ -104 +113 @@
         true [
             # C file.
-            run_command_with_echo("%s %s %s -c %s"|format([
+            run_command_with_echo("if [ \! \( -e %s \) -o \( %s -nt %s \) ]; then %s %s %s -c %s; fi"|format([
+                (make System.regex("\\..+?$"))|replace(lib_file, ".o"),
+                lib_file,
+                (make System.regex("\\..+?$"))|replace(lib_file, ".o"),
                 System.compile_options.build_cc,
                 System.compile_options.build_cxxflags,
@@ -255 +267 @@
 [
     process_builder_custom_rules(options, options.custom_pre_install_rules);
-    run_command_with_echo("cp -R dist/* %s"|format([System.compile_options.build_install_dir]));
+    run_command_with_echo("cp -fR dist/* %s"|format([System.compile_options.build_install_dir]));
     process_builder_custom_rules(options, options.custom_post_install_rules);
 ];
@@ -273 +285 @@
         (os_args|count > 1 and os_args[1] == "clean")
         [
+            process_builder_custom_rules(options, options.custom_pre_clean_rules);
             run_command_with_echo("rm -rf dist/");
+            run_command_with_echo("rm -rf *.o");
+            process_builder_custom_rules(options, options.custom_post_clean_rules);
         ],
         (os_args|count > 1 and os_args[1] == "install")