Platform CustomBuild added (replaced VAX_ELN)

src/exp/inc/src/pwr_class.h

@@ -606,7 +606,7 @@ typedef pwr_tMask pwr_tOpSys;
 #if 1
 typedef enum {
   pwr_mOpSys__ = 0,
-  pwr_mOpSys_VAX_ELN =  1 << 0,
+  pwr_mOpSys_CustomBuild =  1 << 0,
   pwr_mOpSys_VAX_VMS =  1 << 1,
   pwr_mOpSys_AXP_VMS =  1 << 2,
   pwr_mOpSys_PPC_LYNX = 1 << 3,
@@ -614,7 +614,8 @@ typedef enum {
   pwr_mOpSys_PPC_LINUX = 1 << 5,
   pwr_mOpSys_X86_LINUX = 1 << 6,
   pwr_mOpSys_X86_64_LINUX = 1 << 7,
-  pwr_mOpSys_ = 1 << 8
+  pwr_mOpSys_ = 1 << 8,
+  pwr_mOpSys_VAX_ELN =  1 << 30    /* TODO Remove! */
 } pwr_mOpSys;
 
 #else

src/wbl/pwrs/src/pwrs_td_opsysenum.wb_load

@@ -35,8 +35,8 @@ SObject pwrs:Type
     !*/
     Object VAX_ELN $Value
      Body SysBody
-       Attr PgmName = "VAX_ELN"
-       Attr Text = "VAXELN on VAX"
+       Attr PgmName = "CustomBuild"
+       Attr Text = "CustomBuild"
        Attr Value = 1
      EndBody
     EndObject

src/wbl/pwrs/src/pwrs_td_opsysmask.wb_load

@@ -38,8 +38,8 @@ SObject pwrs:Type
     !*/
     Object VAX_ELN $Bit
      Body SysBody
-       Attr PgmName = "VAX_ELN"
-       Attr Text = "VAXELN on VAX"
+       Attr PgmName = "CustomBuild"
+       Attr Text = "CustomBuild"
        Attr Value = 1
      EndBody
     EndObject

wb/exe/wb/gtk/os_linux/link_rule.mk

@@ -8,7 +8,7 @@ ifeq ($(export_type),exp)
 	-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \
 	-L/opt/gnome/lib \
 	-lpwr_wb_gtk -lpwr_wb -lpwr_wb_gtk -lpwr_wb -lpwr_rt \
-        -lpwr_ge_gtk -lpwr_ge -lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow 
+        -lpwr_ge_gtk -lpwr_ge -lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow \
 	-lpwr_cow_gtk -lpwr_cow -lpwr_co -lpwr_rt -lpwr_statussrv \
 	`pkg-config --libs gtk+-2.0` \
 	-lpwr_msg_dummy -lantlr \

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

@@ -246,7 +246,7 @@ OsMaskToOpSys $OsMask # Convert Bitmask to index
 #
 
 let OpSys__Low=0
-let OpSys_VAX_ELN=1
+let OpSys_CustomBuild=1
 let OpSys_VAX_VMS=2
 let OpSys_AXP_VMS=3
 let OpSys_PPC_LYNX=4
@@ -256,7 +256,7 @@ let OpSys_X86_LINUX=7
 let OpSys_X86_64_LINUX=8
 let OpSys__High=9
 
-vOpSys="vax_eln,vax_vms,axp_vms,ppc_lynx,x86_lynx,ppc_linux,x86_linux,x86_64_linux"
+vOpSys="custombuild,vax_vms,axp_vms,ppc_lynx,x86_lynx,ppc_linux,x86_linux,x86_64_linux"
 
 let FileType__Low=-1
 let FileType_Process=0
@@ -269,6 +269,8 @@ vFileType="Process,Program,Window,RtNode,Library"
 
 local_setup="pwr_gcg_setup.sh"
 
+echo "OpSys $OsMask" 
+
 if [ -e ${local_setup} ]; then
 #  echo "-- Local setup file used"
   source ${local_setup} ${ProjectRoot} ${SystemName}
@@ -362,16 +364,20 @@ elif [ $OpSys -eq $OpSys_VAX_VMS ]; then
   rsh $pwr_build_host_vax_vms @pwr_exe:wb_gcg \"$1\" \"$2\" \"$3\" \"$4\" \"$5\" \"$6\" \"$7\" \"$pwrp_root\"
   exit $?
 
-elif [ $OpSys -eq $OpSys_VAX_ELN ]; then
-
-  rsh $pwr_build_host_vax_eln @pwr_exe:wb_gcg \"$1\" \"$2\" \"$3\" \"$4\" \"$5\" \"$6\" \"$7\" \"$pwrp_root\"
-  exit $?
-
 elif [ $OpSys -eq $OpSys_X86_LYNX ]; then
 
   MyRsh $pwr_build_host_x86_lynx '$pwr_exe/wb_gcg.sh' \"$1\" \"$2\" \"$3\" \"$4\" \"$5\" \"$6\" \"$7\" \"$pwrp_root\"
   exit $gcg_status
 
+elif [ $OpSys -eq $OpSys_CustomBuild ]; then
+
+  if [ -e $pwrp_exe/custom_build.sh ]; then
+    $pwrp_exe/custom_build.sh "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$pwrp_root"
+    exit $gcg_status
+  else
+    echo "Create \$pwrp_exe/custom_build.sh to build this volume"
+    exit $gcg_status
+  fi
 else
   echo "Unknown operating system: $OpSys"
   exit -1

wb/lib/wb/src/wb_gcg.cpp

@@ -103,7 +103,8 @@ extern "C" {
 
 #define IS_LINUX(os) ((os & pwr_mOpSys_PPC_LINUX) \
 		     || (os & pwr_mOpSys_X86_LINUX) \
-		     || (os & pwr_mOpSys_X86_64_LINUX))
+		     || (os & pwr_mOpSys_X86_64_LINUX) \
+		     || (os & pwr_mOpSys_CustomBuild))
 
 #define IS_UNIX(os) (IS_LINUX(os) || IS_LYNX(os))
 
@@ -850,6 +851,8 @@ static pwr_tStatus gcg_get_build_host(
 	  strcpy(logname, "pwr_build_host_x86_linux");
 	else if (os & pwr_mOpSys_X86_64_LINUX)
 	  strcpy(logname, "pwr_build_host_x86_64_linux");
+	else if (os & pwr_mOpSys_CustomBuild)
+	  strcpy(logname, "pwr_build_host_custom_build");
 	else
 	  return GSX__NOBUILDHOST;
 
@@ -5179,6 +5182,11 @@ int	gcg_comp_rtnode(
 	    strcpy( os_str, "X86_64_LINUX"); /* Not used */
 	    max_no_timebase = GCG_MAX_NO_TIMEBASE_LINUX;
 	    break;
+	  case pwr_mOpSys_CustomBuild:
+	    strcpy( objdir, "xxx");
+	    strcpy( os_str, "CustomBuild"); /* Not used */
+	    max_no_timebase = GCG_MAX_NO_TIMEBASE_LINUX;
+	    break;
 	  default:
 	    return GSX__UNKNOPSYS;
 	}
@@ -5404,6 +5412,7 @@ int	gcg_comp_rtnode(
 	        case pwr_mOpSys_X86_64_LINUX:
 	        case pwr_mOpSys_X86_LYNX:
 	        case pwr_mOpSys_PPC_LYNX:
+	        case pwr_mOpSys_CustomBuild:
 	          l += sprintf( &plclib_frozen[l], "%s%s ", PLCLIB_FROZEN_LINK_UNIX,
 			vldh_VolumeIdToStr( *volumelist_ptr));
 	          break;

wb/lib/wb/src/wb_lfu.cpp

@@ -1273,7 +1273,7 @@ pwr_tStatus lfu_SaveDirectoryVolume(
 	  if (EVEN(sts)) return sts;
 
 	  os = *os_ptr;
-	  if ( !(os == pwr_mOpSys_VAX_ELN ||
+	  if ( !(os == pwr_mOpSys_CustomBuild ||
 		 os == pwr_mOpSys_VAX_VMS ||
 		 os == pwr_mOpSys_AXP_VMS ||
 		 os == pwr_mOpSys_PPC_LYNX ||
@@ -2807,6 +2807,7 @@ pwr_tStatus lfu_check_opt_file( char *nodename, int bus_number, pwr_mOpSys opsys
   case pwr_mOpSys_PPC_LINUX:
   case pwr_mOpSys_X86_LINUX:
   case pwr_mOpSys_X86_64_LINUX:
+  case pwr_mOpSys_CustomBuild:
     fp << 
       "$pwr_obj/rt_io_user.o -lpwr_rt -lpwr_usbio_dummy" << endl;
     break;