More pwre configure script modifications

java/exe/jpwr_rt_gdh/src/os_templ/link_rule.mk

@@ -25,7 +25,8 @@ link =	$(ldxx) -shared -DHW_X86 -DOS_LINUX \
 	${pwre_broot}/${pwre_target}/bld/exe/jpwr_rt_gdh/jpwr_rt_gdh.o \
 	${pwre_broot}/${pwre_target}/bld/lib/statussrv/*.o \
 	${pwre_broot}/${pwre_target}/exp/obj/stdsoap2.o \
-	-o ${pwr_exe}/libjpwr_rt_gdh.so $(pwre_conf_libpwrotherio) $(pwre_conf_lib) -lpwr_dtt
+	-o ${pwr_exe}/libjpwr_rt_gdh.so $(pwre_conf_libpwrotherio) $(pwre_conf_lib) \
+	$(pwre_conf_libpwrdtt)
 
 #      -lm -lpthread -lrt -lcrypt -lpwr_dtt -lpwr_usbio_dummy  -ldb
 

src/exe/rt_io_comm/src/os_templ/link_rule.mk

@@ -5,7 +5,8 @@ ifeq ($(export_type),exp)
   link = $(ld) $(explinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \
 	$(pwr_obj)/rt_io_user.o \
-	$(pwre_conf_libpwrrt) $(pwre_conf_lib) $(pwre_conf_libpwrotherio)
+	$(pwre_conf_libpwrrt) $(pwre_conf_lib) \
+	$(pwre_conf_libpwrprofibus) $(pwre_conf_libpwrotherio)
 else
   link = $(ld) $(elinkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) \

src/exe/rt_rtt/src/os_templ/link_rule.mk

@@ -4,6 +4,6 @@ link_rule_mk := 1
 link = $(ldxx) $(linkflags) $(domap) -o $(export_exe) \
 	$(export_obj) $(objects) $(rt_msg_objs) $(pwr_obj)/dtt_rttsys.o\
 	$(pwr_obj)/rt_io_user.o $(pwr_lib)/libpwr_dtt.a -L$(pwr_elib)\
-	-lpwr_dtt $(pwre_conf_libpwrrt) $(pwre_conf_lib)
+	$(pwre_conf_libpwrdtt) $(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

src/exp/com/src/os_linux/upgrade.sh

@@ -89,13 +89,15 @@ reload_classvolumes()
   echo ""
   echo "Found classvolumes: "
   for file in $list; do
-    volume=`eval head -n 1 $file | grep pwr_eClass_ClassVolume | awk '{ print $2 }'`
-    if [ "$volume" == "" ]; then
-      volume=`eval head -n 1 $file | grep ClassVolume | awk '{ print $2 }'`
-      volumelow=`eval head -n 1 $file | grep ClassVolume | awk '{ print tolower($2) }'`
-    fi
-    if [ "$volume" != "" ]; then
-      echo $file
+    if [ ${file##/*/} != "directory.wb_load" ]; then 
+      volume=`eval head -n 1 $file | grep pwr_eClass_ClassVolume | awk '{ print $2 }'`
+      if [ "$volume" == "" ]; then
+        volume=`eval head -n 1 $file | grep ClassVolume | awk '{ print $2 }'`
+        volumelow=`eval head -n 1 $file | grep ClassVolume | awk '{ print tolower($2) }'`
+      fi
+      if [ "$volume" != "" ]; then
+        echo $file
+      fi
     fi
   done
   echo ""
@@ -104,28 +106,30 @@ reload_classvolumes()
 
   list=`eval ls -1d $pwrp_db/*.wb_load`
   for file in $list; do
-    volume=`eval grep pwr_eClass_ClassVolume $file | awk '{ print $2 }'`
-    volumelow=`eval grep pwr_eClass_ClassVolume $file | awk '{ print tolower($2) }'`
-    if [ "$volume" == "" ]; then
-      volume=`eval grep ClassVolume $file | awk '{ print $2 }'`
-      volumelow=`eval grep ClassVolume $file | awk '{ print tolower($2) }'`
-    fi
-    if [ "$volume" != "" ]; then
-      echo "-- Creating structfile and loadfile for $volume"
-      if co_convert -sv -d $pwrp_inc $file
-      then
-        reload_status=$reload__success
-      else
-        reload_status=$reload__userclasses
-        return
+    if  [ ${file##/*/} != "directory.wb_load" ]; then 
+      volume=`eval grep pwr_eClass_ClassVolume $file | awk '{ print $2 }'`
+      volumelow=`eval grep pwr_eClass_ClassVolume $file | awk '{ print tolower($2) }'`
+      if [ "$volume" == "" ]; then
+        volume=`eval grep ClassVolume $file | awk '{ print $2 }'`
+        volumelow=`eval grep ClassVolume $file | awk '{ print tolower($2) }'`
       fi
-
-      if wb_cmd create snapshot/file=\"$file\"/out=\"$pwrp_load/$volumelow.dbs\"
-      then
-        reload_status=$reload__success
-      else
-        reload_status=$reload__userclasses
-        return
+      if [ "$volume" != "" ]; then
+        echo "-- Creating structfile and loadfile for $volume"
+        if co_convert -sv -d $pwrp_inc $file
+        then
+          reload_status=$reload__success
+        else
+          reload_status=$reload__userclasses
+          return
+        fi
+
+        if wb_cmd create snapshot/file=\"$file\"/out=\"$pwrp_load/$volumelow.dbs\"
+        then
+          reload_status=$reload__success
+        else
+          reload_status=$reload__userclasses
+          return
+        fi
       fi
     fi
   done

src/tools/pwre/src/os_freebsd/pwre_configure.sh

@@ -102,6 +102,8 @@ pwre_config_check_lib()
 	elif test $3 == "gtk"; then
 	  conf_libgtk=$conf_libgtk" \\\`pkg-config --libs gtk+-2.0\\\`"
 	  conf_incdirgtk=$conf_incdirgtk" \\\`pkg-config --cflags gtk+-2.0\\\`"
+	elif test $3 == "motif"; then
+	  conf_libmotif=$conf_libmotif" -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp -lSM -lICE"
 	else
            echo "Unknown type"
 	fi
@@ -281,6 +283,7 @@ echo "export PKG_CONFIG_PATH=/sw/fink/pkgconfig" >> $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
+echo "export pwre_conf_libpwrdtt=\"-lpwr_dtt\"" >> $cfile
 echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrxtt=\"-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow\"" >> $cfile
 echo "export pwre_conf_libpwrxttgtk=\" -lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk\"" >> $cfile

src/tools/pwre/src/os_linux/pwre.pl

@@ -61,6 +61,8 @@ $varstr;
 if (($dbname = $ENV{"pwre_env_db"}) eq "") {
   $dbname = $ENV{"HOME"} . "/pwre/pwre";
 }
+$os = substr( $ENV{"pwre_os"}, 3, 100);
+$hw = substr( $ENV{"pwre_hw"}, 3, 100);
 $configfile = $ENV{"pwre_broot"} . "/pwre_" . $hw . "_" . $os . ".cnf";
 
 

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

@@ -102,6 +102,8 @@ pwre_config_check_lib()
 	elif test $3 == "gtk"; then
 	  conf_libgtk=$conf_libgtk" \\\`pkg-config --libs gtk+-2.0\\\`"
 	  conf_incdirgtk=$conf_incdirgtk" \\\`pkg-config --cflags gtk+-2.0\\\`"
+	elif test $3 == "motif"; then
+	  conf_libmotif=$conf_libmotif" -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp -lSM -lICE"
 	else
            echo "Unknown type"
 	fi
@@ -230,6 +232,7 @@ pwre_config_init
       
 #Gtk
 pwre_config_check_lib gtk      	GTK      gtk gtk 0 /usr/lib/libgtk-x11-2.0.so
+pwre_config_check_lib motif     MRM      motif motif 0 /usr/lib/libMrm.so
 
 pwre_config_check_lib libantlr 	LIBANTLR lib lib 0 /usr/local/lib/libantlr.a
 pwre_config_check_lib librpcsvc LIBRPCSVC lib lib 0 /usr/lib/librpcsvc.so:/usr/lib/librpcsvc.a
@@ -271,10 +274,13 @@ done
 
 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 -lpwr_usbio_dummy -lpwr_usb_dummy\"" >> $cfile
+echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
+echo "export pwre_conf_libpwrdtt=\"-lpwr_dtt\"" >> $cfile
+echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy\"" >> $cfile
+echo "export pwre_conf_libpwrprofibus=\"-lpwr_pnak_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrxtt=\"-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow\"" >> $cfile
 echo "export pwre_conf_libpwrxttgtk=\" -lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk\"" >> $cfile
-echo "export pwre_conf_libpwrxttmotif=\"-lpwr_ge_motif -lpwr_cow_motif -lpwr_flow_motif -lpwr_glow_motif\"" >> $cfile
+echo "export pwre_conf_libpwrxttmotif=\" -lpwr_xtt_motif -lpwr_ge_motif -lpwr_cow_motif -lpwr_flow_motif -lpwr_glow_motif\"" >> $cfile
 echo "export pwre_conf_libpwrwb=\"-lpwr_wb\"" >> $cfile
 echo "export pwre_conf_libpwrwbgtk=\"-lpwr_wb_gtk\"" >> $cfile
 echo "export pwre_conf_libpwrwbmotif=\"-lpwr_wb_motif\"" >> $cfile

src/tools/pwre/src/os_macos/pwre_configure.sh

@@ -281,6 +281,7 @@ echo "export PKG_CONFIG_PATH=/sw/fink/pkgconfig" >> $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
+echo "export pwre_conf_libpwrdtt=\"-lpwr_dtt\"" >> $cfile
 echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrxtt=\"-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow\"" >> $cfile
 echo "export pwre_conf_libpwrxttgtk=\" -lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk\"" >> $cfile

src/tools/pwre/src/os_templ/pwre_configure.sh

@@ -271,7 +271,8 @@ done
 
 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 -lpwr_usbio_dummy -lpwr_usb_dummy\"" >> $cfile
+echo "export pwre_conf_libpwrrt=\"-lpwr_rt -lpwr_co -lpwr_statussrv -lpwr_msg_dummy\"" >> $cfile
+echo "export pwre_conf_libpwrotherio=\"-lpwr_usbio_dummy -lpwr_usb_dummy\"" >> $cfile
 echo "export pwre_conf_libpwrxtt=\"-lpwr_xtt -lpwr_ge -lpwr_cow -lpwr_flow -lpwr_glow\"" >> $cfile
 echo "export pwre_conf_libpwrxttgtk=\" -lpwr_xtt_gtk -lpwr_ge_gtk -lpwr_cow_gtk -lpwr_flow_gtk -lpwr_glow_gtk\"" >> $cfile
 echo "export pwre_conf_libpwrxttmotif=\"-lpwr_ge_motif -lpwr_cow_motif -lpwr_flow_motif -lpwr_glow_motif\"" >> $cfile

wb/exe/wb/gtk/os_templ/link_rule.mk

@@ -7,7 +7,7 @@ ifeq ($(export_type),exp)
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o $(pwr_eobj)/stdsoap2.o \
 	$(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbgtk) $(pwre_conf_libpwrwb) \
-	$(pwre_conf_libgtk) \
+	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 else

wb/exe/wb/motif/os_templ/link_rule.mk

@@ -7,7 +7,7 @@ ifeq ($(export_type),exp)
 	$(pwr_eobj)/rt_io_user.o $(pwr_obj)/wb_procom.o \
 	$(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrwb) \
-	$(pwre_conf_libmotif) \
+	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) $(pwre_conf_libmotif) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 #	-L/usr/X11R6/lib -L/usr/local/BerkeleyDB.4.0/lib \

xtt/exe/rt_xtt/gtk/os_templ/link_rule.mk

@@ -5,14 +5,18 @@ ifeq ($(export_type),exp)
   link = $(ldxx) $(explinkflags) $(domap) -o $(pwr_exe)/rt_xtt_gtk \
 	$(bld_dir)/rt_xtt_gtk.o $(bld_dir)/xtt_main.o $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
+	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
+	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
+	$(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 else
   link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/rt_xtt_gtk \
 	$(bld_dir)/rt_xtt_gtk.o $(bld_dir)/xtt_main.o $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) $(pwre_conf_libgtk) \
+	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
+	$(pwre_conf_libpwrxttgtk) $(pwre_conf_libpwrxtt) \
+	$(pwre_conf_libgtk) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
 endif

xtt/exe/rt_xtt/motif/os_templ/link_rule.mk

@@ -4,30 +4,20 @@ link_rule_mk := 1
 ifeq ($(export_type),exp)			 
   link = $(ldxx) $(explinkflags) $(domap) -o $(pwr_exe)/rt_xtt_motif \
 	$(bld_dir)/rt_xtt_motif.o $(bld_dir)/xtt_main.o $(rt_msg_eobjs) \
-	$(pwr_eobj)/rt_io_user.o 
-	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) $(pwre_conf_libmotif) \
+	$(pwr_eobj)/rt_io_user.o \
+	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) \
+	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) \
+	$(pwre_conf_libmotif) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
-#-L/usr/X11R6/lib\
-#	-L/opt/gnome/lib \
-#	-lpwr_xtt_motif -lpwr_xtt -lpwr_xtt_motif -lpwr_xtt -lpwr_ge_motif -lpwr_ge -lpwr_rt \
-#	-lpwr_cow_motif -lpwr_cow -lpwr_co -lpwr_flow_motif -lpwr_flow -lpwr_glow_motif -lpwr_glow \
-#	-lpwr_msg_dummy -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-#        -lSM -lICE\
-#	-ldb -lrpcsvc -lpthread -lm -lrt -lasound -lcrypt
 else
   link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/rt_xtt_motif \
 	$(bld_dir)/rt_xtt_motif.o $(bld_dir)/xtt_main.o $(rt_msg_eobjs) \
 	$(pwr_eobj)/rt_io_user.o \
-	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) $(pwre_conf_libmotif) \
+	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) \
+	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) \
+	$(pwre_conf_libmotif) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
-#-L/usr/X11R6/lib\
-#	-L/opt/gnome/lib \
-#	-lpwr_xtt_motif -lpwr_xtt -lpwr_xtt_motif -lpwr_xtt -lpwr_ge_motif -lpwr_ge -lpwr_rt \
-#	-lpwr_cow_motif -lpwr_cow -lpwr_co -lpwr_flow_motif -lpwr_flow -lpwr_glow_motif -lpwr_glow \
-#	-lpwr_msg_dummy -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-#        -lSM -lICE\
-#	-ldb -lrpcsvc -lpthread -lm -lrt -lasound -lcrypt
 endif
 endif

xtt/exe/wb_ge/motif/os_templ/link_rule.mk

@@ -6,18 +6,7 @@ link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_motif \
 	$(pwr_eobj)/rt_io_user.o $(pwr_eobj)/wb_provider.o \
 	$(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrwb) \
 	$(pwre_conf_libpwrxtt) $(pwre_conf_libpwrwbmotif) $(pwre_conf_libpwrwb) \
-	$(pwre_conf_libmotif) \
+	$(pwre_conf_libpwrxttmotif) $(pwre_conf_libpwrxtt) $(pwre_conf_libmotif) \
 	$(pwre_conf_libpwrrt) $(pwre_conf_lib)
 
-#link = $(ldxx) -L$(pwr_elib) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_motif \
-#	$(bld_dir)/wb_ge_motif.o $(wb_msg_eobjs) $(rt_msg_eobjs) \
-#	$(pwr_eobj)/rt_io_user.o $(pwr_eobj)/wb_provider.o -L/usr/X11R6/lib \
-#	-L/usr/local/BerkeleyDB.4.0/lib \
-#	-L/opt/gnome/lib \
-#	-lpwr_ge_motif -lpwr_ge -lpwr_wb_motif -lpwr_wb -lpwr_wb_motif -lpwr_wb -lpwr_flow_motif -lpwr_flow \
-#	-lpwr_glow_motif -lpwr_glow -lpwr_rt -lpwr_cow_motif -lpwr_cow -lpwr_co \
-#	-lpwr_msg_dummy -lantlr -lImlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-#        -lXmu -lSM -lICE\
-#	-lcrypt -lrpcsvc -lpthread -lm -ldb_cxx -lz $(linkmysql)
-
 endif

xtt/lib/xtt/motif/xtt_xnav_motif.cpp

@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <vector>
 
+#include "pwr.h"
 #include "co_nav_help.h"
 
 extern "C" {