Changeset 16092 for trunk/psconfig/psbuild

Timestamp:

Jan 15, 2008, 6:01:17 PM (19 years ago)

Author:

eugene

Message:

fixing various build issues: where to get mysql, options passed to extlibs, name cleanups

File:

• trunk/psconfig/psbuild (modified) (6 diffs)

trunk/psconfig/psbuild

@@ -8 +8 @@
 $rebuild = 0;
 $optimize = 0;
+$developer = 0;
 $start = "";
 $stop = "";
@@ -32 +33 @@
     if ($ARGV[0] eq "-optimize") {
         $optimize = 1;
+        shift; next;
+    }
+    if ($ARGV[0] eq "-dev") {
+        $developer = 1;
         shift; next;
     }
@@ -155 +160 @@
         $start = "";
 
-        ($do_tag, $do_build, $do_package, $do_update) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)|;
+        ($do_tag, $do_build, $do_package, $do_update, $dev_build) = $mode[$i] =~ m|(\S)(\S)(\S)(\S)(\S)|;
+        if ($developer) { $do_build = $dev_build; }
         if ($do_build eq "N") { next; }
 
@@ -192 +198 @@
         if ($rebuild && $clean) {
             if (-e "configure") { unlink "Makefile"; }
-            if (-e "configure.ac" && -e "autogen.sh") { unlink "configure"; }
+            if ($developer && -e "configure.ac" && -e "autogen.sh") { unlink "configure"; }
         }
         $rebuild_this = $rebuild;
@@ -201 +207 @@
         #  run autogen
         $skip_configure = 0;
-        if ($rebuild_this && ! -e "configure" && -e "autogen.sh") {
+        if ($developer && $rebuild_this && ! -e "configure" && -e "autogen.sh") {
             $skip_configure = 1;
             vsystem ("$psautogen $psopts");
@@ -296 +302 @@
     print STDERR "     : -version (version) : specify alternate psconfig installation version\n";
     print STDERR "     : -clean             : clean the source directories before building\n";
-    print STDERR "     : -rebuild           : run 'autogen' (C code)\n";
+    print STDERR "     : -rebuild           : run 'configure (and autogen for developer)' (C code)\n";
     print STDERR "     : -optimize          : set flags for optimized code\n";
     print STDERR "     : -only (module)     : only build the specified module\n";
     print STDERR "     : -start (module)    : begin build at specified module\n";
     print STDERR "     : -stop (module)     : stop build after specified module\n\n";
+    print STDERR "     : -developer         : build modules not distributed in tarball\n\n";
     print STDERR "     : psbuild -list      : list the available distributions\n";
     print STDERR "     : psbuild -h         : this help listing\n";