Changeset 2794 for box/trunk/infrastructure

Timestamp:

18/10/2010 21:34:25 (19 months ago)

Author:

chris

Message:

Revert [2710] and [2717], remove TDB and replace with QDBM again, to fix
build on Windows and make it easier to merge Charles' work.

Location:

box/trunk/infrastructure

Files:

• makebuildenv.pl.in (modified) (5 diffs)
• makeparcels.pl.in (modified) (2 diffs)

box/trunk/infrastructure/makebuildenv.pl.in

@@ -253 +253 @@
         # check directory exists
         die "Module $mod can't be found\n" unless -d $mod;
-
-        # skip bundled libraries with their own Makefile process        
-        next if ($mod =~ m|^bundled/|);
         
         # and put in lists
@@ -514 +511 @@
         }       
         
+
         # make include path
-        my $include_paths = "";
-
-        foreach my $mod (@all_deps_for_module)
-        {
-                if ($mod =~ m|^bundled/| and -d "$mod/include")
-                {
-                        $include_paths .= "-I../../$mod/include ";
-                }
-                else
-                {
-                        $include_paths .= "-I../../$mod ";
-                }
-        }
+        my $include_paths = join(' ',map {'-I../../'.$_} @all_deps_for_module);
 
         # is target a library?
@@ -789 +775 @@
                                 $dep_target = "\$(OUTBASE)/$dep/$1.a";
                         }
-                        elsif ($dep =~ m|^bundled/(.*)|)
-                        {
-                                $dep_target = "lib$1.a";
-                        }
-                        elsif ($dep =~ m|^bin/(.*)|)
+                        elsif ($dep =~ m|^.*/(.*)|)
                         {
                                 $dep_target = "\$(OUTBASE)/$dep/$1$platform_exe_ext";
@@ -799 +781 @@
                         else
                         {
-                                die "Don't know how to add compile-time " .
-                                        "dependency on $dep";
+                                $dep_target = "lib$dep.a";
                         }
 
@@ -821 +802 @@
         foreach my $dep (reverse @all_deps_for_module)
         {
-                if ($dep =~ m|^lib/(.+)$|)
+                if ($dep =~ m|^lib\/(.+)$|)
                 {
                         push @lib_files, "\$(OUTBASE)/$dep/$1.a";
                 }
-                elsif ($dep =~ m|^bundled/(.+)$|)
+                elsif ($dep =~ m|^([^/]+)$|)
                 {
                         push @lib_files, "../../$dep/lib$1.a";

box/trunk/infrastructure/makeparcels.pl.in

@@ -244 +244 @@
                         push @parcel_deps, "$dir/docs/${name}.html";
                 }
-                elsif ($type eq 'configure')
+                elsif ($type eq 'subdir')
                 {
                         shift @args;
@@ -256 +256 @@
 $name-clean:
         cd $name; \$(MAKE) clean
-
 EOF
                         push @parcel_deps, "$name-build";