pwre configure script for x86_64_linux

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

@@ -29,8 +29,7 @@ opsys=$4
 
 # echo $name $pgmname $is_rttsys $opsys
 
-if [ $opsys = "64" ]
-then
+if [ $opsys = "64" ] || [ $opsys == "128" ]; then
 # echo "Opsys is linux"
 
   if [ $is_rttsys = "0" ]

src/tools/bld/src/os_freebsd/hw_x86_64/variables.mk

@@ -160,7 +160,7 @@ else
   tools_msg2cmsg  := $(eexe_dir)/tools_msg2cmsg
   tools_cmsg2c    := $(eexe_dir)/tools_cmsg2c
   tools_pdrgen    := $(eexe_dir)/tools_pdrgen
-  wb_rtt          := $(eexe_dir)/wb_rtt
+  wb_rtt          := $(exe_dir)/wb_rtt
   co_convert      := $(eexe_dir)/co_convert
   co_merge        := $(eexe_dir)/co_merge
 endif

src/tools/bld/src/os_linux/hw_arm/variables.mk

@@ -151,7 +151,7 @@ else
   tools_msg2cmsg  := $(eexe_dir)/tools_msg2cmsg
   tools_cmsg2c    := $(eexe_dir)/tools_cmsg2c
   tools_pdrgen    := $(eexe_dir)/tools_pdrgen
-  wb_rtt          := $(eexe_dir)/wb_rtt
+  wb_rtt          := $(exe_dir)/wb_rtt
   co_convert      := $(eexe_dir)/co_convert
   co_merge        := $(eexe_dir)/co_merge
 endif

src/tools/bld/src/os_linux/hw_x86_64/variables.mk

+#  variables.mk -- variables common to all makefiles
+#
+#  PROVIEW/R
+#  Copyright (C) 1996 by Comator Process AB.
+#
+#  <Description>
+#
+ifndef variables_mk
+variables_mk := 1
+
+release_root	:= $(pwre_broot)/$(os_name)/$(hw_name)
+module_root	:= $(release_root)/$(pwre_bmodule)
+export_type	:= $(export_type)
+
+exe_dir	:= $(module_root)/exe
+lib_dir	:= $(module_root)/lib
+obj_dir	:= $(module_root)/obj
+cnf_dir	:= $(module_root)/cnf
+db_dir	:= $(module_root)/db
+inc_dir	:= $(module_root)/inc
+lis_dir	:= $(module_root)/lis
+kit_dir	:= $(module_root)/kit
+src_dir	:= $(module_root)/src
+load_dir := $(module_root)/load
+
+doc_dir	:= $(release_root)/exp/doc
+elib_dir := $(release_root)/exp/lib
+einc_dir := $(release_root)/exp/inc
+eobj_dir := $(release_root)/exp/obj
+eexe_dir := $(release_root)/exp/exe
+
+bld_dir	:= $(release_root)/bld/$(type_name)/$(comp_name)
+tmp_dir	:= $(release_root)/tmp
+
+c_ext	:= .c
+d_ext	:= .d
+d_ld_ext:= .d_ld
+h_ext	:= .h
+lib_ext	:= .a
+obj_ext	:= .o
+map_ext	:= .map
+
+#  Full names of source directories
+
+fhw_source := $(pwre_sroot)/$(type_name)/$(comp_name)/src/$(os_name)/$(hw_name)
+fos_source := $(pwre_sroot)/$(type_name)/$(comp_name)/src/$(os_name)
+fco_source := $(pwre_sroot)/$(type_name)/$(comp_name)/src
+
+#  Relative names of source directories
+
+hw_source := .
+os_source := ../
+co_source := ../../
+
+
+ifndef pwre_lang
+  lang_dir := $(exe_dir)
+  lang_bld_dir := $(bld_dir)
+else
+  ifeq ($(pwre_lang),en_us)
+    lang := en
+  endif
+
+  ifeq ($(pwre_lang),sv_se)
+    lang     := sw
+    pwr_lang := 1
+  endif
+
+  lang_hw_source := $(pwre_sroot)/$(type_name)/$(comp_name)/$(pwre_lang)/$(os_name)/$(hw_name)
+  lang_os_source := $(pwre_sroot)/$(type_name)/$(comp_name)/$(pwre_lang)/$(os_name)
+  lang_co_source := $(pwre_sroot)/$(type_name)/$(comp_name)/$(pwre_lang)
+  lang_dir := $(exe_dir)/$(pwre_lang)
+  lang_bld_dir := $(bld_dir)/$(pwre_lang)
+endif
+
+source	= $<
+sname	= $(notdir $(basename $<))
+ssuff	= $(suffix $<)
+sdir	= $(dir $<)/
+target	= $@
+tname	= $(notdir $(basename $@))
+tsuff	= $(suffix $@)
+tdir	= $(dir $@)/
+
+libobj	= $(bld_dir)/$*$(obj_ext)
+cobj	= -c -o $(target)
+clibobj	= -c -o $(libobj)
+rt_msg_objs 	:= $(obj_dir)/pwr_msg_co.o $(obj_dir)/pwr_msg_rt.o
+rs_msg_objs 	:= $(obj_dir)/pwr_msg_rs.o
+wb_msg_objs 	:= $(obj_dir)/pwr_msg_wb.o $(obj_dir)/pwr_msg_ge.o $(obj_dir)/pwr_msg_flow.o
+rt_msg_eobjs 	:= $(eobj_dir)/pwr_msg_co.o $(eobj_dir)/pwr_msg_rt.o
+rs_msg_eobjs 	:= $(eobj_dir)/pwr_msg_rs.o
+wb_msg_eobjs 	:= $(eobj_dir)/pwr_msg_wb.o $(eobj_dir)/pwr_msg_ge.o $(eobj_dir)/pwr_msg_flow.o
+
+# Configuration
+#ifeq ($(pwre_conf_mysql),1)
+#  cmysql        := -DPWRE_CONF_MYSQL=1
+#  linkmysql     := -L/usr/lib/mysql -lmysqlclient
+#else
+#  cmysql        :=
+#  linkmysql     :=
+#endif
+
+#ifeq ($(pwre_conf_gtk),1)
+#  cgtk        := -DPWRE_CONF_GTK=1
+#  linkgtk     := `pkg-config --libs gtk+-2.0`
+#else
+#  cgtk        :=
+#  linkgtk     :=
+#endif
+
+#ifeq ($(pwre_conf_libusb),1)
+#  clibusb        := -DPWRE_CONF_LIBUSB=1
+#  linklibusb     := -lusb-1.0
+#else
+#  clibusb        :=
+#  linklibusb     :=
+#endif
+
+log_done	=
+#csetos		:= -DOS_LINUX=1 -DOS=linux -D_LINUX -DHW_X86=1 -DHW=x86
+#cinc		:= -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) -I/usr/X11R6/include -I$(jdk)/include -I$(jdk)/include/linux \
+`pkg-config --cflags gtk+-2.0` -DPREFIX=\"/usr/local\" -DSYSCONFDIR=\"/etc\" -DDATADIR=\"/usr/share\" -DLIBDIR=\"/usr/lib\" $(cmysql) $(cgtk) $(clibusb)
+csetos 		:= $(pwre_conf_cc_define)
+cinc 		:= -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk)
+rm		:= rm
+cp		:= cp
+cpflags		:= 
+arflags		:= r
+obj             := -c -o $(target)
+lex             := flex
+javac		:= javac
+ifdef pwre_ar
+  ar            := $(pwre_ar)
+else
+  ar            := ar
+endif
+ifdef pwre_cc
+  cc              := $(pwre_cc)
+  ld              := $(pwre_cc)
+else
+  cc              := gcc
+  ld              := gcc
+endif
+ifdef pwre_cxx
+  cxx             := $(pwre_cxx)
+  ldxx            := $(pwre_cxx)
+else
+  cxx             := g++
+  ldxx            := g++
+endif
+ifdef pwre_host_exe
+  tools_msg2cmsg  := $(pwre_host_exe)/tools_msg2cmsg
+  tools_cmsg2c    := $(pwre_host_exe)/tools_cmsg2c
+  tools_pdrgen    := $(pwre_host_exe)/tools_pdrgen
+  wb_rtt          := $(pwre_host_exe)/wb_rtt
+  co_convert      := $(pwre_host_exe)/co_convert
+  co_merge        := $(pwre_host_exe)/co_merge
+else
+  tools_msg2cmsg  := $(eexe_dir)/tools_msg2cmsg
+  tools_cmsg2c    := $(eexe_dir)/tools_cmsg2c
+  tools_pdrgen    := $(eexe_dir)/tools_pdrgen
+  wb_rtt          := $(exe_dir)/wb_rtt
+  co_convert      := $(eexe_dir)/co_convert
+  co_merge        := $(eexe_dir)/co_merge
+endif
+
+
+#docbook-related, added by jonas_h 2006-04-nn
+
+#xsltproc := xsltproc
+#fop := fop 
+#above is a symlink from /usr/local/bin/fop -> /usr/local/fop-0.92beta/fop
+
+#xsltproc_args := --xinclude
+#chunk_args_en_us = --stringparam root.filename $(basename $(notdir $(target))) --stringparam base.dir $(doc_dir)/en_us/
+#chunk_args_sv_se = --stringparam root.filename $(basename $(notdir $(target))) --stringparam base.dir $(doc_dir)/sv_se/
+
+#pwr_stylesheetdir = $(pwre_sroot)/doc/man/src
+#docbook_stylesheetdir = /usr/local/share/xml/docbook/stylesheet/snapshot
+#html_xsl = $(pwr_stylesheetdir)/pwrxsl-html.xsl
+#chunk_xsl = $(pwr_stylesheetdir)/pwrxsl-chunk.xsl
+#fo_xsl = $(pwr_stylesheetdir)/pwrxsl-fo.xsl
+
+#end of
+
+
+
+#list            = $(to-vms $(lis_dir)/$(sname)$(lis_ext))
+map             = $(bld_dir)/$(tname)$(map_ext)
+mkdir		:= mkdir
+#   Set to /buildversion for frozen dbs versions
+wblflags	:= 
+
+ifeq ($(pwre_btype),rls)			 
+  cflags	:= -c -O3 -D_GNU_SOURCE -DPWR_NDEBUG -D_REENTRANT -fPIC
+  cxxflags	:= $(cflags) 
+  linkflags	:= -O3 -L$(lib_dir)
+  elinkflags	:= -O3 -L$(lib_dir) -L$(elib_dir)
+  explinkflags	:= -g -L$(elib_dir)
+  clis		= /lis=$(list)
+  dolist	= /lis=$(list)
+  domap		= -Xlinker -Map -Xlinker $(map)
+else
+  cflags	:= -c -g -Wall -D_GNU_SOURCE -D_REENTRANT -fPIC
+  cxxflags	:= $(cflags) -Wno-deprecated
+  mmflags	:= -Wno-deprecated
+  linkflags	:= -g -L$(lib_dir)
+  elinkflags	:= -g -L$(lib_dir) -L$(elib_dir)
+  explinkflags	:= -g -L$(elib_dir)
+  dolist	= /lis=$(list)
+  clis		:= 
+  domap		= -Xlinker -Map -Xlinker $(map)
+endif
+
+log_h_h		= echo "Exporting $<"
+log_x_h		= echo "Exporting $< to $(notdir $@)"
+log_l_obj	= echo "Compiling $<"
+log_l_lib	= echo "Compiling $(notdir $(basename $@))($<)"
+#log_c_d		= echo "Updating dependencies $<"
+log_c_obj	= echo "Compiling $<"
+log_c_lib	= echo "Compiling $(notdir $(basename $@))($<)"
+log_x_lib	= echo "Compiling $(notdir $(basename $@))($<)"
+log_obj_lib	= echo "Archiving lasse $(notdir $(basename $@))($(notdir $<))"
+log_hlp_hlb	= echo "Exporting $(notdir $(basename $@))($<)"
+log_sc_lib	= echo "Compiling $(notdir $(basename $@))($<)"
+log_sc_obj	= echo "Compiling $<"
+log_uil_uid	= echo "Compiling $<"
+log_g_m1	= echo "Exporting $<"
+log_cld_lib	= echo "Compiling $(notdir $(basename $@))($<)"
+log_link_exe	= echo "Linking $@"
+log_wb_load_wb_vers	= echo "Exporting $<"
+log_xbm_xbm	= echo "Exporting $<"
+log_frm_frm	= echo "Exporting $<"
+log_graph_graph	= echo "Exporting $<"
+log_msg_h	= echo "Compiling $<"
+log_java_class	= echo "Compiling $<"
+
+endif

src/tools/bld/src/os_macos/hw_x86_64/variables.mk

@@ -160,7 +160,7 @@ else
   tools_msg2cmsg  := $(eexe_dir)/tools_msg2cmsg
   tools_cmsg2c    := $(eexe_dir)/tools_cmsg2c
   tools_pdrgen    := $(eexe_dir)/tools_pdrgen
-  wb_rtt          := $(eexe_dir)/wb_rtt
+  wb_rtt          := $(exe_dir)/wb_rtt
   co_convert      := $(eexe_dir)/co_convert
   co_merge        := $(eexe_dir)/co_merge
 endif

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

@@ -249,8 +249,6 @@ if test $pwre_hw == "hw_arm"; then
       i=$((i+1))
   done
 
-  echo "export wb_rtt=\$pwre_host_exe/wb_rtt" >> $cfile
-
   echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile
   echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile
   echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
@@ -299,7 +297,7 @@ else
 #set -o xtrace
 
   pwre_config_check_include antlr ANTLR 1 /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
+  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
   pwre_config_check_include jni   JNI   1 $jdk/include/jni.h
   pwre_config_check_include jni   JNI   0 $jdk/include/linux/jni_md.h
 
@@ -319,8 +317,6 @@ else
       i=$((i+1))
   done
 
-  echo "export wb_rtt=\$pwr_exe/wb_rtt" >> $cfile
-
   echo "export pwre_conf_cc_define=\"$conf_cc_define\"" >> $cfile
   echo "export pwre_conf_libpwrco=\"-lpwr_co\"" >> $cfile
   echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile