ARM plc cross compile bugfix

src/tools/pkg/deb/adm/pwra_env.sh

@@ -28,7 +28,13 @@ pwra_set_func()
     baseroot=${baseroot%/}
     if [ ! -e "$baseroot" ]; then
       echo "Base $baseroot doesn't exist"
-    elif [ "$3" != "cross" ]; then
+    elif [ "$3" = "" ]; then
+      if [ ! -e $baseroot/$3/exp/exe/pwrp_env.sh ]; then
+        echo "Not a base directory: $baseroot"
+        return
+      fi
+      source $baseroot/$3/exp/exe/pwrp_env.sh set baseroot $baseroot
+    else
       if [ ! -e $baseroot/$os/$hw/exp/exe/pwrp_env.sh ]; then
         echo "Not a base directory: $baseroot"
         return
@@ -153,7 +159,7 @@ pwra_parse ()
 
   cmd="set"
   if [ $1 = $cmd ] || [ ${cmd#$1} != $cmd ]; then
-    pwra_set_func $2 $3
+    pwra_set_func $2 $3 $4
     return
   fi
 

src/tools/pkg/deb_x86_64/adm/pwra_env.sh

@@ -28,7 +28,13 @@ pwra_set_func()
     baseroot=${baseroot%/}
     if [ ! -e "$baseroot" ]; then
       echo "Base $baseroot doesn't exist"
-    elif [ "$3" != "cross" ]; then
+    elif [ "$3" = "" ]; then
+      if [ ! -e $baseroot/$3/exp/exe/pwrp_env.sh ]; then
+        echo "Not a base directory: $baseroot"
+        return
+      fi
+      source $baseroot/$3/exp/exe/pwrp_env.sh set baseroot $baseroot
+    else
       if [ ! -e $baseroot/$os/$hw/exp/exe/pwrp_env.sh ]; then
         echo "Not a base directory: $baseroot"
         return
@@ -153,7 +159,7 @@ pwra_parse ()
 
   cmd="set"
   if [ $1 = $cmd ] || [ ${cmd#$1} != $cmd ]; then
-    pwra_set_func $2 $3
+    pwra_set_func $2 $3 $4
     return
   fi
 

src/tools/pkg/ubu/adm/pwra_env.sh

@@ -28,7 +28,13 @@ pwra_set_func()
     baseroot=${baseroot%/}
     if [ ! -e "$baseroot" ]; then
       echo "Base $baseroot doesn't exist"
-    elif [ "$3" != "cross" ]; then
+    elif [ "$3" = "" ]; then
+      if [ ! -e $baseroot/$3/exp/exe/pwrp_env.sh ]; then
+        echo "Not a base directory: $baseroot"
+        return
+      fi
+      source $baseroot/$3/exp/exe/pwrp_env.sh set baseroot $baseroot
+    else
       if [ ! -e $baseroot/$os/$hw/exp/exe/pwrp_env.sh ]; then
         echo "Not a base directory: $baseroot"
         return

src/tools/pkg/ubu_x86_64/adm/pwra_env.sh

@@ -28,7 +28,13 @@ pwra_set_func()
     baseroot=${baseroot%/}
     if [ ! -e "$baseroot" ]; then
       echo "Base $baseroot doesn't exist"
-    elif [ "$3" != "cross" ]; then
+    elif [ "$3" = "" ]; then
+      if [ ! -e $baseroot/$3/exp/exe/pwrp_env.sh ]; then
+        echo "Not a base directory: $baseroot"
+        return
+      fi
+      source $baseroot/$3/exp/exe/pwrp_env.sh set baseroot $baseroot
+    else
       if [ ! -e $baseroot/$os/$hw/exp/exe/pwrp_env.sh ]; then
         echo "Not a base directory: $baseroot"
         return
@@ -153,7 +159,7 @@ pwra_parse ()
 
   cmd="set"
   if [ $1 = $cmd ] || [ ${cmd#$1} != $cmd ]; then
-    pwra_set_func $2 $3
+    pwra_set_func $2 $3 $4
     return
   fi
 

src/tools/pwre/src/os_linux/hw_arm/import_files.mk

@@ -79,7 +79,7 @@ op_motif_modules = \
 java_modules = \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_rt.jar \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_jop.jar \
-		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_jopc.jar \
+		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_jopg.jar \
 		$(pwre_broot)/$(pwre_os)/$(pwre_hw)/exp/lib/pwr_rt_client.jar
 
 

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

@@ -271,10 +271,11 @@ let OpSys_X86_LYNX=5
 let OpSys_PPC_LINUX=6
 let OpSys_X86_LINUX=7
 let OpSys_X86_64_LINUX=8
+let OpSys_X86_64_MACOS=9
 let OpSys_ARM_LINUX=10
 let OpSys__High=11
 
-vOpSys="custombuild,vax_vms,axp_vms,ppc_lynx,x86_lynx,ppc_linux,x86_linux,x86_64_linux,arm_linux"
+vOpSys="custombuild,vax_vms,axp_vms,ppc_lynx,x86_lynx,ppc_linux,x86_linux,x86_64_linux,x86_64_macos,arm_linux"
 
 let FileType__Low=-1
 let FileType_Process=0

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

@@ -271,14 +271,14 @@ let OpSys_X86_LYNX=5
 let OpSys_PPC_LINUX=6
 let OpSys_X86_LINUX=7
 let OpSys_X86_64_LINUX=8
-let OpSys_ARM_LINUX=9
-let OpSys_X86_64_MACOS=10
+let OpSys_X86_64_MACOS=9
+let OpSys_ARM_LINUX=10
 let OpSys_X86_64_FREEBSD=11
 let OpSys_X86_64_OPENBSD=12
 let OpSys_X86_CYGWIN=13
 let OpSys__High=14
 
-vOpSys="custombuild,vax_vms,axp_vms,ppc_lynx,x86_lynx,ppc_linux,x86_linux,x86_64_linux,arm_linux,x86_64_macos,x86_64_freebsd,x86_64_openbsd,x86_cygwin"
+vOpSys="custombuild,vax_vms,axp_vms,ppc_lynx,x86_lynx,ppc_linux,x86_linux,x86_64_linux,x86_64_macos,arm_linux,x86_64_freebsd,x86_64_openbsd,x86_cygwin"
 
 let FileType__Low=-1
 let FileType_Process=0

wb/lib/wb/src/wb_lfu.cpp

@@ -2456,6 +2456,7 @@ pwr_tStatus lfu_SaveDirectoryVolume(
 	pwr_tString40 platform;
 	pwr_tString40 release;
 	FILE *fp;
+	char expdir[80];
 
 	// Get NodeName
 	wb_attribute a = sp->attribute( nodeo.oid(), "RtBody", "NodeName");
@@ -2542,10 +2543,24 @@ pwr_tStatus lfu_SaveDirectoryVolume(
 	fprintf( fp, "#!/bin/bash\n\n");
 	fprintf( fp, "let OpSys_PPC_LINUX=32\n");
 	fprintf( fp, "let OpSys_X86_LINUX=64\n");
-	fprintf( fp, "let OpSys_ARM_LINUX=256\n\n");
+	fprintf( fp, "let OpSys_ARM_LINUX=512\n\n");
+
+	switch ( opsys) {
+	case pwr_mOpSys_PPC_LINUX:
+	  strcpy( expdir, "os_linux/hw_ppc");
+	  break;
+	case pwr_mOpSys_X86_LINUX:
+	  strcpy( expdir, "os_linux/hw_x86");
+	  break;
+	case pwr_mOpSys_ARM_LINUX:
+	  strcpy( expdir, "os_linux/hw_arm");
+	  break;
+	default: ;
+	  strcpy( expdir, "");
+	}
 
 	if ( strcmp( release, "") != 0)
-	  fprintf( fp, "source $pwra_db/pwra_env.sh set base %s cross\n\n", release);
+	  fprintf( fp, "source $pwra_db/pwra_env.sh set base %s %s\n\n", release, expdir);
 
 	if ( strcmp( cc, "") != 0) {
 	  fprintf( fp, "export pwre_cc=%s\n", cc);