Merge branch 'master' of 62.20.65.89:/data1/git/pwr

build-howto.info

@@ -60,11 +60,11 @@ There has to be a valid display when building proview.
 -----------
 Unpack the source package
 
-> tar -xzvf pwrsrc_4.6.0.tar.gz
+> tar -xzvf pwrsrc_4.7.0.tar.gz
 
 Enter the sourcecode root directory
 
-> cd pwr_4.6.0
+> cd pwr_4.7.0
 
 Execute the makefile
 
@@ -86,8 +86,8 @@ handle different version of proview.
 The first thing to do is to set up your environment properly. Add the 
 following lines to .bashrc:
 
-# Where /home/robert/x4-6-0 is replaced with wherever you unpacked the sources.
-export pwre_bin="/home/robert/x4-6-0/pwr/src/tools/pwre/src/os_linux"
+# Where /home/robert/x4-7-0 is replaced with wherever you unpacked the sources.
+export pwre_bin="/home/robert/x4-7-0/pwr/src/tools/pwre/src/os_linux"
 export pwre_dir_symbols="$pwre_bin/dir_symbols.mk"
 source $pwre_bin/pwre_function
 export pwre_env_db="/home/robert/pwre_new"
@@ -107,12 +107,13 @@ Add environment named 'x460x86' (choose any name you like).
 
 > pwre add x460x86
 
-Source root [...] ? /home/robert/x4-6-0/pwr/src  (where /home/robert/x4-6-0 is
+Source root [...] ? /home/robert/x4-7-0/pwr/src  (where /home/robert/x4-7-0 is
 replaced with wherever you unpacked the sources)
-Build root [...] ? /home/robert/pwr/x4-6-0/rls_dbg  (choose typically .../pwr/version/rls_dbg)
+Import root [] ?
+Build root [...] ? /home/robert/pwr/x4-7-0/rls_dbg  (choose typically .../pwr/version/rls_dbg)
 Build type [dbg] ? 
-OS [linux] ? 
-Hardware [x86] ?
+OS [linux] ? 		(linux or macos)
+Hardware [x86] ? 	(x86 or x86_64)
 Description  ? robert's environment  (whatever...)
 
 list all existing environments:
@@ -206,7 +207,7 @@ Copy some files to this directory (if they do not already exist)
 Create a file name pwr_projectlist.dat in this directory and add the following
 line to this file:
 
-%base X4.6.0	/home/robert/pwr/X4-6-0/rls_dbg
+%base X4.7.0	/home/robert/pwr/X4-7-0/rls_dbg
 
 where the path is your build-root ($pwre_broot).
 

build.sh

@@ -54,7 +54,7 @@ ename=$ver$hw
 desc=$verl
 
 
-pwre add $ename $root/src $root/rls $btype $os $hw "$desc"
+pwre add $ename $root/src \"\" $root/rls $btype $os $hw "$desc"
 pwre init $ename
 
 # Build

src/tools/pwre/src/os_linux/pwre.pl

@@ -1402,31 +1402,35 @@ sub get_vars ()
   } else {
     $sroot = $_[1];
   }
-  $vmsinc = 	get_var(" Import root  [%s]? ", $vmsinc);
   if ($_[2] eq "") {
-    $broot = 	get_var(" Build root  [%s]? ", $broot);
+    $vmsinc = 	get_var(" Import root  [%s]? ", $vmsinc);
   } else {
-    $broot = $_[2];
+    $vmsinc = $_[2];
   }
   if ($_[3] eq "") {
-    $btype = 	get_var(" Build type  [%s]? ", $btype);
+    $broot = 	get_var(" Build root  [%s]? ", $broot);
   } else {
-    $btype = $_[3];
+    $broot = $_[3];
   }
   if ($_[4] eq "") {
-    $os =    	get_var(" OS          [%s]? ", $os);
+    $btype = 	get_var(" Build type  [%s]? ", $btype);
   } else {
-    $os = $_[4];
+    $btype = $_[4];
   }
   if ($_[5] eq "") {
-    $hw =    	get_var(" Hardware    [%s]? ", $hw);
+    $os =    	get_var(" OS          [%s]? ", $os);
   } else {
-    $hw = $_[5];
+    $os = $_[5];
   }
   if ($_[6] eq "") {
+    $hw =    	get_var(" Hardware    [%s]? ", $hw);
+  } else {
+    $hw = $_[6];
+  }
+  if ($_[7] eq "") {
     $desc =  	get_var(" Description [%s]? ", $desc);
   } else {
-    $desc = $_[6];
+    $desc = $_[7];
   }
 
   $varstr = join(";", ($sroot, $vmsinc, $broot, $btype, $os, $hw, $desc));

src/tools/pwre/src/os_macos/pwre.pl

@@ -1402,38 +1402,41 @@ sub get_vars ()
   } else {
     $sroot = $_[1];
   }
-  $vmsinc = 	get_var(" Import root  [%s]? ", $vmsinc);
   if ($_[2] eq "") {
-    $broot = 	get_var(" Build root  [%s]? ", $broot);
+    $vmsinc = 	get_var(" Import root  [%s]? ", $vmsinc);
   } else {
-    $broot = $_[2];
+    $vmsinc = $_[2];
   }
   if ($_[3] eq "") {
-    $btype = 	get_var(" Build type  [%s]? ", $btype);
+    $broot = 	get_var(" Build root  [%s]? ", $broot);
   } else {
-    $btype = $_[3];
+    $broot = $_[3];
   }
   if ($_[4] eq "") {
-    $os =    	get_var(" OS          [%s]? ", $os);
+    $btype = 	get_var(" Build type  [%s]? ", $btype);
   } else {
-    $os = $_[4];
+    $btype = $_[4];
   }
   if ($_[5] eq "") {
-    $hw =    	get_var(" Hardware    [%s]? ", $hw);
+    $os =    	get_var(" OS          [%s]? ", $os);
   } else {
-    $hw = $_[5];
+    $os = $_[5];
   }
   if ($_[6] eq "") {
+    $hw =    	get_var(" Hardware    [%s]? ", $hw);
+  } else {
+    $hw = $_[6];
+  }
+  if ($_[7] eq "") {
     $desc =  	get_var(" Description [%s]? ", $desc);
   } else {
-    $desc = $_[6];
+    $desc = $_[7];
   }
 
   $varstr = join(";", ($sroot, $vmsinc, $broot, $btype, $os, $hw, $desc));
 
 }
 
-
 sub get_var()
 {
   my($tmp);

wb/exe/wb_upgrade/src/os_linux/link_rule.mk

@@ -7,6 +7,6 @@ link = $(ldxx) $(elinkflags) $(domap) -o $(export_exe) \
 	-L/usr/local/BerkeleyDB.4.0/lib \
 	-lpwr_wb -lpwr_rt -lpwr_ge -lpwr_flow -lpwr_glow -lpwr_cow -lpwr_co \
 	-lpwr_msg_dummy -lantlr \
-	-lrpcsvc -lpthread -lm -lrt -ldb_cxx -lz $(linkmysql)
+	-lrpcsvc -lpthread -lm -lrt -lcrypt -ldb_cxx -lz $(linkmysql)
 
 endif