PWR_EXT_INC added to plc compile cmd for adding of external include directories

wb/changelog.txt

@@ -133,3 +133,5 @@
 090515 cs  wtt       Bugfix in ConnectGraph method for PlantHier objects.
 090518 cs  wb        Wb method PostRename added and implemented for XttGraph and ProjectReg objects.
 090518 cs  wb        Advanced user set as default in wb.
+090630 cs  wb        Directory database changed from BerkeleyDb to wb_load format.
+090701 cs  plc       Env variable PWR_EXT_INC added to plc compile command. Replaces pwrp_cmn.
\ No newline at end of file

wb/exp/com/src/os_linux/wb_gcg.sh

@@ -245,7 +245,6 @@ OsMaskToOpSys $OsMask # Convert Bitmask to index
 # Local symbols
 #
 
-
 let OpSys__Low=0
 let OpSys_VAX_ELN=1
 let OpSys_VAX_VMS=2
@@ -289,8 +288,14 @@ fi
 #
 # Check OpSys
 #
-# How can we find out if this is a ppc or x86 host?
-#
+# Current opsys
+machine=`eval uname -m`
+if [ $machine = "x86_64" ]; then
+  CurrentOpSys=$OpSys_X86_64_LINUX
+else
+  CurrentOpSys=$OpSys_X86_LINUX
+fi
+
 #
 # Check FileType
 #
@@ -303,13 +308,11 @@ fi
 OsStr="`echo $vOpSys| cut -f $OpSys -d ,`"
 let FileTypeIdx=$FileType+1
 
-if [ $OpSys -eq $OpSys_PPC_LINUX ] || [ $OpSys -eq $OpSys_X86_LINUX ] || [ $OpSys -eq $OpSys_X86_64_LINUX ]; 
-then
-
+if [ $OpSys -eq $OpSys_PPC_LINUX ]; then
   pwrp_gc="$pwrp_tmp"
 
 # Suppress all warnings, -x
-  cc_cmd="gcc -c -x c -w $cc_debug -D_REENTRANT -DOS_LINUX -I$pwr_inc -I$pwrp_inc -I$pwrp_tmp -I$pwrp_cmn/common/inc"
+  cc_cmd="gcc -c -x c -w $cc_debug -D_REENTRANT -DOS_LINUX -I$pwr_inc -I$pwrp_inc -I$pwrp_tmp $PWR_EXT_INC"
 
   FileTypeStr="`echo $vFileType| cut -f $FileTypeIdx -d ,`"
 
@@ -317,6 +320,38 @@ then
   Compile$FileTypeStr
   exit $gcg_status
 
+elif [ $OpSys -eq $OpSys_X86_LINUX ]; then
+  pwrp_gc="$pwrp_tmp"
+
+# Suppress all warnings, -x
+  if [ $CurrentOpSys -eq $OpSys ]; then
+     cc_cmd="gcc -c -x c -w $cc_debug -D_REENTRANT -DOS_LINUX -I$pwr_inc -I$pwrp_inc -I$pwrp_tmp $PWR_EXT_INC"
+
+     FileTypeStr="`echo $vFileType| cut -f $FileTypeIdx -d ,`"
+
+# Execute build command
+     Compile$FileTypeStr
+     exit $gcg_status
+  elif [ $CurrentOpSys -eq $OpSys_X86_64_LINUX ]; then
+      echo "-- Not built for x86_linux"
+  fi
+
+elif [ $OpSys -eq $OpSys_X86_64_LINUX ]; then
+  pwrp_gc="$pwrp_tmp"
+
+# Suppress all warnings, -x
+  if [ $CurrentOpSys -eq $OpSys ]; then
+      cc_cmd="gcc -c -x c -w $cc_debug -D_REENTRANT -DOS_LINUX -I$pwr_inc -I$pwrp_inc -I$pwrp_tmp $PWR_EXT_INC"
+
+      FileTypeStr="`echo $vFileType| cut -f $FileTypeIdx -d ,`"
+
+# Execute build command
+      Compile$FileTypeStr
+      exit $gcg_status
+  elif [ $CurrentOpSys -eq $OpSys_X86_LINUX ]; then
+      echo "-- Not built for x86_64_linux"
+  fi
+
 elif [ $OpSys -eq $OpSys_AXP_VMS ]; then
 
   rsh $pwr_build_host_axp_vms @pwr_exe:wb_gcg \"$1\" \"$2\" \"$3\" \"$4\" \"$5\" \"$6\" \"$7\" \"$pwrp_root\"