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

src/exe/co_convert/src/cnv_readwbl.cpp

@@ -1285,7 +1285,7 @@ char *CnvReadWbl::low( char *in)
 int CnvReadWbl::copy_tmp_file( const char *tmpfilename, ofstream& fp_to)
 {
   FILE *fp;
-  char c;
+  int c;
   char cmd[80];
 
   fp = fopen( tmpfilename, "r");

src/exe/co_convert/src/cnv_wbltoh.cpp

@@ -121,7 +121,7 @@ endl;
   dcli_search_file( fname, found_file, DCLI_DIR_SEARCH_END);
 
   FILE *fp_template = fopen( found_file, "r");
-  char c;
+  int c;
   while( (c = fgetc( fp_template)) != EOF)
     fp_struct.put(c);
   fclose( fp_template);

src/exp/com/src/os_linux/hw_arm/wb_rtt_comppicture.sh

@@ -54,7 +54,11 @@ then
   then
     ar_name_pict=${pwrp_lib}/ra_rtt_${pgmname}_pict.a
 
+    if [ "$pwre_cc" != "" ]; then
       cc=$pwre_cc
+    else
+      cc=gcc
+    fi
     cinc="-I$pwr_inc -I$pwrp_rttbld"
     cflags="-DOS_LINUX -DOS_POSIX -DOS=linux -DHW_ARM=1 -DPOSIX_SOURCE -DWall" 
     ${cc} -c -o $pwrp_obj/${name}.o $pwrp_rttbld/${name}.c ${cinc} ${cflags}
@@ -65,7 +69,11 @@ then
     bld_dir=$pwre_broot/$pwre_os/$pwre_hw/bld/lib/dtt
 #   echo $ar_name $ar_name_pict
 
+    if [ "$pwre_cc" != "" ]; then
       cc=$pwre_cc
+    else
+      cc=gcc
+    fi
     cinc="-I$pwr_inc -I${bld_dir}"
     cflags="-DOS_LINUX -DOS_POSIX -DOS=linux -DHW_ARM=1 -DPOSIX_SOURCE -DWall" 
     ${cc} -c -o ${bld_dir}/${name}.o \

src/exp/com/src/os_linux/pwrp_env.sh

@@ -1570,7 +1570,11 @@ pwrc_parse ()
     hw="hw_x86_64"
     platform="x86_64_freebsd"
   else
-    if [ $machine != "x86_64" ]; then
+    if [ $machine == "x86_64" ]; then
+      machine="x86_64"
+    elif [ ${machine:0:3} == "arm" ]; then
+      machine="arm"
+    else
       machine="x86"
     fi
     platform=$machine"_linux"

src/lib/rt/src/rt_rtt_os.c

@@ -1528,6 +1528,8 @@ int	rtt_get_hw( char *hw)
 	  strcpy( hw, "x86_64");
 	else if (strstr( buf.machine, "86") != 0)
 	  strcpy( hw, "x86");
+	else if (strstr( buf.machine, "arm") != 0)
+	  strcpy( hw, "arm");
 	return 1;
 #elif defined OS_MACOS || defined OS_FREEBSD || OS_OPENBSD
 	strcpy( hw, "x86_64");

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

@@ -132,7 +132,11 @@ pwra_parse ()
     os="os_cygwin"
     hw="hw_x86"
   else
-    if [ $machine != "x86_64" ]; then
+    if [ $machine == "x86_64" ]; then
+      machine="x86_64"
+    elif [ ${machine:0:3} == "arm" ]; then
+      machine="arm"
+    else
       machine="x86"
     fi
     os="os_linux"  

src/tools/pwre/src/os_linux/pwre_configure.sh

@@ -221,6 +221,7 @@ pwre_create_makedir()
 #pwre_os="os_linux"
 #pwre_hw="hw_x86"
 
+let ebuild=0
 cfile="$pwre_broot/pwre_${pwre_hw:3}_${pwre_os:3}.cnf"
 dos=`eval echo ${pwre_os} | tr [:lower:] [:upper:]`
 dhw=`eval echo ${pwre_hw} | tr [:lower:] [:upper:]`
@@ -238,11 +239,15 @@ let inc_cnt=0
 let lib_cnt=0
 let i=0
 hwpl=`eval uname -i`
-ubuntu_ver=`cat /etc/issue | grep Ubuntu | awk '{ print $2 }'`
-if [ "$ubuntu_ver" != "" ] &&[ "$ubuntu_ver" != "12.04" ] && [ $hwpl == "i686" ] ; then
+machine=`eval uname -m`
+if [ ${machine:0:3} == "arm" ]; then
+  hwpl=arm
+else
+  ubuntu_ver=`cat /etc/issue | grep Ubuntu | awk '{ print $2 }'`
+  if [ "$ubuntu_ver" != "" ] &&[ "$ubuntu_ver" != "12.04" ] && [ $hwpl == "i686" ] ; then
     hwpl=i386
+  fi
 fi
-
 # Bash
 if [ "$SHELL" != "/bin/bash" ] && [ "$SHELL" != "/usr/local/bin/bash" ]; then
     echo "Config error: Default shell has to be bash"
@@ -283,6 +288,8 @@ elif [ "$1" = "--version" ] && [ "$2" != "" ] && [ "$3" != "" ]; then
   buildversion=$2" "$3
 elif [ "$1" = "--reset-version" ]; then
   buildversion=""
+elif [ "$1" = "--ebuild" ]; then
+  ebuild=1
 elif [ "$1" != "" ]; then
   echo "Unknown option \"$1\""
   exit
@@ -308,8 +315,8 @@ else
   echo "export PWRE_CONF_BUILDVERSION=\"0\"" >> $cfile
 fi
       
-if test $pwre_hw == "hw_arm"; then
-
+if [ $pwre_hw == "hw_arm" ] && [ $ebuild -eq 1 ]; then
+  echo "Arm ebuild"
   pwre_config_check_include jni   JNI   1 $jdk/include/jni.h
   pwre_config_check_include jni   JNI   0 $jdk/include/linux/jni_md.h
 
@@ -357,23 +364,29 @@ if test $pwre_hw == "hw_arm"; then
   echo "export pwre_conf_dtt_platform=\"arm_linux\"" >> $cfile
 else
 
+  if [ $pwre_hw == "hw_arm" ]; then
+    gnu=gnueabihf
+  else
+    gnu=gnu
+  fi
+
   #Gtk
-  echo ""
+  echo "$hwpl $gnu"
   echo "Mandatory :"
-  pwre_config_check_lib gtk    	  GTK      gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so:/usr/lib/$hwpl-linux-gnu/libgtk-x11-2.0.so"
+  pwre_config_check_lib gtk    	  GTK      gtk gtk 0 "/usr/lib/libgtk-x11-2.0.so:/usr/lib/$hwpl-linux-$gnu/libgtk-x11-2.0.so"
 
   pwre_config_check_lib libantlr  LIBANTLR lib wb 0 "/usr/lib/libantlr.a:/usr/local/lib/libantlr.a"
-  pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0 "/usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a:/usr/lib/$hwpl-linux-gnu/librpcsvc.a"
-  pwre_config_check_lib libasound LIBASOUND lib lib 0 "/usr/lib/libasound.so:/usr/lib/libasound.a:/usr/lib/$hwpl-linux-gnu/libasound.so"
-  pwre_config_check_lib libpthread LIBPTHREAD lib lib 0 "/usr/lib/libpthread.so:/usr/lib/libpthread.a:/usr/lib/$hwpl-linux-gnu/libpthread.so"
-  pwre_config_check_lib libm      LIBM     lib lib 0 "/usr/lib/libm.so:/usr/lib/libm.a:/usr/lib/$hwpl-linux-gnu/libm.so"
-  pwre_config_check_lib libdb     LIBDB    lib lib 0 "/usr/lib/libdb.so:/usr/lib/$hwpl-linux-gnu/libdb.so"
-  pwre_config_check_lib libdb_cxx LIBDB_CXX lib wb 1 "/usr/lib/libdb_cxx.so:/usr/lib/$hwpl-linux-gnu/libdb_cxx.so"
-  pwre_config_check_lib libz      LIBZ     lib lib 0 "/usr/lib/libz.so:/usr/lib/libz.a:/usr/lib/$hwpl-linux-gnu/libz.so"
-  pwre_config_check_lib libcrypt  LIBCRYPT lib lib 0 "/usr/lib/libcrypt.so:/usr/lib/libcrypt.a:/usr/lib/$hwpl-linux-gnu/libcrypt.so"
-  pwre_config_check_lib librt     LIBRT    lib lib 0 "/usr/lib/librt.so:/usr/lib/librt.a:/usr/lib/$hwpl-linux-gnu/librt.so"
-  pwre_config_check_lib libfl     LIBFL    lib lib 0 "/usr/lib/libfl.so:/usr/lib/libfl.a:/usr/lib/$hwpl-linux-gnu/libfl.so"
-  pwre_config_check_lib libX11    LIBX11   lib lib 0 "/usr/lib/libX11.so:/usr/lib/$hwpl-linux-gnu/libX11.so"
+  pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0 "/usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a:/usr/lib/$hwpl-linux-$gnu/librpcsvc.a"
+  pwre_config_check_lib libasound LIBASOUND lib lib 0 "/usr/lib/libasound.so:/usr/lib/libasound.a:/usr/lib/$hwpl-linux-$gnu/libasound.so"
+  pwre_config_check_lib libpthread LIBPTHREAD lib lib 0 "/usr/lib/libpthread.so:/usr/lib/libpthread.a:/usr/lib/$hwpl-linux-$gnu/libpthread.so"
+  pwre_config_check_lib libm      LIBM     lib lib 0 "/usr/lib/libm.so:/usr/lib/libm.a:/usr/lib/$hwpl-linux-$gnu/libm.so"
+  pwre_config_check_lib libdb     LIBDB    lib lib 0 "/usr/lib/libdb.so:/usr/lib/$hwpl-linux-$gnu/libdb.so"
+  pwre_config_check_lib libdb_cxx LIBDB_CXX lib wb 1 "/usr/lib/libdb_cxx.so:/usr/lib/$hwpl-linux-$gnu/libdb_cxx.so"
+  pwre_config_check_lib libz      LIBZ     lib lib 0 "/usr/lib/libz.so:/usr/lib/libz.a:/usr/lib/$hwpl-linux-$gnu/libz.so"
+  pwre_config_check_lib libcrypt  LIBCRYPT lib lib 0 "/usr/lib/libcrypt.so:/usr/lib/libcrypt.a:/usr/lib/$hwpl-linux-$gnu/libcrypt.so"
+  pwre_config_check_lib librt     LIBRT    lib lib 0 "/usr/lib/librt.so:/usr/lib/librt.a:/usr/lib/$hwpl-linux-$gnu/librt.so"
+  pwre_config_check_lib libfl     LIBFL    lib lib 0 "/usr/lib/libfl.so:/usr/lib/libfl.a:/usr/lib/$hwpl-linux-$gnu/libfl.so"
+  pwre_config_check_lib libX11    LIBX11   lib lib 0 "/usr/lib/libX11.so:/usr/lib/$hwpl-linux-$gnu/libX11.so"
 
   pwre_config_check_include antlr ANTLR 1 "/usr/include/antlr/CommonAST.hpp:/usr/local/include/antlr/CommonAST.hpp"
   pwre_config_check_include gtk   GTK   1 "/usr/local/include/gtk-2.0/gtk.h:/usr/local/include/gtk-2.0/gtk/gtk.h:/usr/include/gtk-2.0/gtk/gtk.h"
@@ -384,13 +397,13 @@ else
   echo ""
   echo "Optional :"
   pwre_config_check_lib motif     MRM      motif motif 0 "/usr/lib/libMrm.so"
-  pwre_config_check_lib mysql     MYSQL    lib lib 1 "/usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so:/usr/lib/$hwpl-linux-gnu/libmysqlclient.so"
+  pwre_config_check_lib mysql     MYSQL    lib lib 1 "/usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so:/usr/lib/$hwpl-linux-$gnu/libmysqlclient.so"
   pwre_config_check_include sqlite3 SQLITE3   1 "/usr/include/sqlite3.h"
-  pwre_config_check_lib libsqlite3   LIBSQLITE3  lib lib 0 "/usr/lib/libsqlite3.so:/usr/lib/$hwpl-linux-gnu/libsqlite3.so"
+  pwre_config_check_lib libsqlite3   LIBSQLITE3  lib lib 0 "/usr/lib/libsqlite3.so:/usr/lib/$hwpl-linux-$gnu/libsqlite3.so"
   pwre_config_check_lib mq        MQ       lib mq  1 "/usr/lib/libdmq.so:/usr/local/dmq/lib/libdmq.so"
   pwre_config_check_lib wmq       WMQ      lib wmq 1 "/usr/lib/libmqic.so"
   pwre_config_check_lib libpnioif PNAK     lib pnak 1 "/usr/lib/libpnioif.a:/usr/local/lib/libpnioif.a"
-  pwre_config_check_lib libusb    LIBUSB   lib libusb 1 "/usr/lib/libusb-1.0.so:/usr/lib/$hwpl-linux-gnu/libusb-1.0.so"
+  pwre_config_check_lib libusb    LIBUSB   lib libusb 1 "/usr/lib/libusb-1.0.so:/usr/lib/$hwpl-linux-$gnu/libusb-1.0.so"
 
   pwre_config_check_include mq    MQ    0 "/usr/local/dmq/include/p_entry.h"
   pwre_config_check_include wmq   WMQ   1 "/opt/mqm/inc/cmqc.h"

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

@@ -271,8 +271,8 @@ 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__High=10
+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"
 
@@ -332,6 +332,8 @@ fi
 machine=`eval uname -m`
 if [ $machine = "x86_64" ]; then
   CurrentOpSys=$OpSys_X86_64_LINUX
+elif [ ${machine:0:3} = "arm" ]; then
+  CurrentOpSys=$OpSys_ARM_LINUX
 else
   CurrentOpSys=$OpSys_X86_LINUX
 fi
@@ -395,8 +397,6 @@ elif [ $OpSys -eq $OpSys_X86_64_LINUX ]; then
 elif [ $OpSys -eq $OpSys_ARM_LINUX ]; then
   pwrp_gc="$pwrp_tmp"
 
-  echo "-- Cross compilation ARM_LINUX"
-
 # Suppress all warnings, -x
   cc_cmd="$cc -c -x c -Wall $cc_debug -D_REENTRANT -DOS_LINUX -DOS_POSIX -I$pwrinc -I$pwrp_inc -I$pwrp_tmp $PWR_EXT_INC"
 

wb/exp/com/src/wb_wiz_directoryvolume.pwr_com

@@ -561,13 +561,18 @@ page_4:
     attr = name + ".NodeName";
     SetAttribute( attr, node_name[i]);
     attr = name + ".OperatingSystem";
+
     if ( os == "Linux")
       if ( hw == "x86_64")
         SetAttribute( attr, 128);
+      else
+        if ( hw == "ARM")
+          SetAttribute( attr, 512);
         else
           SetAttribute( attr, 64);
         endif
       endif
+    endif
     if ( os == "MacOS")
       SetAttribute( attr, 256);
     endif

wb/exp/com/src/wb_wiz_rootvolume.pwr_com

@@ -154,10 +154,14 @@ page_4:
   if ( os == "Linux")
     if ( hw == "x86_64")
       set attr/name='str1'/attr=OperatingSystem/value=128/nolog/noconf
+    else
+      if ( hw == "ARM")
+        set attr/name='str1'/attr=OperatingSystem/value=512/nolog/noconf
       else 
         set attr/name='str1'/attr=OperatingSystem/value=64/nolog/noconf
        endif
     endif
+  endif
   if ( os == "ARM")
     set attr/name='str1'/attr=OperatingSystem/value=512/nolog/noconf
   endif

wb/lib/wb/src/wb_gcg.cpp

@@ -129,6 +129,7 @@ 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_ARM_LINUX) \
 		     || (os & pwr_mOpSys_CustomBuild))
 
 #define IS_UNIX(os) (IS_LINUX(os) || IS_LYNX(os) || IS_MACOS(os) || IS_FREEBSD(os) || IS_OPENBSD(os) || IS_CYGWIN(os))
@@ -848,6 +849,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_ARM_LINUX)
+	  strcpy(logname, "pwr_build_host_arm_linux");
 	else if (os & pwr_mOpSys_X86_64_MACOS)
 	  strcpy(logname, "pwr_build_host_x86_64_macos");
 	else if (os & pwr_mOpSys_X86_64_FREEBSD)
@@ -5543,6 +5546,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_ARM_LINUX:
+    strcpy( objdir, "xxx");
+    strcpy( os_str, "ARM_LINUX"); /* Not used */
+    max_no_timebase = GCG_MAX_NO_TIMEBASE_LINUX;
+    break;
   case pwr_mOpSys_X86_64_MACOS:
     strcpy( objdir, "xxx");
     strcpy( os_str, "X86_64_MACOS"); /* Not used */
@@ -5789,6 +5797,7 @@ int	gcg_comp_rtnode(
 	  case pwr_mOpSys_PPC_LINUX:
 	  case pwr_mOpSys_X86_LINUX:
 	  case pwr_mOpSys_X86_64_LINUX:
+	  case pwr_mOpSys_ARM_LINUX:
 	  case pwr_mOpSys_X86_64_MACOS:
 	  case pwr_mOpSys_X86_64_FREEBSD:
 	  case pwr_mOpSys_X86_64_OPENBSD:

wb/lib/wb/src/wb_lfu.cpp

@@ -1356,6 +1356,7 @@ pwr_tStatus lfu_SaveDirectoryVolume(
 		 os == pwr_mOpSys_PPC_LINUX ||
 		 os == pwr_mOpSys_X86_LINUX ||
 		 os == pwr_mOpSys_X86_64_LINUX ||
+		 os == pwr_mOpSys_ARM_LINUX ||
 		 os == pwr_mOpSys_X86_64_MACOS ||
 		 os == pwr_mOpSys_X86_64_FREEBSD ||
 		 os == pwr_mOpSys_X86_64_OPENBSD ||
@@ -3162,6 +3163,7 @@ pwr_tStatus lfu_check_opt_file( ldh_tSesContext ldhses, char *nodename, int bus_
     case pwr_mOpSys_PPC_LINUX:
     case pwr_mOpSys_X86_LINUX:
     case pwr_mOpSys_X86_64_LINUX:
+    case pwr_mOpSys_ARM_LINUX:
     case pwr_mOpSys_X86_64_MACOS:
     case pwr_mOpSys_CustomBuild:
       fp << 

xtt/lib/cow/gtk/cow_wow_gtk.cpp

@@ -617,6 +617,7 @@ int CoWowGtk::DisplayWarranty()
   char 	title[80];
   FILE 	*fp;
   int 	i;
+  int   c;
   pwr_tFileName fname;
   wow_t_question_cb *cbdata;
 
@@ -636,9 +637,10 @@ int CoWowGtk::DisplayWarranty()
   }
 
   for ( i = 0; i < (int)sizeof(text) - 1; i++) {
-    text[i] = fgetc( fp);
-    if ( text[i] == EOF)
+    c = fgetc( fp);
+    if ( c == EOF)
       break;
+    text[i] = c;
   }
   text[i] = 0;
   fclose( fp);
@@ -702,6 +704,7 @@ void CoWowGtk::DisplayLicense()
   FILE *fp;
   char fname[200];
   int i;
+  int c;
 
   strcpy( title, translate_utf8("License"));
 
@@ -718,9 +721,10 @@ void CoWowGtk::DisplayLicense()
   }
 
   for ( i = 0; i < (int)sizeof(text) - 1; i++) {
-    text[i] = fgetc( fp);
-    if ( text[i] == EOF)
+    c = fgetc( fp);
+    if ( c == EOF)
       break;
+    text[i] = c;
   }
   fclose( fp);
   text[i] = 0;